From 76ad4ae91a1d1740db01f4c756a7f71008387b5c Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 1 Apr 2021 09:25:32 -0700
Subject: [PATCH 01/81] Update helix.proj

---
 eng/helix/helix.proj | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 65e47db27434..89cf01240f28 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -30,6 +30,19 @@
     <OutputPath Condition="'$(OutputPath)' == '' and '$(PlatformName)' != 'AnyCPU'">$(BaseOutputPath)$(PlatformName)\$(Configuration)\</OutputPath>
   </PropertyGroup>
 
+
+  <!-- Specify the runtime we need -->
+  <ItemGroup>
+    <!--
+      When the targeting pack builds, it has exactly the same version as the shared framework. Passing
+      SharedFxVersion because that's needed even when the targeting pack isn't building.
+      Use the BrowserDebugHost transport package as a sentinel for the non-shipping version of the NETCoreApp shared framework.
+    -->    
+    <AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
+      <PackageType>runtime</PackageType>
+    </AdditionalDotNetPackage>
+  </ItemGroup>
+  
   <PropertyGroup Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">
     <HelixType>ci</HelixType>
     <!-- Creator is not valid for internal queues -->

From 960e0d7c6b0466121aafa5b1783a59d4df5fa03d Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 1 Apr 2021 09:26:00 -0700
Subject: [PATCH 02/81] Update helix.proj

---
 eng/helix/helix.proj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 89cf01240f28..61ef67ef86dc 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -30,8 +30,7 @@
     <OutputPath Condition="'$(OutputPath)' == '' and '$(PlatformName)' != 'AnyCPU'">$(BaseOutputPath)$(PlatformName)\$(Configuration)\</OutputPath>
   </PropertyGroup>
 
-
-  <!-- Specify the runtime we need -->
+  <!-- Specify the runtime we need which will be included as a correlation payload -->
   <ItemGroup>
     <!--
       When the targeting pack builds, it has exactly the same version as the shared framework. Passing

From 87cdb523084a112b48237b66f92cbfa8948c6e15 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 1 Apr 2021 09:27:43 -0700
Subject: [PATCH 03/81] Stop install sdk/runtime

---
 eng/helix/content/runtests.ps1 | 61 ----------------------------------
 1 file changed, 61 deletions(-)

diff --git a/eng/helix/content/runtests.ps1 b/eng/helix/content/runtests.ps1
index 20b892a88d34..689804d3c644 100644
--- a/eng/helix/content/runtests.ps1
+++ b/eng/helix/content/runtests.ps1
@@ -21,67 +21,6 @@ $env:PLAYWRIGHT_DRIVER_PATH = "$currentDirectory\.playwright\win-x64\native\play
 
 $envPath = "$env:PATH;$env:HELIX_CORRELATION_PAYLOAD\node\bin"
 
-function InvokeInstallDotnet([string]$command) {
-    Write-Host "InstallDotNet $command"
-
-    $timeoutSeconds = 180
-    $proc = Start-Process -filePath powershell.exe -ArgumentList "-noLogo -NoProfile -ExecutionPolicy unrestricted -command `"$command`"" -NoNewWindow -PassThru
-
-    $proc | Wait-Process -Timeout $timeoutSeconds
-    $exitCode = $proc.ExitCode
-
-    if ($exitCode -eq 0) {
-        Write-Host "InstallDotNet $command completed successfully"
-        return $true
-    }
-    elseif ([string]::IsNullOrWhiteSpace($exitCode)) {
-        Write-Warning "InstallDotNet $command timed out after $timeoutSeconds seconds"
-    }
-    else {
-        Write-Warning "InstallDotNet $command failed with exit code $exitCode"
-    }
-
-    $proc | Stop-Process -Force
-
-    return $false
-}
-
-function InstallDotnetSDKAndRuntime([string]$Feed, [string]$FeedCredParam) {
-    foreach ($i in 1..5) {
-        $random = Get-Random -Maximum 1024
-        $env:DOTNET_HOME = Join-Path $currentDirectory "sdk$random"
-        $env:DOTNET_ROOT = Join-Path $env:DOTNET_HOME $Arch
-        $env:DOTNET_CLI_HOME = Join-Path $currentDirectory "home$random"
-        $env:PATH = "$env:DOTNET_ROOT;$envPath"
-
-        Write-Host "Set PATH to: $env:PATH"
-
-        $success = InvokeInstallDotnet ". eng\common\tools.ps1; InstallDotNet $env:DOTNET_ROOT $SdkVersion $Arch `'`' `$true `'$Feed`' `'$FeedCredParam`' `$true"
-        if (!$success) {
-            Write-Host "Retrying..."
-            continue
-        }
-
-        $success = InvokeInstallDotnet ". eng\common\tools.ps1; InstallDotNet $env:DOTNET_ROOT $RuntimeVersion $Arch dotnet `$true `'$Feed`' `'$FeedCredParam`' `$true"
-
-        if (!$success) {
-            Write-Host "Retrying..."
-            continue
-        }
-
-        return
-    }
-
-    Write-Error "InstallDotNet $command exceeded retry limit"
-    exit 1
-}
-
-if ([string]::IsNullOrEmpty($FeedCred)) {
-    InstallDotnetSDKAndRuntime
-} else {
-    InstallDotnetSDKAndRuntime "https://dotnetclimsrc.blob.core.windows.net/dotnet" $FeedCred
-}
-
 Write-Host "Restore: dotnet restore RunTests\RunTests.csproj --ignore-failed-sources"
 dotnet restore RunTests\RunTests.csproj --ignore-failed-sources
 

From 2fe6981bd4c94442b46086af226b504187f341be Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 1 Apr 2021 09:32:37 -0700
Subject: [PATCH 04/81] Update runtests.sh

---
 eng/helix/content/runtests.sh | 60 +++--------------------------------
 1 file changed, 5 insertions(+), 55 deletions(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 357481f5eac3..102d50c24a07 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -11,21 +11,7 @@ YELLOW="\033[0;33m"
 MAGENTA="\033[0;95m"
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-# Ensures every invocation of dotnet apps uses the same dotnet.exe
-# Add $random to path to ensure tests don't expect dotnet to be in a particular path
-export DOTNET_ROOT="$DIR/.dotnet$RANDOM"
-
-# Ensure dotnet comes first on PATH
-export PATH="$DOTNET_ROOT:$PATH:$DIR/node/bin"
-
-# Prevent fallback to global .NET locations. This ensures our tests use the shared frameworks we specify and don't rollforward to something else that might be installed on the machine
-export DOTNET_MULTILEVEL_LOOKUP=0
-
-# Avoid contaminating userprofiles
-# Add $random to path to ensure tests don't expect home to be in a particular path
-export DOTNET_CLI_HOME="$DIR/.home$RANDOM"
-
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+export PATH="$PATH:$DIR/node/bin"
 
 # Set playwright stuff
 export PLAYWRIGHT_BROWSERS_PATH="$DIR/ms-playwright"
@@ -74,39 +60,6 @@ RED="\033[0;31m"
 YELLOW="\033[0;33m"
 MAGENTA="\033[0;95m"
 
-. eng/common/tools.sh
-
-if [[ -z "${11:-}" ]]; then
-    echo "InstallDotNet $DOTNET_ROOT $dotnet_sdk_version '' '' true"
-    InstallDotNet $DOTNET_ROOT $dotnet_sdk_version "" "" true || {
-      exit_code=$?
-      Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
-      ExitWithExitCode $exit_code
-    }
-    echo
-
-    echo "InstallDotNet $DOTNET_ROOT $dotnet_runtime_version '' dotnet true"
-    InstallDotNet $DOTNET_ROOT $dotnet_runtime_version "" dotnet true || {
-      exit_code=$?
-      Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
-      ExitWithExitCode $exit_code
-    }
-else
-    echo "InstallDotNet $DOTNET_ROOT $dotnet_sdk_version '' '' true https://dotnetclimsrc.blob.core.windows.net/dotnet ..."
-    InstallDotNet $DOTNET_ROOT $dotnet_sdk_version "" "" true https://dotnetclimsrc.blob.core.windows.net/dotnet ${11} || {
-      exit_code=$?
-      Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
-      ExitWithExitCode $exit_code
-    }
-    echo
-
-    echo "InstallDotNet $DOTNET_ROOT $dotnet_runtime_version '' dotnet true https://dotnetclimsrc.blob.core.windows.net/dotnet ..."
-    InstallDotNet $DOTNET_ROOT $dotnet_runtime_version "" dotnet true https://dotnetclimsrc.blob.core.windows.net/dotnet ${11} || {
-      exit_code=$?
-      Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
-      ExitWithExitCode $exit_code
-    }
-fi
 echo
 
 if [ -e /proc/self/coredump_filter ]; then
@@ -121,15 +74,12 @@ sync
 
 exit_code=0
 
-echo "Restore: $DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --ignore-failed-sources"
-$DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --ignore-failed-sources
+echo "Restore: dotnet restore RunTests/RunTests.csproj --ignore-failed-sources"
+dotnet restore RunTests/RunTests.csproj --ignore-failed-sources
 
-echo "Running tests: $DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $helixQueue --arch $6 --quarantined $7 --ef $8 --helixTimeout $9"
-$DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $helixQueue --arch $6 --quarantined $7 --ef $8 --helixTimeout $9
+echo "Running tests: dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $helixQueue --arch $6 --quarantined $7 --ef $8 --helixTimeout $9"
+dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $helixQueue --arch $6 --quarantined $7 --ef $8 --helixTimeout $9
 exit_code=$?
 echo "Finished tests...exit_code=$exit_code"
 
-# dotnet-install.sh leaves the temporary SDK archive on the helix machine which slowly fills the disk, we'll be nice and clean it until the script fixes the issue
-rm -r -f ${TMPDIR:-/tmp}/dotnet.*
-
 exit $exit_code

From dc7c410c9b6bb30ea1b01b78a6fc1b5a64996714 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 1 Apr 2021 11:19:15 -0700
Subject: [PATCH 05/81] Include cli

---
 eng/helix/helix.proj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 61ef67ef86dc..9f8e0b35e25a 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -23,6 +23,10 @@
     <IsExternal>true</IsExternal>
     <MaxRetryCount Condition="'$(MaxRetryCount)' == ''">2</MaxRetryCount>
     <HelixAccessToken Condition="'$(_UseHelixOpenQueues)' != 'true'">$(HelixApiAccessToken)</HelixAccessToken>
+    <IncludeDotNetCli>true</IncludeDotNetCli>
+    <DotNetCliPackageType>sdk</DotNetCliPackageType>
+    <DotNetCliVersion>$(NETCoreSdkVersion)</DotNetCliVersion>    
+    <DotNetCliChannel>Current</DotNetCliChannel>
 
     <!-- Copied from Microsoft.NET.DefaultOutputPaths.targets in the .NET SDK. The Helix SDK contains nothing similar. -->
     <BaseOutputPath Condition="'$(BaseOutputPath)' == ''">bin\</BaseOutputPath>

From c158d4b7f8d9c5cb2e2796b6f9c86610c7424530 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 1 Apr 2021 14:00:24 -0700
Subject: [PATCH 06/81] Update ci.yml

---
 .azure/pipelines/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 26f8f50b24c1..68c17ba46157 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -751,7 +751,7 @@ stages:
         - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
                   /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
           displayName: Restore interop projects
-        - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
+        - script: ./eng/build.cmd -ci /bl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
                   /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
                   /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
           displayName: Run build.cmd helix target

From 53d26a31744e5705d24edb9350cd695824159739 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 1 Apr 2021 20:34:33 -0700
Subject: [PATCH 07/81] Hardcode runtime package version for now

---
 eng/helix/helix.proj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 9f8e0b35e25a..52c1e34ab4ab 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -40,8 +40,9 @@
       When the targeting pack builds, it has exactly the same version as the shared framework. Passing
       SharedFxVersion because that's needed even when the targeting pack isn't building.
       Use the BrowserDebugHost transport package as a sentinel for the non-shipping version of the NETCoreApp shared framework.
-    -->    
     <AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
+    -->
+    <AdditionalDotNetPackage Include="6.0.0-preview.3.21167.1">
       <PackageType>runtime</PackageType>
     </AdditionalDotNetPackage>
   </ItemGroup>

