From 0e217044dedbc3b2e2ccd9619b8cbb0deef76c95 Mon Sep 17 00:00:00 2001
From: Premek Vysoky <premek.vysoky@microsoft.com>
Date: Wed, 25 Aug 2021 15:40:35 +0200
Subject: [PATCH 1/2] Use full .NET SDK to run XHarness (temporarily)

https://github.com/dotnet/arcade/issues/7787
---
 .../Sdk/tools/xharness-runner/XHarnessRunner.targets     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
index 113944554d5..e8469cec6dc 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
@@ -3,8 +3,13 @@
     <!-- We then invoke the CLI DLL directly using .NET runtime without the need for .NET SDK -->
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <IncludeXHarnessCli>true</IncludeXHarnessCli>
-    <DotNetCliPackageType Condition="'$(DotNetCliPackageType)' != 'sdk'">aspnetcore-runtime</DotNetCliPackageType>
-    <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' ">6.0.100-preview.2.21155.3</DotNetCliVersion>
+
+    <!--
+      TODO (https://github.com/dotnet/arcade/issues/7787): Use ASP.NET Core only once we are past RC1
+      <DotNetCliPackageType Condition="'$(DotNetCliPackageType)' != 'sdk'">aspnetcore-runtime</DotNetCliPackageType> 
+      <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' ">$(AspNetCoreRuntimeVersion)</DotNetCliVersion>
+    -->
+    <DotNetCliPackageType>sdk</DotNetCliPackageType>
     <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '$(BundledNETCoreAppPackageVersion)' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">$(AspNetCoreRuntimeVersion)</DotNetCliVersion>
   </PropertyGroup>
 

From 928a2c435d2e3c38e7c62eca535f1c6f08917284 Mon Sep 17 00:00:00 2001
From: Premek Vysoky <premek.vysoky@microsoft.com>
Date: Wed, 25 Aug 2021 17:19:37 +0200
Subject: [PATCH 2/2] Add TODOs, lock the RC1 version better

---
 .../Sdk/tools/dotnet-cli/DotNetCli.props                       | 3 ++-
 .../Sdk/tools/xharness-runner/XHarnessRunner.targets           | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
index 9d2697f8d41..a18693c65f8 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
@@ -1,7 +1,8 @@
 <Project>
   <PropertyGroup>
     <IncludeDotNetCli Condition=" '$(IncludeDotNetCli)' != 'true' ">false</IncludeDotNetCli>
-    <AspNetCoreRuntimeVersion>6.0.0-rc.1.21378.2</AspNetCoreRuntimeVersion>
+    <!-- TODO (https://github.com/dotnet/arcade/issues/7787): When bumping this, we should do #7787 -->
+    <AspNetCoreRuntimeVersion>6.0.100-rc.1.21379.2</AspNetCoreRuntimeVersion>
     <DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' == '' ">runtime</DotNetCliPackageType>
     <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'runtime' ">$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
     <!-- TODO (https://github.com/dotnet/arcade/issues/7022): We are hardcoding this version to use the one tied to the SDK version from global.json -->
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
index e8469cec6dc..d8f3802f7c3 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
@@ -10,6 +10,7 @@
       <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' ">$(AspNetCoreRuntimeVersion)</DotNetCliVersion>
     -->
     <DotNetCliPackageType>sdk</DotNetCliPackageType>
+    <DotNetCliVersion>6.0.100-rc.1.21379.2</DotNetCliVersion>
     <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '$(BundledNETCoreAppPackageVersion)' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">$(AspNetCoreRuntimeVersion)</DotNetCliVersion>
   </PropertyGroup>