Re-enable full IIS tests on Windows.10.Amd64.EnterpriseRS3.ASPNET.Open (#7959)

pakrym · web-flow · commit 783131a7501a · 2019-02-27T11:03:41.000-08:00
diff --git a/eng/helix/vstest/runtests.cmd b/eng/helix/vstest/runtests.cmd
@@ -1,14 +1,20 @@
 set target=%1
 set sdkVersion=%2
 set runtimeVersion=%3
-set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\sdk
-powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture x64 -Version %sdkVersion% -InstallDir %DOTNET_ROOT%"
-powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture x64 -Runtime dotnet -Version %runtimeVersion% -InstallDir %DOTNET_ROOT%"
+
+set DOTNET_HOME=%HELIX_CORRELATION_PAYLOAD%\sdk
+set DOTNET_ROOT=%DOTNET_HOME%\x64
 set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-set PATH=%DOTNET_ROOT%;%PATH%
 set DOTNET_MULTILEVEL_LOOKUP=0
 set DOTNET_CLI_HOME=%HELIX_CORRELATION_PAYLOAD%\home
-set helix=true
-%DOTNET_ROOT%\dotnet vstest %target% --logger:trx
+
+set PATH=%DOTNET_ROOT%;%PATH%
+
+powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture x64 -Version %sdkVersion% -InstallDir %DOTNET_ROOT%"
+powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture x64 -Runtime dotnet -Version %runtimeVersion% -InstallDir %DOTNET_ROOT%"
+
+set HELIX=true
+
+%DOTNET_ROOT%\dotnet vstest %target% --logger:trx --logger:console;verbosity=normal
 
 
diff --git a/eng/scripts/RunPowershell.cmd b/eng/scripts/RunPowershell.cmd
@@ -3,4 +3,9 @@
 SET _TAIL=%*
 CALL SET _TAIL=%%_TAIL:*%1=%%
 
-PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = ''; try { & '%~dp0%1' %_TAIL%; exit $LASTEXITCODE } catch { write-host $_; exit 1 }"
+SET POWERSHELL=%windir%\System32\WindowsPowerShell\v1.0\powershell.exe
+
+rem Force 64bit powershell
+if /i "%PROCESSOR_ARCHITEW6432%" EQU "AMD64" SET POWERSHELL=%windir%\sysnative\WindowsPowerShell\v1.0\powershell.exe
+
+%POWERSHELL% -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = ''; try { & '%~dp0%1' %_TAIL%; exit $LASTEXITCODE } catch { write-host $_; exit 1 }"
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
@@ -1,11 +1,18 @@
 <Project>
+    <ItemDefinitionGroup>
+        <HelixAvailibleTargetQueue>
+            <EnableByDefault>true</EnableByDefault>
+        </HelixAvailibleTargetQueue>
+    </ItemDefinitionGroup>
+
     <!-- this file is shared between Helix.proj and .csproj files -->
     <ItemGroup>
         <HelixAvailblePlatform Include="Windows" />
         <HelixAvailblePlatform Include="OSX" />
         <HelixAvailblePlatform Include="Linux" />
 
         <HelixAvailibleTargetQueue Include="Windows.10.Amd64.ClientRS4.VS2017.Open" Platform="Windows" />
+        <HelixAvailibleTargetQueue Include="Windows.10.Amd64.EnterpriseRS3.ASPNET.Open" Platform="Windows" EnableByDefault="false" />
         <HelixAvailibleTargetQueue Include="OSX.1012.Amd64.Open" Platform="OSX" />
         <HelixAvailibleTargetQueue Include="Ubuntu.1810.Amd64.Open" Platform="Linux" />
         <HelixAvailibleTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
@@ -29,11 +29,16 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <_HelixProjectTargetQueue Include="%(HelixAvailibleTargetQueue.Identity)" Condition="'$(_SelectedPlatforms.Contains(%(Platform)))' == 'true' AND '%(Identity)' == '$(HelixTargetQueue)'" />
+      <!-- Include default queues based on platform -->
+      <_HelixProjectTargetQueue Include="%(HelixAvailibleTargetQueue.Identity)" Condition="'$(_SelectedPlatforms.Contains(%(Platform)))' == 'true' AND '%(EnableByDefault)' == 'true'" />
+      <!-- Unconditionally include queues defined by project  -->
+      <_HelixProjectTargetQueue Include="%(HelixProjectTargetQueue.Identity)" />
+
+      <_HelixApplicableTargetQueue Include="%(_HelixProjectTargetQueue.Identity)" Condition="'%(Identity)' == '$(HelixTargetQueue)'" />
     </ItemGroup>
 
     <PropertyGroup>
-      <BuildHelixPayload Condition="'@(_HelixProjectTargetQueue->Count())' == '0'">false</BuildHelixPayload>
+      <BuildHelixPayload Condition="'@(_HelixApplicableTargetQueue->Count())' == '0'">false</BuildHelixPayload>
     </PropertyGroup>
 
   </Target>
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
@@ -31,7 +31,6 @@ public StartupTests(PublishedSitesFixture fixture)
 
         private readonly string _dotnetLocation = DotNetCommands.GetDotNetExecutable(RuntimeArchitecture.x64);
 
-        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
         [ConditionalFact]
         [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
         public async Task ExpandEnvironmentVariableInWebConfig()
@@ -68,7 +67,6 @@ public async Task InvalidProcessPath_ExpectServerError(string path, string argum
             Assert.Contains("HTTP Error 500.0 - ANCM In-Process Handler Load Failure", await response.Content.ReadAsStringAsync());
         }
 
-        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
         [ConditionalFact]
         public async Task StartsWithDotnetLocationWithoutExe()
         {
@@ -80,7 +78,6 @@ public async Task StartsWithDotnetLocationWithoutExe()
             await StartAsync(deploymentParameters);
         }
 
-        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
         [ConditionalFact]
         public async Task StartsWithDotnetLocationUppercase()
         {
@@ -92,7 +89,6 @@ public async Task StartsWithDotnetLocationUppercase()
             await StartAsync(deploymentParameters);
         }
 
-        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
         [ConditionalTheory]
         [InlineData("dotnet")]
         [InlineData("dotnet.EXE")]
@@ -113,7 +109,7 @@ public async Task StartsWithDotnetOnThePath(string path)
         }
 
 
-        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
+        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7972
         [ConditionalTheory]
         [InlineData(RuntimeArchitecture.x64)]
         [InlineData(RuntimeArchitecture.x86)]
@@ -190,7 +186,7 @@ public async Task HelloWorld(TestVariant variant)
             await StartAsync(deploymentParameters);
         }
 