From 4a788bb95e28632ccb0cb0bc0597b0d6f9f26aec Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 1 Apr 2021 22:39:54 -0700
Subject: [PATCH 08/81] Include correct runtime version

---
 eng/helix/helix.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 52c1e34ab4ab..86ba19ae371f 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -42,7 +42,7 @@
       Use the BrowserDebugHost transport package as a sentinel for the non-shipping version of the NETCoreApp shared framework.
     <AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
     -->
-    <AdditionalDotNetPackage Include="6.0.0-preview.3.21167.1">
+    <AdditionalDotNetPackage Include="6.0.0-preview.4.21201.1">
       <PackageType>runtime</PackageType>
     </AdditionalDotNetPackage>
   </ItemGroup>

From 1aae0504b8dc31d27f3b9256449429bbdcd77ff0 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 2 Apr 2021 01:02:27 -0700
Subject: [PATCH 09/81] Use real version

---
 eng/helix/helix.proj | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 86ba19ae371f..6550b6b275af 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -10,7 +10,8 @@
 
   <Import Project="..\targets\Helix.Common.props" />
   <Import Project="..\Build.props" />
-
+  <Import Project="..\Versions.props" />
+  
   <!-- Microsoft.DotNet.Helix.Sdk.MultiQueue.targets splits $(HelixTargetQueues) into @(HelixTargetQueue) items. -->
   <ItemGroup Condition=" '$(HelixTargetQueues)' == '' ">
     <HelixTargetQueue Condition="'$(_UseHelixOpenQueues)' == 'true'" Include="@(HelixAvailableTargetQueue)" />
@@ -37,12 +38,9 @@
   <!-- Specify the runtime we need which will be included as a correlation payload -->
   <ItemGroup>
     <!--
-      When the targeting pack builds, it has exactly the same version as the shared framework. Passing
-      SharedFxVersion because that's needed even when the targeting pack isn't building.
       Use the BrowserDebugHost transport package as a sentinel for the non-shipping version of the NETCoreApp shared framework.
-    <AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
     -->
-    <AdditionalDotNetPackage Include="6.0.0-preview.4.21201.1">
+    <AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
       <PackageType>runtime</PackageType>
     </AdditionalDotNetPackage>
   </ItemGroup>

From f30903f615879f1a43f984a5e2ff08b48bbb5e28 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 2 Apr 2021 01:05:59 -0700
Subject: [PATCH 10/81] Skip ref pack if already exists

---
 eng/helix/content/RunTests/TestRunner.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
index dbc62d769bdf..d60ac50a5f20 100644
--- a/eng/helix/content/RunTests/TestRunner.cs
+++ b/eng/helix/content/RunTests/TestRunner.cs
@@ -205,8 +205,15 @@ public bool InstallAspNetRefIfNeeded()
                 if (File.Exists(Options.AspNetRef))
                 {
                     var refPath = $"{Options.DotnetRoot}/packs/Microsoft.AspNetCore.App.Ref/{Options.RuntimeVersion}";
-                    Console.WriteLine($"Found AspNetRef: {Options.AspNetRef}, extracting to {refPath}");
-                    ZipFile.ExtractToDirectory(Options.AspNetRef, refPath);
+                    if (Directory.Exists(refPath))
+                    {
+                        Console.WriteLine($"AspNetRef install skipped: {refPath} already exists.");
+                    }
+                    else
+                    {
+                        Console.WriteLine($"Found AspNetRef: {Options.AspNetRef}, extracting to {refPath}");
+                        ZipFile.ExtractToDirectory(Options.AspNetRef, refPath);
+                    }
 
                     DisplayContents(refPath);
                 }

From b5c429f6915540af8cf48f23be024db1b21b60a3 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 2 Apr 2021 01:08:43 -0700
Subject: [PATCH 11/81] Update runtests.sh

---
 eng/helix/content/runtests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 102d50c24a07..323a3793f923 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -11,6 +11,10 @@ YELLOW="\033[0;33m"
 MAGENTA="\033[0;95m"
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+# Prevent fallback to global .NET locations. This ensures our tests use the shared frameworks we specify and don't rollforward to something else that might be installed on the machine
+export DOTNET_MULTILEVEL_LOOKUP=0
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+
 export PATH="$PATH:$DIR/node/bin"
 
 # Set playwright stuff

From 2be1a0bd3b22e9a47ca4a2ef931fad7ac459a934 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 2 Apr 2021 01:10:44 -0700
Subject: [PATCH 12/81] Update runtests.ps1

---
 eng/helix/content/runtests.ps1 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eng/helix/content/runtests.ps1 b/eng/helix/content/runtests.ps1
index 689804d3c644..5959931a384e 100644
--- a/eng/helix/content/runtests.ps1
+++ b/eng/helix/content/runtests.ps1
@@ -1,7 +1,5 @@
 param(
     [string]$Target,
-    [string]$SdkVersion,
-    [string]$RuntimeVersion,
     [string]$AspRuntimeVersion,
     [string]$Queue,
     [string]$Arch,

From 13b4d79162bff5081e0d6290e54e895a6ee256e9 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 2 Apr 2021 01:12:10 -0700
Subject: [PATCH 13/81] Update runtests.sh

---
 eng/helix/content/runtests.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 323a3793f923..43c9d492f235 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 
-dotnet_sdk_version="$2"
-dotnet_runtime_version="$3"
-helixQueue="$5"
-installPlaywright="${10}"
+helixQueue="$3"
+installPlaywright="$8"
 
 RESET="\033[0m"
 RED="\033[0;31m"
@@ -81,8 +79,8 @@ exit_code=0
 echo "Restore: dotnet restore RunTests/RunTests.csproj --ignore-failed-sources"
 dotnet restore RunTests/RunTests.csproj --ignore-failed-sources
 
-echo "Running tests: dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $helixQueue --arch $6 --quarantined $7 --ef $8 --helixTimeout $9"
-dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $helixQueue --arch $6 --quarantined $7 --ef $8 --helixTimeout $9
+echo "Running tests: dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --ef $6 --helixTimeout $7"
+dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --ef $6 --helixTimeout $7
 exit_code=$?
 echo "Finished tests...exit_code=$exit_code"
 

From e098181ebbdf26e9d9da58840e33d0a8694eeddd Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 2 Apr 2021 01:13:32 -0700
Subject: [PATCH 14/81] Update Helix.targets

---
 eng/targets/Helix.targets | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index c8d332b9977a..a11f49c9242f 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -179,10 +179,9 @@
         <!--
           When the targeting pack builds, it has exactly the same version as the shared framework. Passing
           SharedFxVersion because that's needed even when the targeting pack isn't building.
-          Use the BrowserDebugHost transport package as a sentinel for the non-shipping version of the NETCoreApp shared framework.
         -->
-        <Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreBrowserDebugHostTransportVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(TestDependsOnPlaywright) $(DotNetRuntimeSourceFeedKey)</Command>
-        <Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreBrowserDebugHostTransportVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(TestDependsOnPlaywright) $(DotNetRuntimeSourceFeedKey)</Command>
+        <Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(TestDependsOnPlaywright) $(DotNetRuntimeSourceFeedKey)</Command>
+        <Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(TestDependsOnPlaywright) $(DotNetRuntimeSourceFeedKey)</Command>
         <Command Condition="$(HelixCommand) != ''">$(HelixCommand)</Command>
         <Timeout>$(HelixTimeout)</Timeout>
       </HelixWorkItem>

From 8176e8aec8688bb7e1346f290a7255d1f644491e Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 2 Apr 2021 09:12:42 -0700
Subject: [PATCH 15/81] Try full matrix

---
 .azure/pipelines/helix-matrix.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml
index de615d9e345c..6c30ddfbaebb 100644
--- a/.azure/pipelines/helix-matrix.yml
+++ b/.azure/pipelines/helix-matrix.yml
@@ -1,5 +1,10 @@
 # We only want to run full helix matrix on main
-pr: none
+pr:
+  autoCancel: true
+  branches:
+    include:
+    - '*'
+
 trigger: none
 schedules:
 # Cron timezone is UTC.

From 41c1e75e129967fe0814de000f68aed42a011c27 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 2 Apr 2021 11:19:44 -0700
Subject: [PATCH 16/81] Change ref pack install location

---
 src/Framework/test/TargetingPackTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs
index 5f34153949c5..d9cfd947b769 100644
--- a/src/Framework/test/TargetingPackTests.cs
+++ b/src/Framework/test/TargetingPackTests.cs
@@ -32,7 +32,7 @@ public TargetingPackTests(ITestOutputHelper output)
             _targetingPackTfm = TestData.GetDefaultNetCoreTargetFramework();
             var root = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix")) ?
                 TestData.GetTestDataValue("TargetingPackLayoutRoot") :
-                Environment.GetEnvironmentVariable("DOTNET_ROOT");
+                Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT");
             _targetingPackRoot = Path.Combine(
                 root,
                 "packs",

From 92b5a3420918518caa2829cfbfee315b133f759c Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 2 Apr 2021 11:19:52 -0700
Subject: [PATCH 17/81] Install to workitem root

---
 eng/helix/content/RunTests/TestRunner.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
index d60ac50a5f20..0f98eeaed719 100644
--- a/eng/helix/content/RunTests/TestRunner.cs
+++ b/eng/helix/content/RunTests/TestRunner.cs
@@ -122,7 +122,7 @@ public async Task<bool> InstallAspNetAppIfNeededAsync()
             {
                 if (File.Exists(Options.AspNetRuntime))
                 {
-                    var appRuntimePath = $"{Options.DotnetRoot}/shared/Microsoft.AspNetCore.App/{Options.RuntimeVersion}";
+                    var appRuntimePath = $"{Options.HELIX_WORKITEM_ROOT}/shared/Microsoft.AspNetCore.App/{Options.RuntimeVersion}";
                     Console.WriteLine($"Creating directory: {appRuntimePath}");
                     Directory.CreateDirectory(appRuntimePath);
                     Console.WriteLine($"Set ASPNET_RUNTIME_PATH: {appRuntimePath}");
@@ -204,7 +204,7 @@ public bool InstallAspNetRefIfNeeded()
             {
                 if (File.Exists(Options.AspNetRef))
                 {
-                    var refPath = $"{Options.DotnetRoot}/packs/Microsoft.AspNetCore.App.Ref/{Options.RuntimeVersion}";
+                    var refPath = $"{Options.HELIX_WORKITEM_ROOT}/packs/Microsoft.AspNetCore.App.Ref/{Options.RuntimeVersion}";
                     if (Directory.Exists(refPath))
                     {
                         Console.WriteLine($"AspNetRef install skipped: {refPath} already exists.");

From 4da48d7fecb60fbd2c63069e7ba45ea9584272db Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:30:19 -0700
Subject: [PATCH 18/81] Update ci.yml

---
 .azure/pipelines/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 68c17ba46157..26f8f50b24c1 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -751,7 +751,7 @@ stages:
         - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
                   /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
           displayName: Restore interop projects
-        - script: ./eng/build.cmd -ci /bl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
+        - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
                   /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
                   /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
           displayName: Run build.cmd helix target

From c1e51ba13cad51119f03ff4906f7ea68d8d552b9 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:30:51 -0700
Subject: [PATCH 19/81] Update helix-matrix.yml

---
 .azure/pipelines/helix-matrix.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml
index 6c30ddfbaebb..de615d9e345c 100644
--- a/.azure/pipelines/helix-matrix.yml
+++ b/.azure/pipelines/helix-matrix.yml
@@ -1,10 +1,5 @@
 # We only want to run full helix matrix on main
-pr:
-  autoCancel: true
-  branches:
-    include:
-    - '*'
-
+pr: none
 trigger: none
 schedules:
 # Cron timezone is UTC.

From b11cbda7c9305778d8a2de1c90dce48bca5e5c50 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sun, 11 Apr 2021 14:19:34 -0700
Subject: [PATCH 20/81] Update helix.proj

---
 eng/helix/helix.proj | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 6550b6b275af..64ce7d9b854a 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -76,6 +76,22 @@
     <HelixProperties Condition="'$(RunQuarantinedTests)' != 'true'" Include="runType" Value="unquarantined" />
   </ItemGroup>
 
+  <Target Name="IncludeAspNetRuntime" BeforeTargets="Gather">
+    <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetArchitecture).$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw" />
+    
+    <ItemGroup>
+      <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.txt" />
+      <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.json" />
+      <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.dll" />
+      <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.xml" />
+    </ItemGroup>
+    
+    <Copy SourceFiles="@(_appRuntimeFiles)" DestinationFiles="$(OutputPath)\AspNetCoreAppRuntimeHelix" />
+    <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
+    
+    <HelixCorrelationPayload Include="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Destination="$(DotNetCliDestination)\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)" />
+  </Target>
+  
   <Target Name="Gather" BeforeTargets="Build">
     <MSBuild Projects="@(ProjectToBuild)"
               Targets="CreateHelixPayload"

From 4d392fa7c26741b17e8e5852aac243c3e05229c5 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sun, 11 Apr 2021 14:20:07 -0700
Subject: [PATCH 21/81] Update TestRunner.cs

---
 eng/helix/content/RunTests/TestRunner.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
index 0f98eeaed719..c84edfb320a7 100644
--- a/eng/helix/content/RunTests/TestRunner.cs
+++ b/eng/helix/content/RunTests/TestRunner.cs
@@ -66,6 +66,7 @@ public bool SetupEnvironment()
 
                 DisplayContents(Path.Combine(Options.DotnetRoot, "host", "fxr"));
                 DisplayContents(Path.Combine(Options.DotnetRoot, "shared", "Microsoft.NETCore.App"));
+                DisplayContents(Path.Combine(Options.DotnetRoot, "shared", "Microsoft.AspNetCore.App"));
                 
                 return true;
             }

From 8f81a0941c5f7f67cf036314f8a796a825ecb3a9 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sun, 11 Apr 2021 14:22:23 -0700
Subject: [PATCH 22/81] Update TestRunner.cs

---
 eng/helix/content/RunTests/TestRunner.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
index c84edfb320a7..8970539da645 100644
--- a/eng/helix/content/RunTests/TestRunner.cs
+++ b/eng/helix/content/RunTests/TestRunner.cs
@@ -123,12 +123,12 @@ public async Task<bool> InstallAspNetAppIfNeededAsync()
             {
                 if (File.Exists(Options.AspNetRuntime))
                 {
-                    var appRuntimePath = $"{Options.HELIX_WORKITEM_ROOT}/shared/Microsoft.AspNetCore.App/{Options.RuntimeVersion}";
+                    var appRuntimePath = $"{Options.DotnetRoot}/shared/Microsoft.AspNetCore.App/{Options.RuntimeVersion}";
                     Console.WriteLine($"Creating directory: {appRuntimePath}");
                     Directory.CreateDirectory(appRuntimePath);
                     Console.WriteLine($"Set ASPNET_RUNTIME_PATH: {appRuntimePath}");
                     EnvironmentVariables.Add("ASPNET_RUNTIME_PATH", appRuntimePath);
-                    Console.WriteLine($"Found AspNetRuntime: {Options.AspNetRuntime}, extracting *.txt,json,dll,xml to {appRuntimePath}");
+/*                    Console.WriteLine($"Found AspNetRuntime: {Options.AspNetRuntime}, extracting *.txt,json,dll,xml to {appRuntimePath}");
                     using (var archive = ZipFile.OpenRead(Options.AspNetRuntime))
                     {
                         foreach (var entry in archive.Entries)
@@ -142,7 +142,7 @@ public async Task<bool> InstallAspNetAppIfNeededAsync()
                                 entry.ExtractToFile(Path.Combine(appRuntimePath, entry.Name), overwrite: true);
                             }
                         }
-                    }
+                    }*/
 
                     DisplayContents(appRuntimePath);
 

From 3aa078fcc5e95110ad733d95f70e3ff0fea0c187 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sun, 11 Apr 2021 15:39:40 -0700
Subject: [PATCH 23/81] Update helix.proj

---
 eng/helix/helix.proj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 64ce7d9b854a..abf2e88a6365 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -33,6 +33,9 @@
     <BaseOutputPath Condition="'$(BaseOutputPath)' == ''">bin\</BaseOutputPath>
     <OutputPath Condition="'$(OutputPath)' == '' and '$(PlatformName)' == 'AnyCPU'">$(BaseOutputPath)$(Configuration)\</OutputPath>
     <OutputPath Condition="'$(OutputPath)' == '' and '$(PlatformName)' != 'AnyCPU'">$(BaseOutputPath)$(PlatformName)\$(Configuration)\</OutputPath>
+    
+    <!-- TODO figure out how to get this -->
+    <SharedFxVersion>6.0.0-ci</SharedFxVersion>
   </PropertyGroup>
 
   <!-- Specify the runtime we need which will be included as a correlation payload -->

From 156150648aecd733fe604dc0d591ebe238bef582 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sun, 11 Apr 2021 15:42:08 -0700
Subject: [PATCH 24/81] Update helix.proj

---
 eng/helix/helix.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index abf2e88a6365..e0d1735d4f9b 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -80,7 +80,7 @@
   </ItemGroup>
 
   <Target Name="IncludeAspNetRuntime" BeforeTargets="Gather">
-    <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetArchitecture).$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw" />
+    <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw" />
     
     <ItemGroup>
       <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.txt" />

From 01c45570e733c3a91d53871da2487c1ea9d44101 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sun, 11 Apr 2021 19:49:25 -0700
Subject: [PATCH 25/81] Update helix.proj

---
 eng/helix/helix.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index e0d1735d4f9b..be0118eea776 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -89,7 +89,7 @@
       <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.xml" />
     </ItemGroup>
     
-    <Copy SourceFiles="@(_appRuntimeFiles)" DestinationFiles="$(OutputPath)\AspNetCoreAppRuntimeHelix" />
+    <Copy SourceFiles="@(_appRuntimeFiles)" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix" />
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <HelixCorrelationPayload Include="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Destination="$(DotNetCliDestination)\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)" />

From f8d7a375a874b193827fc52dbd53f85b09b589f8 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sun, 11 Apr 2021 22:38:50 -0700
Subject: [PATCH 26/81] Update helix.proj

---
 eng/helix/helix.proj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index be0118eea776..35f220049ade 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -92,7 +92,9 @@
     <Copy SourceFiles="@(_appRuntimeFiles)" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix" />
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
-    <HelixCorrelationPayload Include="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Destination="$(DotNetCliDestination)\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)" />
+    <ItemGroup>
+      <HelixCorrelationPayload Include="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Destination="$(DotNetCliDestination)\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)" />
+    </ItemGroup>
   </Target>
   
   <Target Name="Gather" BeforeTargets="Build">

From 0e9c5ced7be798cbebb5d9e7008501ab71bbc344 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:30:45 -0700
Subject: [PATCH 27/81] Change zip structure to match dotnet-cli

---
 eng/helix/helix.proj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 35f220049ade..44af920e021c 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -89,11 +89,11 @@
       <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.xml" />
     </ItemGroup>
     
-    <Copy SourceFiles="@(_appRuntimeFiles)" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix" />
+    <Copy SourceFiles="@(_appRuntimeFiles)" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)" />
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <ItemGroup>
-      <HelixCorrelationPayload Include="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Destination="$(DotNetCliDestination)\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)" />
+      <HelixCorrelationPayload Include="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Destination="$(DotNetCliDestination)" />
     </ItemGroup>
   </Target>
   

