From 93af64823eefbbfdb379d81b0366ae6ac945a949 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Tue, 14 May 2019 18:07:27 -0700
Subject: [PATCH] Move iisexpress test to other IIS machines (#10234)

---
 eng/targets/Helix.Common.props                | 19 ++++++++++++++++++-
 eng/targets/Helix.targets                     |  4 +---
 .../HttpSys/test/Directory.Build.props        |  6 +++---
 .../IIS/IIS/test/Directory.Build.props        |  9 +++++++++
 src/Servers/IIS/IIS/test/FunctionalTest.props | 19 -------------------
 ...kwardsCompatibility.FunctionalTests.csproj |  1 -
 ...rwardsCompatibility.FunctionalTests.csproj |  1 -
 .../IIS.FunctionalTests.csproj                |  1 -
 .../IIS/IIS/test/IIS.Tests/IIS.Tests.csproj   |  1 -
 9 files changed, 31 insertions(+), 30 deletions(-)
 create mode 100644 src/Servers/IIS/IIS/test/Directory.Build.props

diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index f1c5ccb26d..f547b96039 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -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>
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index bc94dc345e..2ec7b469ea 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -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>
diff --git a/src/Servers/HttpSys/test/Directory.Build.props b/src/Servers/HttpSys/test/Directory.Build.props
index bb2a02a75b..0468ef26a6 100644
--- a/src/Servers/HttpSys/test/Directory.Build.props
+++ b/src/Servers/HttpSys/test/Directory.Build.props
@@ -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>
diff --git a/src/Servers/IIS/IIS/test/Directory.Build.props b/src/Servers/IIS/IIS/test/Directory.Build.props
new file mode 100644
index 0000000000..b4e83ba737
--- /dev/null
+++ b/src/Servers/IIS/IIS/test/Directory.Build.props
@@ -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>
diff --git a/src/Servers/IIS/IIS/test/FunctionalTest.props b/src/Servers/IIS/IIS/test/FunctionalTest.props
index 9150054fc4..8582115239 100644
--- a/src/Servers/IIS/IIS/test/FunctionalTest.props
+++ b/src/Servers/IIS/IIS/test/FunctionalTest.props
@@ -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" />
diff --git a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
index 3332b13ac4..77024081bb 100644
--- a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
+++ b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
@@ -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" />
diff --git a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
index 2ae2fe539b..f0691feabc 100644
--- a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
+++ b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
@@ -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" />
diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
index eca49ea126..6e583f4d60 100644
--- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
+++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
@@ -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" />
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
index 7ecf9a0122..fc7147e4f0 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <InProcessTestSite>true</InProcessTestSite>
-    <IsIISTest>true</IsIISTest>
   </PropertyGroup>
 
   <Import Project="../FunctionalTest.props" />