-        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
+        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7972
         [ConditionalFact]
         [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
         public async Task StartsWithPortableAndBootstraperExe()
diff --git a/src/Servers/IIS/IIS/test/FunctionalTest.props b/src/Servers/IIS/IIS/test/FunctionalTest.props
@@ -12,11 +12,17 @@
 
   <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" />
 
     <HelixContent Include="..\..\..\tools\update_schema.ps1" />
+    <HelixContent Include="..\..\..\tools\InstallIISFeatures.ps1" />
     <HelixContent Include="..\..\..\tools\UpdateIISExpressCertificate.ps1" />
     <HelixContent Include="..\..\..\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" />
 
+    <HelixPreCommand Condition="'$(IsIISTest)' == 'true'" Include="call RunPowershell.cmd InstallIISFeatures.ps1" />
     <HelixPreCommand Include="call RunPowershell.cmd update_schema.ps1" />
     <HelixPreCommand Include="call RunPowershell.cmd UpdateIISExpressCertificate.ps1" />
   </ItemGroup>
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
@@ -1,14 +1,15 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="../FunctionalTest.props" />
-
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <TestGroupName>IISBackwardsCompatibility.FunctionalTests</TestGroupName>
     <DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
     <SkipTests Condition=" '$(SkipIISBackwardsCompatibilityTests)' == 'true' ">true</SkipTests>
+    <IsIISTest>true</IsIISTest>
   </PropertyGroup>
 
+  <Import Project="../FunctionalTest.props" />
+
   <ItemGroup>
     <Compile Include="..\Common.FunctionalTests\**\*.cs" />
     <Compile Include="..\IIS.Shared.FunctionalTests\**\*.cs" />
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
@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="../FunctionalTest.props" />
-
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <TestGroupName>IISForwardsCompatibility.FunctionalTests</TestGroupName>
     <DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
     <SkipTests Condition=" '$(SkipIISForwardsCompatibilityTests)' == 'true' ">true</SkipTests>
+    <IsIISTest>true</IsIISTest>
   </PropertyGroup>
 
+  <Import Project="../FunctionalTest.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Common.Tests\Common.Tests.csproj" />
     <ProjectReference Include="$(RepositoryRoot)src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj" />
diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="../FunctionalTest.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <TestGroupName>IIS.FunctionalTests</TestGroupName>
     <DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
     <SkipTests Condition=" '$(SkipIISTests)' == 'true' ">true</SkipTests>
+    <IsIISTest>true</IsIISTest>
   </PropertyGroup>
 
+  <Import Project="../FunctionalTest.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Common.Tests\Common.Tests.csproj" />
     <ProjectReference Include="$(RepositoryRoot)src\Servers\IIS\IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj" />
diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs
@@ -15,6 +15,7 @@ public class MofFileTests
         [ConditionalFact]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
         [RequiresIIS(IISCapability.TracingModule)]
+        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7972
         public void CheckMofFile()
         {
             var path = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "aspnetcoremodulev2", "aspnetcore", "ancm.mof");
diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs
@@ -59,7 +59,7 @@ static RequiresIISAttribute()
                 return;
             }
 