From 23ab1a45f370e7d1cdb35f9fa5d7114e97c3a77f Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:32:48 -0700
Subject: [PATCH 28/81] Update TargetingPackTests.cs

---
 src/Framework/test/TargetingPackTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs
index d9cfd947b769..5f34153949c5 100644
--- a/src/Framework/test/TargetingPackTests.cs
+++ b/src/Framework/test/TargetingPackTests.cs
@@ -32,7 +32,7 @@ public TargetingPackTests(ITestOutputHelper output)
             _targetingPackTfm = TestData.GetDefaultNetCoreTargetFramework();
             var root = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix")) ?
                 TestData.GetTestDataValue("TargetingPackLayoutRoot") :
-                Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT");
+                Environment.GetEnvironmentVariable("DOTNET_ROOT");
             _targetingPackRoot = Path.Combine(
                 root,
                 "packs",

From b1eab0c34c8a99018cfb6df18230af3e08dc8518 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:41:11 -0700
Subject: [PATCH 29/81] Install ref pack in correlation as well

---
 eng/helix/helix.proj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 44af920e021c..ee5a364132f0 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -81,15 +81,15 @@
 
   <Target Name="IncludeAspNetRuntime" BeforeTargets="Gather">
     <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw" />
-    
     <ItemGroup>
       <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.txt" />
       <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.json" />
       <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.dll" />
       <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.xml" />
     </ItemGroup>
-    
     <Copy SourceFiles="@(_appRuntimeFiles)" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)" />
+    <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Ref.$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix\packs\Microsoft.AspNetCore.App.Ref\$(SharedFxVersion)" />
+    
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <ItemGroup>

From eeb0faaf4213c9f94a696398f05a9ea3e4d208a9 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:42:16 -0700
Subject: [PATCH 30/81] Update TestRunner.cs

---
 eng/helix/content/RunTests/TestRunner.cs | 33 +-----------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
index 8970539da645..954d9a56322d 100644
--- a/eng/helix/content/RunTests/TestRunner.cs
+++ b/eng/helix/content/RunTests/TestRunner.cs
@@ -67,6 +67,7 @@ public bool SetupEnvironment()
                 DisplayContents(Path.Combine(Options.DotnetRoot, "host", "fxr"));
                 DisplayContents(Path.Combine(Options.DotnetRoot, "shared", "Microsoft.NETCore.App"));
                 DisplayContents(Path.Combine(Options.DotnetRoot, "shared", "Microsoft.AspNetCore.App"));
+                DisplayContents(Path.Combine(Options.DotnetRoot, "packs", "Microsoft.AspNetCore.App.Ref"));
                 
                 return true;
             }
@@ -199,38 +200,6 @@ await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
             }
         }
 
