huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move iisexpress test to other IIS machines (#10234)

This commit is contained in:
Justin Kotalik 2019-05-14 18:07:27 -07:00 committed by GitHub
parent a2c69b3d0c
commit 93af64823e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
eng/targets/Helix.Common.props
View File

@ -6,7 +6,7 @@
</ItemDefinitionGroup>
<!-- this file is shared between Helix.proj and .csproj files -->
<ItemGroup>
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'">
<HelixAvailablePlatform Include="Windows" />
<HelixAvailablePlatform Include="OSX" />
<HelixAvailablePlatform Include="Linux" />
@ -27,4 +27,21 @@
<!-- TODO: re-enable Debian.9.Arm64.Open and Ubuntu.1804.Arm64.Open -->
</ItemGroup>
<ItemGroup Condition="'$(IsWindowsOnlyTest)' == 'true'">
<HelixAvailablePlatform Include="Windows" />
<HelixAvailableTargetQueue Include="Windows.10.Amd64.EnterpriseRS3.ASPNET.Open" Platform="Windows" />
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
<!-- Disabled until https://github.com/dotnet/core-eng/issues/5506 is resolved -->
<!-- <HelixAvailableTargetQueue Condition="'$(IsWindowsOnlyTest)' == 'true'" Include="Windows.7.Amd64.Open" /> -->
<HelixContent Include="$(RepositoryRoot)src\Servers\IIS\tools\update_schema.ps1" />
<HelixContent Include="$(RepositoryRoot)src\Servers\IIS\tools\UpdateIISExpressCertificate.ps1" />
<HelixContent Include="$(RepositoryRoot)src\Servers\IIS\tools\TestCert.pfx" />
<HelixContent Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" />
<HelixPreCommand Include="call RunPowershell.cmd update_schema.ps1 || exit /b 1" />
<HelixPreCommand Include="call RunPowershell.cmd UpdateIISExpressCertificate.ps1 || exit /b 1" />
</ItemGroup>
</Project>

4
eng/targets/Helix.targets
View File

@ -42,9 +42,7 @@ Usage: dotnet build /t:Helix src/MyTestProject.csproj
<ItemGroup>
<!-- Include default queues based on platform -->
<_HelixProjectTargetQueue Include="%(HelixAvailableTargetQueue.Identity)" Condition="'$(_SelectedPlatforms.Contains(%(Platform)))' == 'true' AND '%(EnableByDefault)' == 'true'" />
<!-- Unconditionally include queues defined by project -->
<_HelixProjectTargetQueue Include="%(HelixProjectTargetQueue.Identity)" />
<_HelixProjectTargetQueue Include="%(HelixAvailableTargetQueue.Identity)" Condition="'%(HelixAvailableTargetQueue.Identity)' != '' AND '$(_SelectedPlatforms.Contains(%(Platform)))' == 'true' AND '%(EnableByDefault)' == 'true'" />
<_HelixApplicableTargetQueue Include="%(_HelixProjectTargetQueue.Identity)" Condition="'%(Identity)' == '$(HelixTargetQueue)'" />
</ItemGroup>

6
src/Servers/HttpSys/test/Directory.Build.props
View File

@ -1,9 +1,9 @@
<Project>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
<ItemGroup>
<PropertyGroup>
<!-- HttpSys tests are Windows-only -->
<HelixProjectPlatform Remove="Linux;OSX" />
</ItemGroup>
<IsWindowsOnlyTest>true</IsWindowsOnlyTest>
</PropertyGroup>
</Project>

9
src/Servers/IIS/IIS/test/Directory.Build.props Normal file
View File

@ -0,0 +1,9 @@
<Project>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<!-- IIS tests are Windows-only -->
<IsWindowsOnlyTest>true</IsWindowsOnlyTest>
</PropertyGroup>
</Project>

19
src/Servers/IIS/IIS/test/FunctionalTest.props
View File

@ -10,25 +10,6 @@
<Content Include="..\Common.FunctionalTests\AppHostConfig\*.config" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<HelixProjectPlatform Remove="Linux;OSX" />
<!-- Remove all default platforms for full IIS -->
<HelixProjectPlatform Condition="'$(IsIISTest)' == 'true'" Remove="@(HelixProjectPlatform)" />
<HelixProjectTargetQueue Condition="'$(IsIISTest)' == 'true'" Include="Windows.10.Amd64.EnterpriseRS3.ASPNET.Open" />
<HelixProjectTargetQueue Condition="'$(IsIISTest)' == 'true'" Include="Windows.81.Amd64.Open" />
<!-- Disabled until https://github.com/dotnet/core-eng/issues/5506 is resolved -->
<!-- <HelixProjectTargetQueue Condition="'$(IsIISTest)' == 'true'" Include="Windows.7.Amd64.Open" /> -->
<HelixContent Include="..\..\..\tools\update_schema.ps1" />
<HelixContent Include="..\..\..\tools\UpdateIISExpressCertificate.ps1" />
<HelixContent Include="..\..\..\tools\TestCert.pfx" />
<HelixContent Include="..\..\..\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" />
<HelixPreCommand Include="call RunPowershell.cmd update_schema.ps1 || exit /b 1" />
<HelixPreCommand Include="call RunPowershell.cmd UpdateIISExpressCertificate.ps1 || exit /b 1" />
</ItemGroup>
<Target Name="BuildAssets" AfterTargets="Build">
<MSBuild Projects="@(ProjectReference)" Targets="PublishTestsAssets" SkipNonexistentTargets="true" BuildInParallel="True">
<Output TaskParameter="TargetOutputs" ItemName="PublishedTestAsset" />

1
src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
View File

@ -5,7 +5,6 @@
<TestGroupName>IISBackwardsCompatibility.FunctionalTests</TestGroupName>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<SkipTests Condition=" '$(SkipIISBackwardsCompatibilityTests)' == 'true' ">true</SkipTests>
<IsIISTest>true</IsIISTest>
</PropertyGroup>
<Import Project="../FunctionalTest.props" />

1
src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
View File

@ -5,7 +5,6 @@
<TestGroupName>IISForwardsCompatibility.FunctionalTests</TestGroupName>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<SkipTests Condition=" '$(SkipIISForwardsCompatibilityTests)' == 'true' ">true</SkipTests>
<IsIISTest>true</IsIISTest>
</PropertyGroup>
<Import Project="../FunctionalTest.props" />

1
src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
View File

@ -6,7 +6,6 @@
<TestGroupName>IIS.FunctionalTests</TestGroupName>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<SkipTests Condition=" '$(SkipIISTests)' == 'true' ">true</SkipTests>
<IsIISTest>true</IsIISTest>
</PropertyGroup>
<Import Project="../FunctionalTest.props" />

1
src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
View File

@ -5,7 +5,6 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<InProcessTestSite>true</InProcessTestSite>
<IsIISTest>true</IsIISTest>
</PropertyGroup>
<Import Project="../FunctionalTest.props" />