Revert "Reenable framework unit tests on helix (#19975)"

HaoK · HaoK · commit b3aee8cb71fb · 2020-04-08T15:57:10.000-07:00
This reverts commit 9a792f2.
diff --git a/eng/helix/content/InstallAppRuntime.ps1 b/eng/helix/content/InstallAppRuntime.ps1
@@ -30,6 +30,8 @@ $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138
 
 Set-StrictMode -Version 1
 
+Write-Host "Extracting to $InstallDir"
+
 $zipPackage = [io.path]::ChangeExtension($AppRuntimePath, ".zip")
 Write-Host "Renaming to $zipPackage"
 Rename-Item -Path $AppRuntimePath -NewName $zipPackage
@@ -44,9 +46,8 @@ else {
     [System.IO.Compression.ZipFile]::ExtractToDirectory($zipPackage, ".\tmpRuntime")
 }
 
-New-Item -ItemType Directory -Force -Path $InstallDir
-Write-Host "Copying *.txt to $InstallDir"
-Copy-Item -Path ".\tmpRuntime\*.txt" $InstallDir
+Get-ChildItem -Path ".\tmpRuntime" -Recurse
+
 Write-Host "Copying managed files to $InstallDir"
 Copy-Item -Path ".\tmpRuntime\runtimes\$RuntimeIdentifier\lib\$Framework\*" $InstallDir
 Write-Host "Copying native files to $InstallDir"
diff --git a/eng/helix/content/InstallAspNetRef.ps1 b/eng/helix/content/InstallAspNetRef.ps1
diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
@@ -65,25 +65,25 @@ public bool SetupEnvironment()
             }
         }
 
-        public void DisplayContents(string path = "./")
+        public void DisplayContents()
         {
             try 
             {
                 Console.WriteLine();
-                Console.WriteLine($"Displaying directory contents for {path}:");
-                foreach (var file in Directory.EnumerateFiles(path))
+                Console.WriteLine("Displaying directory contents:");
+                foreach (var file in Directory.EnumerateFiles("./"))
                 {
                     Console.WriteLine(Path.GetFileName(file));
                 }
-                foreach (var file in Directory.EnumerateDirectories(path))
+                foreach (var file in Directory.EnumerateDirectories("./"))
                 {
                     Console.WriteLine(Path.GetFileName(file));
                 }
                 Console.WriteLine();
             }
             catch (Exception e)
             {
-                Console.WriteLine($"Exception in DisplayContents: {e.ToString()}");
+                Console.WriteLine($"Exception in DisplayInitialState: {e.ToString()}");
             }
         }
 