-        public bool InstallAspNetRefIfNeeded()
-        {
-            try
-            {
-                if (File.Exists(Options.AspNetRef))
-                {
-                    var refPath = $"{Options.HELIX_WORKITEM_ROOT}/packs/Microsoft.AspNetCore.App.Ref/{Options.RuntimeVersion}";
-                    if (Directory.Exists(refPath))
-                    {
-                        Console.WriteLine($"AspNetRef install skipped: {refPath} already exists.");
-                    }
-                    else
-                    {
-                        Console.WriteLine($"Found AspNetRef: {Options.AspNetRef}, extracting to {refPath}");
-                        ZipFile.ExtractToDirectory(Options.AspNetRef, refPath);
-                    }
-
-                    DisplayContents(refPath);
-                }
-                else
-                {
-                    Console.WriteLine($"No AspNetRef found: {Options.AspNetRef}, skipping...");
-                }
-                return true;
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine($"Exception in InstallAspNetRefIfNeeded: {e.ToString()}");
-                return false;
-            }
-        }
-
         public async Task<bool> InstallDotnetDump()
         {
             try

From b54fb7765f03cc032cebafc52486c95395681b9d Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:48:57 -0700
Subject: [PATCH 31/81] No longer need to install ref

---
 eng/helix/content/RunTests/Program.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eng/helix/content/RunTests/Program.cs b/eng/helix/content/RunTests/Program.cs
index 62f04432ac4c..bf1269cb56c4 100644
--- a/eng/helix/content/RunTests/Program.cs
+++ b/eng/helix/content/RunTests/Program.cs
@@ -23,10 +23,6 @@ static async Task Main(string[] args)
                 {
                     keepGoing = await runner.InstallAspNetAppIfNeededAsync();
                 }
-                if (keepGoing)
-                {
-                    keepGoing = runner.InstallAspNetRefIfNeeded();
-                }
 #if INSTALLPLAYWRIGHT
                 if (keepGoing)
                 {

From 272dc15d72731088c01cee52ad6460beba9daa42 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 14:29:30 -0700
Subject: [PATCH 32/81] Compute sharedfx version for real

---
 eng/helix/helix.proj | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index ee5a364132f0..cb141b721fc9 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -33,9 +33,6 @@
     <BaseOutputPath Condition="'$(BaseOutputPath)' == ''">bin\</BaseOutputPath>
     <OutputPath Condition="'$(OutputPath)' == '' and '$(PlatformName)' == 'AnyCPU'">$(BaseOutputPath)$(Configuration)\</OutputPath>
     <OutputPath Condition="'$(OutputPath)' == '' and '$(PlatformName)' != 'AnyCPU'">$(BaseOutputPath)$(PlatformName)\$(Configuration)\</OutputPath>
-    
-    <!-- TODO figure out how to get this -->
-    <SharedFxVersion>6.0.0-ci</SharedFxVersion>
   </PropertyGroup>
 
   <!-- Specify the runtime we need which will be included as a correlation payload -->
@@ -80,6 +77,17 @@
   </ItemGroup>
 
   <Target Name="IncludeAspNetRuntime" BeforeTargets="Gather">
+    <MSBuild Projects="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
+        Properties="DisableYarnCheck=true;ExcludeFromBuild=false"
+        Targets="_GetPackageVersionInfo"
+        SkipNonexistentProjects="false">
+      <Output TaskParameter="TargetOutputs" ItemName="_ResolvedProductVersionInfo" />
+    </MSBuild>
+
+    <PropertyGroup>
+      <SharedFxVersion>@(_ResolvedProductVersionInfo->'%(PackageVersion)')</SharedFxVersion>
+    </PropertyGroup>    
+    
     <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw" />
     <ItemGroup>
       <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.txt" />

From 592f78f18a1382bbb00c3099ebabb69a4a994554 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 14:31:02 -0700
Subject: [PATCH 33/81] Cleanup

---
 eng/helix/content/RunTests/TestRunner.cs | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
index 954d9a56322d..f3e1184980fc 100644
--- a/eng/helix/content/RunTests/TestRunner.cs
+++ b/eng/helix/content/RunTests/TestRunner.cs
@@ -125,25 +125,8 @@ public async Task<bool> InstallAspNetAppIfNeededAsync()
                 if (File.Exists(Options.AspNetRuntime))
                 {
                     var appRuntimePath = $"{Options.DotnetRoot}/shared/Microsoft.AspNetCore.App/{Options.RuntimeVersion}";
-                    Console.WriteLine($"Creating directory: {appRuntimePath}");
-                    Directory.CreateDirectory(appRuntimePath);
                     Console.WriteLine($"Set ASPNET_RUNTIME_PATH: {appRuntimePath}");
                     EnvironmentVariables.Add("ASPNET_RUNTIME_PATH", appRuntimePath);
-/*                    Console.WriteLine($"Found AspNetRuntime: {Options.AspNetRuntime}, extracting *.txt,json,dll,xml to {appRuntimePath}");
-                    using (var archive = ZipFile.OpenRead(Options.AspNetRuntime))
-                    {
-                        foreach (var entry in archive.Entries)
-                        {
-                            // These are the only extensions that end up in the shared fx directory
-                            if (entry.Name.EndsWith(".txt", StringComparison.OrdinalIgnoreCase) ||
-                                entry.Name.EndsWith(".json", StringComparison.OrdinalIgnoreCase) ||
-                                entry.Name.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) ||
-                                entry.Name.EndsWith(".xml", StringComparison.OrdinalIgnoreCase))
-                            {
-                                entry.ExtractToFile(Path.Combine(appRuntimePath, entry.Name), overwrite: true);
-                            }
-                        }
-                    }*/
 
                     DisplayContents(appRuntimePath);
 

From 5b90960bc3da072ffbba2095c5524739863aed8c Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 14:36:30 -0700
Subject: [PATCH 34/81] Remove feed cred

---
 eng/helix/content/runtests.ps1 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/helix/content/runtests.ps1 b/eng/helix/content/runtests.ps1
index 5959931a384e..88cea674123f 100644
--- a/eng/helix/content/runtests.ps1
+++ b/eng/helix/content/runtests.ps1
@@ -7,7 +7,6 @@ param(
     [string]$EF,
     [string]$HelixTimeout,
     [string]$InstallPlaywright,
-    [string]$FeedCred
 )
 
 $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1

From c0c6fa2d664166d8216dbe3ad43da0beafe00162 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 14:37:21 -0700
Subject: [PATCH 35/81] Remove feed cred

---
 eng/targets/Helix.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index a11f49c9242f..bb57c21312c0 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -180,8 +180,8 @@
           When the targeting pack builds, it has exactly the same version as the shared framework. Passing
           SharedFxVersion because that's needed even when the targeting pack isn't building.
         -->
-        <Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(TestDependsOnPlaywright) $(DotNetRuntimeSourceFeedKey)</Command>
-        <Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(TestDependsOnPlaywright) $(DotNetRuntimeSourceFeedKey)</Command>
+        <Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(TestDependsOnPlaywright)</Command>
+        <Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(TestDependsOnPlaywright)</Command>
         <Command Condition="$(HelixCommand) != ''">$(HelixCommand)</Command>
         <Timeout>$(HelixTimeout)</Timeout>
       </HelixWorkItem>

From e6f8a27c82e991eaa275baab6d5c95ae03bf72b4 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 14:39:47 -0700
Subject: [PATCH 36/81] Run against full matrix

---
 .azure/pipelines/helix-matrix.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml
index de615d9e345c..97ce99e0a3d0 100644
--- a/.azure/pipelines/helix-matrix.yml
+++ b/.azure/pipelines/helix-matrix.yml
@@ -1,5 +1,9 @@
 # We only want to run full helix matrix on main
-pr: none
+pr:
+  autoCancel: true
+  branches:
+    include:
+    - '*'
 trigger: none
 schedules:
 # Cron timezone is UTC.

From 5a01c6fb9078402dd69c1500f7e1ea7862a20696 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 15:27:16 -0700
Subject: [PATCH 37/81] Bad comma

---
 eng/helix/content/runtests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/content/runtests.ps1 b/eng/helix/content/runtests.ps1
index 88cea674123f..47e74ffb930a 100644
--- a/eng/helix/content/runtests.ps1
+++ b/eng/helix/content/runtests.ps1
@@ -6,7 +6,7 @@ param(
     [string]$Quarantined,
     [string]$EF,
     [string]$HelixTimeout,
-    [string]$InstallPlaywright,
+    [string]$InstallPlaywright
 )
 
 $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1

From 10848af35e41f501658ece7579f28820872e89c4 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 21:55:46 -0700
Subject: [PATCH 38/81] Copy from $(RepoRoot).dotnet

---
 eng/helix/helix.proj | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index cb141b721fc9..536ffbf4492e 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -88,16 +88,12 @@
       <SharedFxVersion>@(_ResolvedProductVersionInfo->'%(PackageVersion)')</SharedFxVersion>
     </PropertyGroup>    
     
-    <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw" />
     <ItemGroup>
-      <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.txt" />
-      <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.json" />
-      <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.dll" />
-      <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.xml" />
+      <_appRuntimeFiles Include="$(RepoRoot).dotnet\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)\**\*.*" />
     </ItemGroup>
-    <Copy SourceFiles="@(_appRuntimeFiles)" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)" />
+    <Copy SourceFiles="@(_appRuntimeFiles)" 
+          DestinationFiles="@(_appRuntimeFiles->'$(OutputPath)\AspNetCoreAppRuntimeHelix\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Ref.$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix\packs\Microsoft.AspNetCore.App.Ref\$(SharedFxVersion)" />
-    
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <ItemGroup>

From eb4999a3885616e2cd0c77fc5edd2477f9e24a2b Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 22:00:12 -0700
Subject: [PATCH 39/81] Cleanup and copy app runtime/ref directly

---
 eng/helix/helix.proj | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 536ffbf4492e..2982959699d6 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -89,11 +89,10 @@
     </PropertyGroup>    
     
     <ItemGroup>
-      <_appRuntimeFiles Include="$(RepoRoot).dotnet\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)\**\*.*" />
+      <_refFiles Include="$(RepoRoot)/.dotnet/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/**/*" />
     </ItemGroup>
-    <Copy SourceFiles="@(_appRuntimeFiles)" 
-          DestinationFiles="@(_appRuntimeFiles->'$(OutputPath)\AspNetCoreAppRuntimeHelix\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)\%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Ref.$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix\packs\Microsoft.AspNetCore.App.Ref\$(SharedFxVersion)" />
+    <Copy SourceFiles="@(_refFiles)" DestinationFiles="@(_refFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)%(RecursiveDir)%(FileName)%(Extension)')" />
+    <Copy SourceFiles="$(RepoRoot)/.dotnet/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/*.*" DestinationFolder="$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/" />
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <ItemGroup>

From 1ecf42e1dabd127d6fb3dce98ef42dcfc6a759e4 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 22:05:47 -0700
Subject: [PATCH 40/81] Always install all tools

---
 eng/helix/content/RunTests/TestRunner.cs | 99 +++++++++---------------
 1 file changed, 36 insertions(+), 63 deletions(-)

diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
index f3e1184980fc..5edb28c998e7 100644
--- a/eng/helix/content/RunTests/TestRunner.cs
+++ b/eng/helix/content/RunTests/TestRunner.cs
@@ -42,6 +42,9 @@ public bool SetupEnvironment()
                 var dotnetEFFullPath = Path.Combine(nugetRestore, helixDir, "dotnet-ef.exe");
                 Console.WriteLine($"Set DotNetEfFullPath: {dotnetEFFullPath}");
                 EnvironmentVariables.Add("DotNetEfFullPath", dotnetEFFullPath);
+                var appRuntimePath = $"{Options.DotnetRoot}/shared/Microsoft.AspNetCore.App/{Options.RuntimeVersion}";
+                Console.WriteLine($"Set ASPNET_RUNTIME_PATH: {appRuntimePath}");
+                EnvironmentVariables.Add("ASPNET_RUNTIME_PATH", appRuntimePath);
 
 #if INSTALLPLAYWRIGHT
                 // Playwright will download and look for browsers to this directory
@@ -118,75 +121,45 @@ public async Task<bool> InstallPlaywrightAsync()
         }
 #endif
 
-        public async Task<bool> InstallAspNetAppIfNeededAsync()
+        public async Task<bool> InstallDotnetToolsAsync()
         {
             try
             {
-                if (File.Exists(Options.AspNetRuntime))
-                {
-                    var appRuntimePath = $"{Options.DotnetRoot}/shared/Microsoft.AspNetCore.App/{Options.RuntimeVersion}";
-                    Console.WriteLine($"Set ASPNET_RUNTIME_PATH: {appRuntimePath}");
-                    EnvironmentVariables.Add("ASPNET_RUNTIME_PATH", appRuntimePath);
-
-                    DisplayContents(appRuntimePath);
-
-                    Console.WriteLine($"Adding current directory to nuget sources: {Options.HELIX_WORKITEM_ROOT}");
-
-                    await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
-                        $"nuget add source {Options.HELIX_WORKITEM_ROOT} --configfile NuGet.config",
-                        environmentVariables: EnvironmentVariables,
-                        outputDataReceived: Console.WriteLine,
-                        errorDataReceived: Console.Error.WriteLine,
-                        throwOnError: false,
-                        cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
-
-                    // Write nuget sources to console, useful for debugging purposes
-                    await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
-                        "nuget list source",
-                        environmentVariables: EnvironmentVariables,
-                        outputDataReceived: Console.WriteLine,
-                        errorDataReceived: Console.Error.WriteLine,
-                        throwOnError: false,
-                        cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
+                Console.WriteLine($"Adding current directory to nuget sources: {Options.HELIX_WORKITEM_ROOT}");
 
-                    await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
-                        $"tool install dotnet-ef --version {Options.EfVersion} --tool-path {Options.HELIX_WORKITEM_ROOT}",
-                        environmentVariables: EnvironmentVariables,
-                        outputDataReceived: Console.WriteLine,
-                        errorDataReceived: Console.Error.WriteLine,
-                        throwOnError: false,
-                        cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
+                await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
+                    $"nuget add source {Options.HELIX_WORKITEM_ROOT} --configfile NuGet.config",
+                    environmentVariables: EnvironmentVariables,
+                    outputDataReceived: Console.WriteLine,
+                    errorDataReceived: Console.Error.WriteLine,
+                    throwOnError: false,
+                    cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
 
-                    await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
-                        $"tool install dotnet-serve --tool-path {Options.HELIX_WORKITEM_ROOT}",
-                        environmentVariables: EnvironmentVariables,
-                        outputDataReceived: Console.WriteLine,
-                        errorDataReceived: Console.Error.WriteLine,
-                        throwOnError: false,
-                        cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
+                // Write nuget sources to console, useful for debugging purposes
+                await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
+                    "nuget list source",
+                    environmentVariables: EnvironmentVariables,
+                    outputDataReceived: Console.WriteLine,
+                    errorDataReceived: Console.Error.WriteLine,
+                    throwOnError: false,
+                    cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
 
-                    // ';' is the path separator on Windows, and ':' on Unix
-                    Options.Path += OperatingSystem.IsWindows() ? ";" : ":";
-                    Options.Path += $"{Environment.GetEnvironmentVariable("DOTNET_CLI_HOME")}/.dotnet/tools";
-                    EnvironmentVariables["PATH"] = Options.Path;
-                }
-                else
-                {
-                    Console.WriteLine($"No AspNetRuntime found: {Options.AspNetRuntime}, skipping...");
-                }
-                return true;
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine($"Exception in InstallAspNetAppIfNeeded: {e.ToString()}");
-                return false;
-            }
-        }
+                await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
+                    $"tool install dotnet-ef --version {Options.EfVersion} --tool-path {Options.HELIX_WORKITEM_ROOT}",
+                    environmentVariables: EnvironmentVariables,
+                    outputDataReceived: Console.WriteLine,
+                    errorDataReceived: Console.Error.WriteLine,
+                    throwOnError: false,
+                    cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
 
-        public async Task<bool> InstallDotnetDump()
-        {
-            try
-            {
+                await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
+                    $"tool install dotnet-serve --tool-path {Options.HELIX_WORKITEM_ROOT}",
+                    environmentVariables: EnvironmentVariables,
+                    outputDataReceived: Console.WriteLine,
+                    errorDataReceived: Console.Error.WriteLine,
+                    throwOnError: false,
+                    cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
+                
                 await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
                             $"tool install dotnet-dump --tool-path {Options.HELIX_WORKITEM_ROOT} --version 5.0.0-*",
                             environmentVariables: EnvironmentVariables,
@@ -198,7 +171,7 @@ await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
             }
             catch (Exception e)
             {
-                Console.WriteLine($"Exception in InstallDotnetDump: {e}");
+                Console.WriteLine($"Exception in InstallDotnetTools: {e}");
                 return false;
             }
         }

From 703c1485b473b88d48cd0683394346c5d0653671 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 22:06:12 -0700
Subject: [PATCH 41/81] Update Program.cs

---
 eng/helix/content/RunTests/Program.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/eng/helix/content/RunTests/Program.cs b/eng/helix/content/RunTests/Program.cs
index bf1269cb56c4..f9ff43ffc7fe 100644
--- a/eng/helix/content/RunTests/Program.cs
+++ b/eng/helix/content/RunTests/Program.cs
@@ -17,11 +17,7 @@ static async Task Main(string[] args)
                 var keepGoing = runner.SetupEnvironment();
                 if (keepGoing)
                 {
-                    keepGoing = await runner.InstallDotnetDump();
-                }
-                if (keepGoing)
-                {
-                    keepGoing = await runner.InstallAspNetAppIfNeededAsync();
+                    keepGoing = await runner.InstallDotnetToolsAsync();
                 }
 #if INSTALLPLAYWRIGHT
                 if (keepGoing)

From 17c8da6c1dfbce88904a4858d43bdba4dd945620 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 22:07:20 -0700
Subject: [PATCH 42/81] Stop including nupkgs

---
 eng/targets/Helix.targets | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index bb57c21312c0..7bcea03ddf79 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -34,11 +34,6 @@
     <HelixPreCommand Include="call RunPowershell.cmd InstallNode.ps1 $(NodeVersion) || exit /b 1" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TestDependsOnAspNetRuntime)' == 'true' ">