-            var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema_v2.xml");
+            var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema.xml");
 
             if (!File.Exists(ancmConfigPath) && !SkipInVSTSAttribute.RunningInVSTS)
             {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ public StartupTests(PublishedSitesFixture fixture)`
`31`	`31`
`32`	`32`	`private readonly string _dotnetLocation = DotNetCommands.GetDotNetExecutable(RuntimeArchitecture.x64);`
`33`	`33`
`34`		`- [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549`
`35`	`34`	`[ConditionalFact]`
`36`	`35`	`[RequiresIIS(IISCapability.PoolEnvironmentVariables)]`
`37`	`36`	`public async Task ExpandEnvironmentVariableInWebConfig()`
`@@ -68,7 +67,6 @@ public async Task InvalidProcessPath_ExpectServerError(string path, string argum`
`68`	`67`	`Assert.Contains("HTTP Error 500.0 - ANCM In-Process Handler Load Failure", await response.Content.ReadAsStringAsync());`
`69`	`68`	`}`
`70`	`69`
`71`		`- [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549`
`72`	`70`	`[ConditionalFact]`
`73`	`71`	`public async Task StartsWithDotnetLocationWithoutExe()`
`74`	`72`	`{`
`@@ -80,7 +78,6 @@ public async Task StartsWithDotnetLocationWithoutExe()`
`80`	`78`	`await StartAsync(deploymentParameters);`
`81`	`79`	`}`
`82`	`80`
`83`		`- [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549`
`84`	`81`	`[ConditionalFact]`
`85`	`82`	`public async Task StartsWithDotnetLocationUppercase()`
`86`	`83`	`{`
`@@ -92,7 +89,6 @@ public async Task StartsWithDotnetLocationUppercase()`
`92`	`89`	`await StartAsync(deploymentParameters);`
`93`	`90`	`}`
`94`	`91`
`95`		`- [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549`
`96`	`92`	`[ConditionalTheory]`
`97`	`93`	`[InlineData("dotnet")]`
`98`	`94`	`[InlineData("dotnet.EXE")]`
`@@ -113,7 +109,7 @@ public async Task StartsWithDotnetOnThePath(string path)`
`113`	`109`	`}`
`114`	`110`
`115`	`111`
`116`		`- [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549`
	`112`	`+ [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7972`
`117`	`113`	`[ConditionalTheory]`
`118`	`114`	`[InlineData(RuntimeArchitecture.x64)]`
`119`	`115`	`[InlineData(RuntimeArchitecture.x86)]`
`@@ -190,7 +186,7 @@ public async Task HelloWorld(TestVariant variant)`
`190`	`186`	`await StartAsync(deploymentParameters);`
`191`	`187`	`}`
`192`	`188`
`193`		`- [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549`
	`189`	`+ [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7972`
`194`	`190`	`[ConditionalFact]`
`195`	`191`	`[RequiresIIS(IISCapability.PoolEnvironmentVariables)]`
`196`	`192`	`public async Task StartsWithPortableAndBootstraperExe()`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public class MofFileTests`
`15`	`15`	`[ConditionalFact]`
`16`	`16`	`[OSSkipCondition(OperatingSystems.Linux \| OperatingSystems.MacOSX)]`
`17`	`17`	`[RequiresIIS(IISCapability.TracingModule)]`
	`18`	`+ [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7972`
`18`	`19`	`public void CheckMofFile()`
`19`	`20`	`{`
`20`	`21`	`var path = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "aspnetcoremodulev2", "aspnetcore", "ancm.mof");`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ static RequiresIISAttribute()`
`59`	`59`	`return;`
`60`	`60`	`}`
`61`	`61`
`62`		`- var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema_v2.xml");`
	`62`	`+ var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema.xml");`
`63`	`63`
`64`	`64`	`if (!File.Exists(ancmConfigPath) && !SkipInVSTSAttribute.RunningInVSTS)`
`65`	`65`	`{`