@@ -95,17 +95,11 @@ public async Task<bool> InstallAspNetAppIfNeededAsync()
                 if (Directory.Exists("Microsoft.AspNetCore.App"))
                 {
                     var appRuntimePath = $"{Options.DotnetRoot}/shared/Microsoft.AspNetCore.App/{Options.RuntimeVersion}";
-                    Console.WriteLine($"Creating directory: {appRuntimePath}");
-                    Directory.CreateDirectory(appRuntimePath);
                     Console.WriteLine($"Found Microsoft.AspNetCore.App/, copying to {appRuntimePath}");
-                    Console.WriteLine($"Set ASPNET_RUNTIME_PATH: {appRuntimePath}");
-                    EnvironmentVariables.Add("ASPNET_RUNTIME_PATH", appRuntimePath);
                     foreach (var file in Directory.EnumerateFiles("Microsoft.AspNetCore.App", "*.*", SearchOption.AllDirectories))
                     {
-                        File.Copy(file, Path.Combine(appRuntimePath, Path.GetFileName(file)), overwrite: true);
+                        File.Copy(file, Path.Combine(appRuntimePath, file), overwrite: true);
                     }
-                    
-                    DisplayContents(appRuntimePath);
 
                     Console.WriteLine($"Adding current directory to nuget sources: {Options.HELIX_WORKITEM_ROOT}");
 
diff --git a/eng/helix/content/installappruntime.sh b/eng/helix/content/installappruntime.sh
@@ -16,6 +16,5 @@ mkdir -p $tmpDir
 unzip sharedFx.zip -d $tmpDir
 mkdir -p $output_dir
 echo "Copying to $output_dir"
-cp $tmpDir/*.txt $output_dir
 cp $tmpDir/runtimes/$rid/lib/$framework/* $output_dir
 cp $tmpDir/runtimes/$rid/native/* $output_dir
diff --git a/eng/helix/content/installaspnetref.sh b/eng/helix/content/installaspnetref.sh
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
@@ -16,16 +16,6 @@
     <HelixPreCommand Include="call RunPowershell.cmd InstallNode.ps1 $(NodeVersion) %25HELIX_CORRELATION_PAYLOAD%25\node\bin || exit /b 1" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(IsHelixJob)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true' AND '$(TestDependsOnAspNetRef)' == 'true' AND '$(IsTargetingPackBuilding)' == 'true'">
-    <HelixContent Include="$(RepoRoot)artifacts\packages\Release\Shipping\Microsoft.AspNetCore.App.Ref.$(AppRuntimeVersion).nupkg" />
-    <HelixPreCommand Include="call RunPowershell.cmd InstallAspNetRef.ps1 Microsoft.AspNetCore.App.Ref.$(AppRuntimeVersion).nupkg Microsoft.AspNetCore.App.Ref || exit /b 1" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(IsHelixJob)' == 'true' AND '$(IsWindowsHelixQueue)' == 'false' AND '$(TestDependsOnAspNetRef)' == 'true' AND '$(IsTargetingPackBuilding)' == 'true'">
-    <HelixContent Include="$(RepoRoot)artifacts\packages\Release\Shipping\Microsoft.AspNetCore.App.Ref.$(AppRuntimeVersion).nupkg" />
-    <HelixPreCommand Include="./installaspnetref.sh Microsoft.AspNetCore.App.Ref.$(AppRuntimeVersion).nupkg Microsoft.AspNetCore.App.Ref || exit /b 1" />
-  </ItemGroup>
-  
   <ItemGroup Condition="'$(IsHelixJob)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true' AND '$(TestDependsOnAspNetRuntime)' == 'true'">
     <HelixContent Include="$(RepoRoot)artifacts\packages\Release\Shipping\Microsoft.AspNetCore.App.Runtime.win-x64.$(AppRuntimeVersion).nupkg" />
     <HelixPreCommand Include="call RunPowershell.cmd InstallAppRuntime.ps1 Microsoft.AspNetCore.App.Runtime.win-x64.$(AppRuntimeVersion).nupkg Microsoft.AspNetCore.App netcoreapp5.0 win-x64 || exit /b 1" />
diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <RootNamespace>Microsoft.AspNetCore</RootNamespace>
+    <!-- https://github.com/dotnet/aspnetcore/issues/7939: This unit test requires the shared framework be available in Helix. -->
+    <BuildHelixPayload>false</BuildHelixPayload>
     <VerifyAncmBinary Condition="'$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' != 'arm'">true</VerifyAncmBinary>
-    <TestDependsOnAspNetRuntime>true</TestDependsOnAspNetRuntime>
-    <TestDependsOnAspNetRef>true</TestDependsOnAspNetRef>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
@@ -23,9 +23,7 @@ public SharedFxTests(ITestOutputHelper output)
             _output = output;
             _expectedTfm = "netcoreapp" + TestData.GetSharedFxVersion().Substring(0, 3);
             _expectedRid = TestData.GetSharedFxRuntimeIdentifier();
-            _sharedFxRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH"))
-                ? Path.Combine(TestData.GetTestDataValue("SharedFrameworkLayoutRoot"), "shared", TestData.GetTestDataValue("RuntimePackageVersion"))
-                : Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH");
+            _sharedFxRoot = Path.Combine(TestData.GetTestDataValue("SharedFrameworkLayoutRoot"), "shared", "Microsoft.AspNetCore.App", TestData.GetTestDataValue("RuntimePackageVersion"));
         }
 
         [Fact]
diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs
@@ -26,9 +26,7 @@ public TargetingPackTests(ITestOutputHelper output)
         {
             _output = output;
             _expectedRid = TestData.GetSharedFxRuntimeIdentifier();
-            _targetingPackRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix")) 
-                ? Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion"))
-                : Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"), "Microsoft.AspNetCore.App.Ref");
+            _targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion"));
             _isTargetingPackBuilding = bool.Parse(TestData.GetTestDataValue("IsTargetingPackBuilding"));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -65,25 +65,25 @@ public bool SetupEnvironment()`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- public void DisplayContents(string path = "./")`
	`68`	`+ public void DisplayContents()`
`69`	`69`	`{`
`70`	`70`	`try`
`71`	`71`	`{`
`72`	`72`	`Console.WriteLine();`
`73`		`- Console.WriteLine($"Displaying directory contents for {path}:");`
`74`		`- foreach (var file in Directory.EnumerateFiles(path))`
	`73`	`+ Console.WriteLine("Displaying directory contents:");`
	`74`	`+ foreach (var file in Directory.EnumerateFiles("./"))`
`75`	`75`	`{`
`76`	`76`	`Console.WriteLine(Path.GetFileName(file));`
`77`	`77`	`}`
`78`		`- foreach (var file in Directory.EnumerateDirectories(path))`
	`78`	`+ foreach (var file in Directory.EnumerateDirectories("./"))`
`79`	`79`	`{`
`80`	`80`	`Console.WriteLine(Path.GetFileName(file));`
`81`	`81`	`}`
`82`	`82`	`Console.WriteLine();`
`83`	`83`	`}`
`84`	`84`	`catch (Exception e)`
`85`	`85`	`{`
`86`		`- Console.WriteLine($"Exception in DisplayContents: {e.ToString()}");`
	`86`	`+ Console.WriteLine($"Exception in DisplayInitialState: {e.ToString()}");`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`@@ -95,17 +95,11 @@ public async Task<bool> InstallAspNetAppIfNeededAsync()`
`95`	`95`	`if (Directory.Exists("Microsoft.AspNetCore.App"))`
`96`	`96`	`{`
`97`	`97`	`var appRuntimePath = $"{Options.DotnetRoot}/shared/Microsoft.AspNetCore.App/{Options.RuntimeVersion}";`
`98`		`- Console.WriteLine($"Creating directory: {appRuntimePath}");`
`99`		`- Directory.CreateDirectory(appRuntimePath);`
`100`	`98`	`Console.WriteLine($"Found Microsoft.AspNetCore.App/, copying to {appRuntimePath}");`
`101`		`- Console.WriteLine($"Set ASPNET_RUNTIME_PATH: {appRuntimePath}");`
`102`		`- EnvironmentVariables.Add("ASPNET_RUNTIME_PATH", appRuntimePath);`
`103`	`99`	`foreach (var file in Directory.EnumerateFiles("Microsoft.AspNetCore.App", ".", SearchOption.AllDirectories))`
`104`	`100`	`{`
`105`		`- File.Copy(file, Path.Combine(appRuntimePath, Path.GetFileName(file)), overwrite: true);`
	`101`	`+ File.Copy(file, Path.Combine(appRuntimePath, file), overwrite: true);`
`106`	`102`	`}`
`107`		`-`
`108`		`- DisplayContents(appRuntimePath);`
`109`	`103`
`110`	`104`	`Console.WriteLine($"Adding current directory to nuget sources: {Options.HELIX_WORKITEM_ROOT}");`
`111`	`105`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,7 @@ public TargetingPackTests(ITestOutputHelper output)`
`26`	`26`	`{`
`27`	`27`	`_output = output;`
`28`	`28`	`_expectedRid = TestData.GetSharedFxRuntimeIdentifier();`
`29`		`- _targetingPackRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))`
`30`		`- ? Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion"))`
`31`		`- : Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"), "Microsoft.AspNetCore.App.Ref");`
	`29`	`+ _targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion"));`
`32`	`30`	`_isTargetingPackBuilding = bool.Parse(TestData.GetTestDataValue("IsTargetingPackBuilding"));`
`33`	`31`	`}`
`34`	`32`