-    <!-- Grab all shipping packages. -->
-    <HelixContent Include="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\*$(SharedFxVersion).nupkg" />
-  </ItemGroup>
-
   <ItemGroup>
     <!-- Java test projects do not use xUnit. -->
     <HelixContent Include="$(OutputPath)Microsoft.VisualStudio.TestPlatform.Extension.Xunit.Xml.TestAdapter.dll"

From ae9e5e3e9ee3a99214650f0386c18feca4865fe1 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Mon, 12 Apr 2021 23:33:30 -0700
Subject: [PATCH 43/81] Fix slashes

---
 eng/helix/helix.proj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 2982959699d6..1378fc34d0e6 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -89,10 +89,10 @@
     </PropertyGroup>    
     
     <ItemGroup>
-      <_refFiles Include="$(RepoRoot)/.dotnet/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/**/*" />
+      <_refFiles Include="$(RepoRoot).dotnet/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/**/*" />
     </ItemGroup>
     <Copy SourceFiles="@(_refFiles)" DestinationFiles="@(_refFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)%(RecursiveDir)%(FileName)%(Extension)')" />
-    <Copy SourceFiles="$(RepoRoot)/.dotnet/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/*.*" DestinationFolder="$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/" />
+    <Copy SourceFiles="$(RepoRoot).dotnet/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/*.*" DestinationFolder="$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/" />
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <ItemGroup>

From 825a6501c56895411678740a5ab9e4384e77db2d Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 00:10:57 -0700
Subject: [PATCH 44/81] Update helix.proj

---
 eng/helix/helix.proj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 1378fc34d0e6..120e551da7a9 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -90,9 +90,10 @@
     
     <ItemGroup>
       <_refFiles Include="$(RepoRoot).dotnet/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/**/*" />
+      <_appFiles Include="$(RepoRoot).dotnet/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/*.*" />
     </ItemGroup>
     <Copy SourceFiles="@(_refFiles)" DestinationFiles="@(_refFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)%(RecursiveDir)%(FileName)%(Extension)')" />
-    <Copy SourceFiles="$(RepoRoot).dotnet/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/*.*" DestinationFolder="$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/" />
+    <Copy SourceFiles="@(_appFiles)" DestinationFolder="$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/" />
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <ItemGroup>

From 9de794d7d71858ccc0da621f1dc10dc3d0feb7d4 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:29:16 -0700
Subject: [PATCH 45/81] Fix ref directory names

---
 eng/helix/helix.proj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 120e551da7a9..8258fab85bc7 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -92,8 +92,8 @@
       <_refFiles Include="$(RepoRoot).dotnet/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/**/*" />
       <_appFiles Include="$(RepoRoot).dotnet/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/*.*" />
     </ItemGroup>
-    <Copy SourceFiles="@(_refFiles)" DestinationFiles="@(_refFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)%(RecursiveDir)%(FileName)%(Extension)')" />
-    <Copy SourceFiles="@(_appFiles)" DestinationFolder="$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/" />
+    <Copy SourceFiles="@(_refFiles)" DestinationFiles="@(_refFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)')" />
+    <Copy SourceFiles="@(_appFiles)" DestinationFolder="$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)" />
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <ItemGroup>

From 286dfaa85269ab312d1041f477dae62a2d4f234d Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:37:43 -0700
Subject: [PATCH 46/81] Still need to include template packages

---
 eng/targets/Helix.targets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index 7bcea03ddf79..eeb87feeeac6 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -34,6 +34,11 @@
     <HelixPreCommand Include="call RunPowershell.cmd InstallNode.ps1 $(NodeVersion) || exit /b 1" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TestDependsOnAspNetRuntime)' == 'true' ">
+    <!-- Grab all shipping template packages. -->
+    <HelixContent Include="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\*Templates*$(SharedFxVersion).nupkg" />
+  </ItemGroup>
+  
   <ItemGroup>
     <!-- Java test projects do not use xUnit. -->
     <HelixContent Include="$(OutputPath)Microsoft.VisualStudio.TestPlatform.Extension.Xunit.Xml.TestAdapter.dll"

From 0b1d43dbcc24a2d45e77da64c89bdaf5bfd81d3e Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:40:21 -0700
Subject: [PATCH 47/81] Update InteropTests.csproj

---
 src/Grpc/test/InteropTests/InteropTests.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Grpc/test/InteropTests/InteropTests.csproj b/src/Grpc/test/InteropTests/InteropTests.csproj
index 67861dce4022..bcbd1fc4b6ab 100644
--- a/src/Grpc/test/InteropTests/InteropTests.csproj
+++ b/src/Grpc/test/InteropTests/InteropTests.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <ContainsFunctionalTestAssets>true</ContainsFunctionalTestAssets>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
-    <TestDependsOnAspNetRuntime>true</TestDependsOnAspNetRuntime>
   </PropertyGroup>
 
   <ItemGroup>

From 84e8b22cd0247d0ee8342f991e09369f1bd9bcdf Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:41:21 -0700
Subject: [PATCH 48/81] Update BlazorTemplates.Tests.csproj

---
 .../BlazorTemplates.Tests/BlazorTemplates.Tests.csproj          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
index 187de8341b4e..d92371ca547b 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
@@ -15,7 +15,7 @@
     <!-- TestTemplateCreationFolder is the folder where the templates will be created. Will point out to $(OutputDir)$(TestTemplateCreationFolder) -->
     <TestTemplateCreationFolder>TestTemplates\</TestTemplateCreationFolder>
     <TestPackageRestorePath>$([MSBuild]::EnsureTrailingSlash('$(RepoRoot)'))obj\template-restore\</TestPackageRestorePath>
-    <TestDependsOnAspNetRuntime>true</TestDependsOnAspNetRuntime>
+    <TestDependsOnTemplates>true</TestDependsOnTemplates>
     <TestDependsOnMssql>true</TestDependsOnMssql>
     <TestDependsOnPlaywright>true</TestDependsOnPlaywright>
   </PropertyGroup>

From eafb205cbe4b7ef6579db54aecb2e3e78921522f Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:41:51 -0700
Subject: [PATCH 49/81] Update Helix.props

---
 eng/targets/Helix.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props
index 941b2c0df778..caebed473f5f 100644
--- a/eng/targets/Helix.props
+++ b/eng/targets/Helix.props
@@ -22,7 +22,7 @@
     <HelixUseArchive>false</HelixUseArchive>
     <LoggingTestingDisableFileLogging Condition="'$(IsHelixJob)' == 'true'">false</LoggingTestingDisableFileLogging>
     <NodeVersion>10.15.3</NodeVersion>
-    <TestDependsOnAspNetRuntime>false</TestDependsOnAspNetRuntime>
+    <TestDependsOnTemplates>false</TestDependsOnTemplates>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

From 6e7a7ce17b304f294dbc6f500b8d0fe1feb4c96e Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:42:12 -0700
Subject: [PATCH 50/81] Update Helix.targets

---
 eng/targets/Helix.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index eeb87feeeac6..504aa7d71fba 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -34,7 +34,7 @@
     <HelixPreCommand Include="call RunPowershell.cmd InstallNode.ps1 $(NodeVersion) || exit /b 1" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TestDependsOnAspNetRuntime)' == 'true' ">
+  <ItemGroup Condition=" '$(TestDependsOnTemplates)' == 'true' ">
     <!-- Grab all shipping template packages. -->
     <HelixContent Include="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\*Templates*$(SharedFxVersion).nupkg" />
   </ItemGroup>

From a41d0dc8915f9d2fd6a3d54ab97ff3b6e01a37a2 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:42:42 -0700
Subject: [PATCH 51/81] Update ProjectTemplates.Tests.csproj

---
 src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
index a78821a380b1..f97dd53c8a9b 100644
--- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
+++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
@@ -19,7 +19,7 @@
     <!-- TestTemplateCreationFolder is the folder where the templates will be created. Will point out to $(OutputDir)$(TestTemplateCreationFolder) -->
     <TestTemplateCreationFolder>TestTemplates\</TestTemplateCreationFolder>
     <TestPackageRestorePath>$([MSBuild]::EnsureTrailingSlash('$(RepoRoot)'))obj\template-restore\</TestPackageRestorePath>
-    <TestDependsOnAspNetRuntime>true</TestDependsOnAspNetRuntime>
+    <TestDependsOnTemplates>true</TestDependsOnTemplates>
   </PropertyGroup>
 
   <ItemGroup>

From 76da7a60f1787fe376e4a1b01fcecd21b76c7dfc Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:43:10 -0700
Subject: [PATCH 52/81] Update Microsoft.AspNetCore.App.UnitTests.csproj

---
 src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
index 1279caab5204..cf10fda1b937 100644
--- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
+++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
@@ -4,7 +4,6 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <RootNamespace>Microsoft.AspNetCore</RootNamespace>
     <VerifyAncmBinary Condition="'$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' != 'arm'">true</VerifyAncmBinary>
-    <TestDependsOnAspNetRuntime>true</TestDependsOnAspNetRuntime>
     <SkipHelixArm>true</SkipHelixArm>
   </PropertyGroup>
 

From 760056ec8b1a27a19fe76edb3ae9e4ddc5b6a172 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 09:58:14 -0700
Subject: [PATCH 53/81] Include ref nupkg for App.UnitTests

---
 src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
index cf10fda1b937..12cbdb212ca8 100644
--- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
+++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
@@ -7,6 +7,11 @@
     <SkipHelixArm>true</SkipHelixArm>
   </PropertyGroup>
 
+  <ItemGroup Condition=" '$(IsHelixJob)' == 'true' ">
+    <!-- TargetingPackTests need the full nupkg -->
+    <HelixContent Include="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Ref.*$(SharedFxVersion).nupkg" />
+  </ItemGroup>
+  
   <ItemGroup>
     <!-- Ignore aspnetcorev2_inprocess because tests expect only managed assemblies in this item group. -->
     <_SharedFrameworkBinariesFromRepo Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage)" />

From c66c9c2616309c953f4e505b9cfaf31fdb875080 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 11:57:19 -0700
Subject: [PATCH 54/81] Update Helix.targets

---
 eng/targets/Helix.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index 504aa7d71fba..f2d39c1bd266 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -35,8 +35,8 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TestDependsOnTemplates)' == 'true' ">
-    <!-- Grab all shipping template packages. -->
-    <HelixContent Include="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\*Templates*$(SharedFxVersion).nupkg" />
+    <!-- Grab all shipping packages. -->
+    <HelixContent Include="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\*$(SharedFxVersion).nupkg" />
   </ItemGroup>
   
   <ItemGroup>

From 307542ffb50877e69567cf494eb4b8e1ec5c5e13 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 11:57:50 -0700
Subject: [PATCH 55/81] Update Microsoft.AspNetCore.App.UnitTests.csproj

---
 .../test/Microsoft.AspNetCore.App.UnitTests.csproj          | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
index 12cbdb212ca8..61249eec34a1 100644
--- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
+++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
@@ -4,14 +4,10 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <RootNamespace>Microsoft.AspNetCore</RootNamespace>
     <VerifyAncmBinary Condition="'$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' != 'arm'">true</VerifyAncmBinary>
+    <TestDependsOnTemplates>true</TestDependsOnTemplates>
     <SkipHelixArm>true</SkipHelixArm>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(IsHelixJob)' == 'true' ">
-    <!-- TargetingPackTests need the full nupkg -->
-    <HelixContent Include="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Ref.*$(SharedFxVersion).nupkg" />
-  </ItemGroup>
-  
   <ItemGroup>
     <!-- Ignore aspnetcorev2_inprocess because tests expect only managed assemblies in this item group. -->
     <_SharedFrameworkBinariesFromRepo Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage)" />

From 2a5bf4872d72badf97580ed1b38949065bacdb00 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 12:51:22 -0700
Subject: [PATCH 56/81] Look for runtimelist.xml in the right place

---
 src/Framework/test/SharedFxTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
index 1a205b958fb2..2fba76dc7c0b 100644
--- a/src/Framework/test/SharedFxTests.cs
+++ b/src/Framework/test/SharedFxTests.cs
@@ -245,7 +245,7 @@ public void ItContainsVersionFile()
         [Fact]
         public void RuntimeListListsContainsCorrectEntries()
         {
-            var runtimeListPath = Path.Combine(_sharedFxRoot, "RuntimeList.xml");
+            var runtimeListPath = Path.Combine(_sharedFxRoot, "data", "RuntimeList.xml");
             var expectedAssemblies = TestData.GetSharedFxDependencies()
                 .Split(';', StringSplitOptions.RemoveEmptyEntries)
                 .ToHashSet();
@@ -308,7 +308,7 @@ public void RuntimeListListsContainsCorrectPaths()
                 return;
             }
 
-            var runtimeListPath = Path.Combine(_sharedFxRoot, "RuntimeList.xml");
+            var runtimeListPath = Path.Combine(_sharedFxRoot, "data", "RuntimeList.xml");
 
             AssertEx.FileExists(runtimeListPath);
 

From 19d61907849e965ade614d9765861d6b29f8c91e Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 12:52:31 -0700
Subject: [PATCH 57/81] Update SharedFxTests.cs

---
 src/Framework/test/SharedFxTests.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
index 2fba76dc7c0b..6ae060ac822e 100644
--- a/src/Framework/test/SharedFxTests.cs
+++ b/src/Framework/test/SharedFxTests.cs
@@ -32,9 +32,7 @@ public SharedFxTests(ITestOutputHelper output)
             _sharedFxRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH"))
                 ? Path.Combine(TestData.GetTestDataValue("SharedFrameworkLayoutRoot"), "shared", "Microsoft.AspNetCore.App", TestData.GetTestDataValue("RuntimePackageVersion"))
                 : Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH");
-            _expectedVersionFileName = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH"))
-                ? ".version"
-                : "Microsoft.AspNetCore.App.versions.txt";
+            _expectedVersionFileName = ".version";
         }
 
         [Fact]

From 4a3c1618deff38f1a2ff292d49c96a980e0ac0cb Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 13:55:57 -0700
Subject: [PATCH 58/81] Fix framework list lookup

---
 src/Framework/test/SharedFxTests.cs | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
index 6ae060ac822e..126934f43910 100644
--- a/src/Framework/test/SharedFxTests.cs
+++ b/src/Framework/test/SharedFxTests.cs
@@ -22,6 +22,7 @@ public class SharedFxTests
         private readonly string _expectedRid;
         private readonly string _expectedVersionFileName;
         private readonly string _sharedFxRoot;
+        private readonly string _frameworkListPath;
         private readonly ITestOutputHelper _output;
 
         public SharedFxTests(ITestOutputHelper output)
@@ -32,6 +33,9 @@ public SharedFxTests(ITestOutputHelper output)
             _sharedFxRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH"))
                 ? Path.Combine(TestData.GetTestDataValue("SharedFrameworkLayoutRoot"), "shared", "Microsoft.AspNetCore.App", TestData.GetTestDataValue("RuntimePackageVersion"))
                 : Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH");
+            _frameworkListPath = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_REF_PATH"))
+                ? null;
+                : Path.Combine(Environment.GetEnvironmentVariable("ASPNET_REF_PATH"), "data", "FrameworkList.xml");
             _expectedVersionFileName = ".version";
         }
 
@@ -243,14 +247,18 @@ public void ItContainsVersionFile()
         [Fact]
         public void RuntimeListListsContainsCorrectEntries()
         {
-            var runtimeListPath = Path.Combine(_sharedFxRoot, "data", "RuntimeList.xml");
+            if (string.IsNullOrEmpty(_frameworkListPath))
+            {
+                return;
+            }
+
             var expectedAssemblies = TestData.GetSharedFxDependencies()
                 .Split(';', StringSplitOptions.RemoveEmptyEntries)
                 .ToHashSet();
 
-            AssertEx.FileExists(runtimeListPath);
+            AssertEx.FileExists(_frameworkListPath);
 
-            var runtimeListDoc = XDocument.Load(runtimeListPath);
+            var runtimeListDoc = XDocument.Load(_frameworkListPath);
             var runtimeListEntries = runtimeListDoc.Root.Descendants();
 
             _output.WriteLine("==== file contents ====");
@@ -300,17 +308,14 @@ public void RuntimeListListsContainsCorrectEntries()
         [Fact]
         public void RuntimeListListsContainsCorrectPaths()
         {
-            var runtimePath = Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH");
-            if (string.IsNullOrEmpty(runtimePath))
+            if (string.IsNullOrEmpty(_frameworkListPath))
             {
                 return;
             }
 
-            var runtimeListPath = Path.Combine(_sharedFxRoot, "data", "RuntimeList.xml");
-
-            AssertEx.FileExists(runtimeListPath);
+            AssertEx.FileExists(_frameworkListPath);
 
-            var runtimeListDoc = XDocument.Load(runtimeListPath);
+            var runtimeListDoc = XDocument.Load(_frameworkListPath);
             var runtimeListEntries = runtimeListDoc.Root.Descendants();
 
             var sharedFxPath = Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"), ("Microsoft.AspNetCore.App.Runtime.win-x64." + TestData.GetSharedFxVersion() + ".nupkg"));

From 12f6209f233804bc07a45c740275051372aa60c1 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 13:58:32 -0700
Subject: [PATCH 59/81] Set appRefPath

---
 eng/helix/content/RunTests/TestRunner.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
index 5edb28c998e7..46e994792a1e 100644
--- a/eng/helix/content/RunTests/TestRunner.cs
+++ b/eng/helix/content/RunTests/TestRunner.cs
@@ -45,6 +45,10 @@ public bool SetupEnvironment()
                 var appRuntimePath = $"{Options.DotnetRoot}/shared/Microsoft.AspNetCore.App/{Options.RuntimeVersion}";
                 Console.WriteLine($"Set ASPNET_RUNTIME_PATH: {appRuntimePath}");
                 EnvironmentVariables.Add("ASPNET_RUNTIME_PATH", appRuntimePath);
+                
+                var appRefPath = $"{Options.DotnetRoot}/packs/Microsoft.AspNetCore.App.Ref/{Options.RuntimeVersion}";
+                Console.WriteLine($"Set ASPNET_REF_PATH: {appRefPath}");
+                EnvironmentVariables.Add("ASPNET_REF_PATH", appRefPath);
 
 #if INSTALLPLAYWRIGHT
                 // Playwright will download and look for browsers to this directory
@@ -161,11 +165,11 @@ await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
                     cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
                 
                 await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
-                            $"tool install dotnet-dump --tool-path {Options.HELIX_WORKITEM_ROOT} --version 5.0.0-*",
-                            environmentVariables: EnvironmentVariables,
-                            outputDataReceived: Console.WriteLine,
-                            errorDataReceived: Console.Error.WriteLine,
-                            throwOnError: false);
+                    $"tool install dotnet-dump --tool-path {Options.HELIX_WORKITEM_ROOT} --version 5.0.0-*",
+                    environmentVariables: EnvironmentVariables,
+                    outputDataReceived: Console.WriteLine,
+                    errorDataReceived: Console.Error.WriteLine,
+                    throwOnError: false);
 
                 return true;
             }

From 76771fc7cd039aaaf99508e4f3aa1eed25e49afc Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 13 Apr 2021 14:22:05 -0700
Subject: [PATCH 60/81] Update SharedFxTests.cs

---
 src/Framework/test/SharedFxTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
index 126934f43910..120f3d739dc8 100644
--- a/src/Framework/test/SharedFxTests.cs
+++ b/src/Framework/test/SharedFxTests.cs
@@ -34,7 +34,7 @@ public SharedFxTests(ITestOutputHelper output)
                 ? Path.Combine(TestData.GetTestDataValue("SharedFrameworkLayoutRoot"), "shared", "Microsoft.AspNetCore.App", TestData.GetTestDataValue("RuntimePackageVersion"))
                 : Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH");
             _frameworkListPath = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_REF_PATH"))
-                ? null;
+                ? null
                 : Path.Combine(Environment.GetEnvironmentVariable("ASPNET_REF_PATH"), "data", "FrameworkList.xml");
             _expectedVersionFileName = ".version";
         }

From d6b58686751d45bd6f559c0951570b4e00b06d4b Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:10:23 -0700
Subject: [PATCH 61/81] Fix file lookup

---
 src/Framework/test/SharedFxTests.cs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
index 120f3d739dc8..72ce379ef47d 100644
--- a/src/Framework/test/SharedFxTests.cs
+++ b/src/Framework/test/SharedFxTests.cs
@@ -22,7 +22,6 @@ public class SharedFxTests
         private readonly string _expectedRid;
         private readonly string _expectedVersionFileName;
         private readonly string _sharedFxRoot;
-        private readonly string _frameworkListPath;
         private readonly ITestOutputHelper _output;
 
         public SharedFxTests(ITestOutputHelper output)
@@ -33,9 +32,6 @@ public SharedFxTests(ITestOutputHelper output)
             _sharedFxRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH"))
                 ? Path.Combine(TestData.GetTestDataValue("SharedFrameworkLayoutRoot"), "shared", "Microsoft.AspNetCore.App", TestData.GetTestDataValue("RuntimePackageVersion"))
                 : Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH");
-            _frameworkListPath = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_REF_PATH"))
-                ? null
-                : Path.Combine(Environment.GetEnvironmentVariable("ASPNET_REF_PATH"), "data", "FrameworkList.xml");
             _expectedVersionFileName = ".version";
         }
 
@@ -247,18 +243,20 @@ public void ItContainsVersionFile()
         [Fact]
         public void RuntimeListListsContainsCorrectEntries()
         {
-            if (string.IsNullOrEmpty(_frameworkListPath))
+            var runtimePath = Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH");
+            if (string.IsNullOrEmpty(runtimePath))
             {
                 return;
             }
-
+            
             var expectedAssemblies = TestData.GetSharedFxDependencies()
                 .Split(';', StringSplitOptions.RemoveEmptyEntries)
                 .ToHashSet();
 
-            AssertEx.FileExists(_frameworkListPath);
+            var runtimeListPath = Path.Combine(_sharedFxRoot, "data", "RuntimeList.xml");
+            AssertEx.FileExists(runtimeListPath);
 
-            var runtimeListDoc = XDocument.Load(_frameworkListPath);
+            var runtimeListDoc = XDocument.Load(runtimeListPath);
             var runtimeListEntries = runtimeListDoc.Root.Descendants();
 
             _output.WriteLine("==== file contents ====");
@@ -313,9 +311,10 @@ public void RuntimeListListsContainsCorrectPaths()
                 return;
             }
 
-            AssertEx.FileExists(_frameworkListPath);
+            var runtimeListPath = Path.Combine(_sharedFxRoot, "data", "RuntimeList.xml");
+            AssertEx.FileExists(runtimeListPath);
 
-            var runtimeListDoc = XDocument.Load(_frameworkListPath);
+            var runtimeListDoc = XDocument.Load(runtimeListPath);
             var runtimeListEntries = runtimeListDoc.Root.Descendants();
 
             var sharedFxPath = Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"), ("Microsoft.AspNetCore.App.Runtime.win-x64." + TestData.GetSharedFxVersion() + ".nupkg"));

From 06402ae2256fa26d4e6d9c3c6644a472c4cf17fa Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:11:54 -0700
Subject: [PATCH 62/81] Copy missing runtimelist.xml

---
 eng/helix/helix.proj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 8258fab85bc7..8e479788d06c 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -90,10 +90,10 @@
     
     <ItemGroup>
       <_refFiles Include="$(RepoRoot).dotnet/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/**/*" />
-      <_appFiles Include="$(RepoRoot).dotnet/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/*.*" />
+      <_appFiles Include="$(RepoRoot).dotnet/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/**/*" />
     </ItemGroup>
     <Copy SourceFiles="@(_refFiles)" DestinationFiles="@(_refFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)')" />
-    <Copy SourceFiles="@(_appFiles)" DestinationFolder="$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)" />
+    <Copy SourceFiles="@(_appFiles)" DestinationFiles="@(_appFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)'" />
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <ItemGroup>

From 2b1b01e7cbaceb848dadc9cec29a0baf213a1ba0 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:12:43 -0700
Subject: [PATCH 63/81] Update SharedFxTests.cs

---
 src/Framework/test/SharedFxTests.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
index 72ce379ef47d..a9a4e4a5b105 100644
--- a/src/Framework/test/SharedFxTests.cs
+++ b/src/Framework/test/SharedFxTests.cs
@@ -243,8 +243,7 @@ public void ItContainsVersionFile()
         [Fact]
         public void RuntimeListListsContainsCorrectEntries()
         {
-            var runtimePath = Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH");
-            if (string.IsNullOrEmpty(runtimePath))
+            if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH")))
             {
                 return;
             }
@@ -306,7 +305,7 @@ public void RuntimeListListsContainsCorrectEntries()
         [Fact]
         public void RuntimeListListsContainsCorrectPaths()
         {
-            if (string.IsNullOrEmpty(_frameworkListPath))
+            if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH")))
             {
                 return;
             }

From 6ba3c91b14f130776c04f4639687d29582d45184 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:13:47 -0700
Subject: [PATCH 64/81] Update TestRunner.cs

---
 eng/helix/content/RunTests/TestRunner.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
index 46e994792a1e..94c1b9280212 100644
--- a/eng/helix/content/RunTests/TestRunner.cs
+++ b/eng/helix/content/RunTests/TestRunner.cs
@@ -45,10 +45,6 @@ public bool SetupEnvironment()
                 var appRuntimePath = $"{Options.DotnetRoot}/shared/Microsoft.AspNetCore.App/{Options.RuntimeVersion}";
                 Console.WriteLine($"Set ASPNET_RUNTIME_PATH: {appRuntimePath}");
                 EnvironmentVariables.Add("ASPNET_RUNTIME_PATH", appRuntimePath);
-                
-                var appRefPath = $"{Options.DotnetRoot}/packs/Microsoft.AspNetCore.App.Ref/{Options.RuntimeVersion}";
-                Console.WriteLine($"Set ASPNET_REF_PATH: {appRefPath}");
-                EnvironmentVariables.Add("ASPNET_REF_PATH", appRefPath);
 
 #if INSTALLPLAYWRIGHT
                 // Playwright will download and look for browsers to this directory

From 1635a022360506440a4d42f0fa5545302bce2d20 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:16:36 -0700
Subject: [PATCH 65/81] Only try to copy ref files if targeting pack building

---
 eng/helix/helix.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 8e479788d06c..ac5896e07b0e 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -92,7 +92,7 @@
       <_refFiles Include="$(RepoRoot).dotnet/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/**/*" />
       <_appFiles Include="$(RepoRoot).dotnet/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/**/*" />
     </ItemGroup>
-    <Copy SourceFiles="@(_refFiles)" DestinationFiles="@(_refFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)')" />
+    <Copy Condition=" $(IsTargetingPackBuilding) " SourceFiles="@(_refFiles)" DestinationFiles="@(_refFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)')" />
     <Copy SourceFiles="@(_appFiles)" DestinationFiles="@(_appFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)'" />
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     

From f6fe2a179ff6254edc449f4ccdf39d48ece78a73 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:17:27 -0700
Subject: [PATCH 66/81] Update ProjectTemplates.Tests.csproj

---
 src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
index f97dd53c8a9b..de663bf46e44 100644
--- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
+++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
@@ -19,7 +19,7 @@
     <!-- TestTemplateCreationFolder is the folder where the templates will be created. Will point out to $(OutputDir)$(TestTemplateCreationFolder) -->
     <TestTemplateCreationFolder>TestTemplates\</TestTemplateCreationFolder>
     <TestPackageRestorePath>$([MSBuild]::EnsureTrailingSlash('$(RepoRoot)'))obj\template-restore\</TestPackageRestorePath>
-    <TestDependsOnTemplates>true</TestDependsOnTemplates>
+    <TestDependsOnAspNetPackages>true</TestDependsOnAspNetPackages>
   </PropertyGroup>
 
   <ItemGroup>

From b7585a70588d91e582b69de3d69237cc9c13359a Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:17:47 -0700
Subject: [PATCH 67/81] Update BlazorTemplates.Tests.csproj

---
 .../BlazorTemplates.Tests/BlazorTemplates.Tests.csproj          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
index d92371ca547b..88018c32be2e 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
@@ -15,7 +15,7 @@
     <!-- TestTemplateCreationFolder is the folder where the templates will be created. Will point out to $(OutputDir)$(TestTemplateCreationFolder) -->
     <TestTemplateCreationFolder>TestTemplates\</TestTemplateCreationFolder>
     <TestPackageRestorePath>$([MSBuild]::EnsureTrailingSlash('$(RepoRoot)'))obj\template-restore\</TestPackageRestorePath>
-    <TestDependsOnTemplates>true</TestDependsOnTemplates>
+    <TestDependsOnAspNetPackages>true</TestDependsOnAspNetPackages>
     <TestDependsOnMssql>true</TestDependsOnMssql>
     <TestDependsOnPlaywright>true</TestDependsOnPlaywright>
   </PropertyGroup>

From f1f9f29d037f16a7611e4918e8908d79f550db86 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:18:24 -0700
Subject: [PATCH 68/81] Update InteropTests.csproj

---
 src/Grpc/test/InteropTests/InteropTests.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Grpc/test/InteropTests/InteropTests.csproj b/src/Grpc/test/InteropTests/InteropTests.csproj
index bcbd1fc4b6ab..d28b263c38a2 100644
--- a/src/Grpc/test/InteropTests/InteropTests.csproj
+++ b/src/Grpc/test/InteropTests/InteropTests.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <ContainsFunctionalTestAssets>true</ContainsFunctionalTestAssets>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <TestDependsOnAspNetPackages>true</TestDependsOnAspNetPackages>
   </PropertyGroup>
 
   <ItemGroup>

From 877d98079aa15651f0a53c7f8fdf9afd5ce4274d Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:18:44 -0700
Subject: [PATCH 69/81] Update Microsoft.AspNetCore.App.UnitTests.csproj

---
 src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
index 61249eec34a1..08d31fb48197 100644
--- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
+++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <RootNamespace>Microsoft.AspNetCore</RootNamespace>
     <VerifyAncmBinary Condition="'$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' != 'arm'">true</VerifyAncmBinary>
-    <TestDependsOnTemplates>true</TestDependsOnTemplates>
+    <TestDependsOnAspNetPackages>true</TestDependsOnAspNetPackages>
     <SkipHelixArm>true</SkipHelixArm>
   </PropertyGroup>
 

From 274bc2103273625b65f98d3b361c097fa623cb06 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:19:11 -0700
Subject: [PATCH 70/81] Update Helix.targets

---
 eng/targets/Helix.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index f2d39c1bd266..71ad2003c4ce 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -34,7 +34,7 @@
     <HelixPreCommand Include="call RunPowershell.cmd InstallNode.ps1 $(NodeVersion) || exit /b 1" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TestDependsOnTemplates)' == 'true' ">
+  <ItemGroup Condition=" '$(TestDependsOnAspNetPackages)' == 'true' ">
     <!-- Grab all shipping packages. -->
     <HelixContent Include="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\*$(SharedFxVersion).nupkg" />
   </ItemGroup>

From 748c8537f0879b059ca54f85ce49fce50ad9c6e5 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:19:27 -0700
Subject: [PATCH 71/81] Update Helix.props

---
 eng/targets/Helix.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props
index caebed473f5f..cd7ef22251f4 100644
--- a/eng/targets/Helix.props
+++ b/eng/targets/Helix.props
@@ -22,7 +22,7 @@
     <HelixUseArchive>false</HelixUseArchive>
     <LoggingTestingDisableFileLogging Condition="'$(IsHelixJob)' == 'true'">false</LoggingTestingDisableFileLogging>
     <NodeVersion>10.15.3</NodeVersion>
-    <TestDependsOnTemplates>false</TestDependsOnTemplates>
+    <TestDependsOnAspNetPackages>false</TestDependsOnAspNetPackages>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

From 224726d26cb7acd029f5fff866a5f79b4102ebde Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:51:24 -0700
Subject: [PATCH 72/81] Update helix.proj

---
 eng/helix/helix.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index ac5896e07b0e..8e479788d06c 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -92,7 +92,7 @@
       <_refFiles Include="$(RepoRoot).dotnet/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/**/*" />
       <_appFiles Include="$(RepoRoot).dotnet/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/**/*" />
     </ItemGroup>
-    <Copy Condition=" $(IsTargetingPackBuilding) " SourceFiles="@(_refFiles)" DestinationFiles="@(_refFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)')" />
+    <Copy SourceFiles="@(_refFiles)" DestinationFiles="@(_refFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)')" />
     <Copy SourceFiles="@(_appFiles)" DestinationFiles="@(_appFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)'" />
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     

From 5af550433795a9286ef2e9c6700cfa0b4e3a5c31 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 01:48:27 -0700
Subject: [PATCH 73/81] Update helix.proj

---
 eng/helix/helix.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 8e479788d06c..e32673a63d11 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -93,7 +93,7 @@
       <_appFiles Include="$(RepoRoot).dotnet/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/**/*" />
     </ItemGroup>
     <Copy SourceFiles="@(_refFiles)" DestinationFiles="@(_refFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)')" />
-    <Copy SourceFiles="@(_appFiles)" DestinationFiles="@(_appFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)'" />
+    <Copy SourceFiles="@(_appFiles)" DestinationFiles="@(_appFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)')" />
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <ItemGroup>

From 49dd8929901c2f6a43f6f944985de7f1e1152009 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 10:01:35 -0700
Subject: [PATCH 74/81] Unzip the packages directly into the payload

---
 eng/helix/helix.proj | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index e32673a63d11..8fc3e8c4875e 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -88,12 +88,8 @@
       <SharedFxVersion>@(_ResolvedProductVersionInfo->'%(PackageVersion)')</SharedFxVersion>
     </PropertyGroup>    
     
-    <ItemGroup>
-      <_refFiles Include="$(RepoRoot).dotnet/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/**/*" />
-      <_appFiles Include="$(RepoRoot).dotnet/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/**/*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(_refFiles)" DestinationFiles="@(_refFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)')" />
-    <Copy SourceFiles="@(_appFiles)" DestinationFiles="@(_appFiles->'$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)/%(RecursiveDir)%(FileName)%(Extension)')" />
+    <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)" />
+    <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.Ref.$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)" />
     <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <ItemGroup>

From 9937d1d4fde358fed36ebad6d3f5ceb785eb954b Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 12:22:44 -0700
Subject: [PATCH 75/81] Add conditions exists checks for runtime/ref

---
 eng/helix/helix.proj | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 8fc3e8c4875e..62b7588663f3 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -88,9 +88,21 @@
       <SharedFxVersion>@(_ResolvedProductVersionInfo->'%(PackageVersion)')</SharedFxVersion>
     </PropertyGroup>    
     
-    <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)/AspNetCoreAppRuntimeHelix/shared/Microsoft.AspNetCore.App/$(SharedFxVersion)" />
-    <Unzip SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.Ref.$(SharedFxVersion).nupkg" DestinationFolder="$(OutputPath)/AspNetCoreAppRuntimeHelix/packs/Microsoft.AspNetCore.App.Ref/$(SharedFxVersion)" />
-    <ZipDirectory SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
+    <Unzip Condition="Exists('$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg')
+           SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg" 
+           DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw" />
+    <ItemGroup>
+      <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.txt" />
+      <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.json" />
+      <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.dll" />
+      <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.xml" />
+    </ItemGroup>
+    <Copy SourceFiles="@(_appRuntimeFiles)" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)" />
+    <Unzip Condition="Exists('$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Ref.$(SharedFxVersion).nupkg')" 
+           SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Ref.$(SharedFxVersion).nupkg" 
+           DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix\packs\Microsoft.AspNetCore.App.Ref\$(SharedFxVersion)" />
+    <ZipDirectory Condition="Exists('$(OutputPath)\AspNetCoreAppRuntimeHelix')"
+           SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <ItemGroup>
       <HelixCorrelationPayload Include="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Destination="$(DotNetCliDestination)" />

From fa05aa58dc80b685ff301745a9f193ffcc704980 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 21:56:43 -0700
Subject: [PATCH 76/81] Update helix.proj

---
 eng/helix/helix.proj | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 62b7588663f3..db00d32b8069 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -88,9 +88,9 @@
       <SharedFxVersion>@(_ResolvedProductVersionInfo->'%(PackageVersion)')</SharedFxVersion>
     </PropertyGroup>    
     
-    <Unzip Condition="Exists('$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg')
-           SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg" 
-           DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw" />
+    <Unzip Condition="Exists('$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg')"
+       SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg" 
+       DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw" />
     <ItemGroup>
       <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.txt" />
       <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.json" />
@@ -99,10 +99,11 @@
     </ItemGroup>
     <Copy SourceFiles="@(_appRuntimeFiles)" DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix\shared\Microsoft.AspNetCore.App\$(SharedFxVersion)" />
     <Unzip Condition="Exists('$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Ref.$(SharedFxVersion).nupkg')" 
-           SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Ref.$(SharedFxVersion).nupkg" 
-           DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix\packs\Microsoft.AspNetCore.App.Ref\$(SharedFxVersion)" />
+      SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Ref.$(SharedFxVersion).nupkg" 
+      DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelix\packs\Microsoft.AspNetCore.App.Ref\$(SharedFxVersion)" />
     <ZipDirectory Condition="Exists('$(OutputPath)\AspNetCoreAppRuntimeHelix')"
-           SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
+      SourceDirectory="$(OutputPath)\AspNetCoreAppRuntimeHelix" 
+      DestinationFile="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Overwrite="true" />
     
     <ItemGroup>
       <HelixCorrelationPayload Include="$(OutputPath)\AspNetCoreAppRuntimeHelix.zip" Destination="$(DotNetCliDestination)" />

From 0e9e15eddb97698e2a6f65c01faa7434583521a0 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 23:33:45 -0700
Subject: [PATCH 77/81] Revert changes to runtimeListPath

---
 src/Framework/test/SharedFxTests.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
index a9a4e4a5b105..0b13f4f56933 100644
--- a/src/Framework/test/SharedFxTests.cs
+++ b/src/Framework/test/SharedFxTests.cs
@@ -32,8 +32,9 @@ public SharedFxTests(ITestOutputHelper output)
             _sharedFxRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH"))
                 ? Path.Combine(TestData.GetTestDataValue("SharedFrameworkLayoutRoot"), "shared", "Microsoft.AspNetCore.App", TestData.GetTestDataValue("RuntimePackageVersion"))
                 : Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH");
-            _expectedVersionFileName = ".version";
-        }
+            _expectedVersionFileName = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH"))
+                ? ".version"
+                : "Microsoft.AspNetCore.App.versions.txt";        }
 
         [Fact]
         public void SharedFrameworkContainsListedAssemblies()
@@ -243,16 +244,11 @@ public void ItContainsVersionFile()
         [Fact]
         public void RuntimeListListsContainsCorrectEntries()
         {
-            if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH")))
-            {
-                return;
-            }
-            
             var expectedAssemblies = TestData.GetSharedFxDependencies()
                 .Split(';', StringSplitOptions.RemoveEmptyEntries)
                 .ToHashSet();
 
-            var runtimeListPath = Path.Combine(_sharedFxRoot, "data", "RuntimeList.xml");
+            var runtimeListPath = Path.Combine(_sharedFxRoot, "RuntimeList.xml");
             AssertEx.FileExists(runtimeListPath);
 
             var runtimeListDoc = XDocument.Load(runtimeListPath);
@@ -310,7 +306,7 @@ public void RuntimeListListsContainsCorrectPaths()
                 return;
             }
 
-            var runtimeListPath = Path.Combine(_sharedFxRoot, "data", "RuntimeList.xml");
+            var runtimeListPath = Path.Combine(_sharedFxRoot, RuntimeList.xml");
             AssertEx.FileExists(runtimeListPath);
 
             var runtimeListDoc = XDocument.Load(runtimeListPath);

From 0fc663f5ed4533f51bf2b7fb57f921f7a98c092e Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 23:34:47 -0700
Subject: [PATCH 78/81] Fix typo

---
 src/Framework/test/SharedFxTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
index 0b13f4f56933..c86023e23dce 100644
--- a/src/Framework/test/SharedFxTests.cs
+++ b/src/Framework/test/SharedFxTests.cs
@@ -306,7 +306,7 @@ public void RuntimeListListsContainsCorrectPaths()
                 return;
             }
 
-            var runtimeListPath = Path.Combine(_sharedFxRoot, RuntimeList.xml");
+            var runtimeListPath = Path.Combine(_sharedFxRoot, "RuntimeList.xml");
             AssertEx.FileExists(runtimeListPath);
 
             var runtimeListDoc = XDocument.Load(runtimeListPath);

From 6f578cf5dcdd053b6c3ac078bb0c3bc404dd54ff Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 14 Apr 2021 23:36:05 -0700
Subject: [PATCH 79/81] Fix formatting

---
 src/Framework/test/SharedFxTests.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
index c86023e23dce..77f2759656b6 100644
--- a/src/Framework/test/SharedFxTests.cs
+++ b/src/Framework/test/SharedFxTests.cs
@@ -34,7 +34,8 @@ public SharedFxTests(ITestOutputHelper output)
                 : Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH");
             _expectedVersionFileName = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH"))
                 ? ".version"
-                : "Microsoft.AspNetCore.App.versions.txt";        }
+                : "Microsoft.AspNetCore.App.versions.txt";
+        }
 
         [Fact]
         public void SharedFrameworkContainsListedAssemblies()

From 11eceabe2513eaa2348784d536c01b708f2ad05a Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 15 Apr 2021 09:23:25 -0700
Subject: [PATCH 80/81] Update helix-matrix.yml

---
 .azure/pipelines/helix-matrix.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml
index 97ce99e0a3d0..de615d9e345c 100644
--- a/.azure/pipelines/helix-matrix.yml
+++ b/.azure/pipelines/helix-matrix.yml
@@ -1,9 +1,5 @@
 # We only want to run full helix matrix on main
-pr:
-  autoCancel: true
-  branches:
-    include:
-    - '*'
+pr: none
 trigger: none
 schedules:
 # Cron timezone is UTC.

From 7c8fc8da48e527f90078a7ab7d85a0f05ebfd1e8 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 15 Apr 2021 21:29:39 -0700
Subject: [PATCH 81/81] Apply suggestions from code review

Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
---
 eng/helix/helix.proj                | 4 ++--
 eng/targets/Helix.targets           | 1 -
 src/Framework/test/SharedFxTests.cs | 5 -----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index db00d32b8069..74a0dace16e2 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -88,8 +88,8 @@
       <SharedFxVersion>@(_ResolvedProductVersionInfo->'%(PackageVersion)')</SharedFxVersion>
     </PropertyGroup>    
     
-    <Unzip Condition="Exists('$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg')"
-       SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetOsName)-$(TargetArchitecture).$(SharedFxVersion).nupkg" 
+    <Unzip Condition="Exists('$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetRuntimeIdentifier).$(SharedFxVersion).nupkg')"
+       SourceFiles="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetRuntimeIdentifier).$(SharedFxVersion).nupkg" 
        DestinationFolder="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw" />
     <ItemGroup>
       <_appRuntimeFiles Include="$(OutputPath)\AspNetCoreAppRuntimeHelixRaw\**\*.txt" />
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index 71ad2003c4ce..502f334ff7a1 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -38,7 +38,6 @@
     <!-- Grab all shipping packages. -->
     <HelixContent Include="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\*$(SharedFxVersion).nupkg" />
   </ItemGroup>
-  
   <ItemGroup>
     <!-- Java test projects do not use xUnit. -->
     <HelixContent Include="$(OutputPath)Microsoft.VisualStudio.TestPlatform.Extension.Xunit.Xml.TestAdapter.dll"
diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
index 77f2759656b6..af296b5a08a6 100644
--- a/src/Framework/test/SharedFxTests.cs
+++ b/src/Framework/test/SharedFxTests.cs
@@ -302,11 +302,6 @@ public void RuntimeListListsContainsCorrectEntries()
         [Fact]
         public void RuntimeListListsContainsCorrectPaths()
         {
-            if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH")))
-            {
-                return;
-            }
-
             var runtimeListPath = Path.Combine(_sharedFxRoot, "RuntimeList.xml");
             AssertEx.FileExists(runtimeListPath);