From eb4f50fabfd429a64a480e38b32fd7d481edab9a Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 27 Oct 2023 08:06:01 -0700
Subject: [PATCH] Update the stage 0 version and unwind a few of the upgrade
 changes (#17617)

---
 .vsts-ci.yml                                  | 48 +++++++++----------
 global.json                                   |  5 +-
 .../bootstrap/OverrideBootstrapVersions.props |  2 +
 .../buildBootstrapPreviouslySB.csproj         |  1 +
 src/SourceBuild/content/global.json           |  2 +-
 test/EndToEnd/ProjectBuildTests.cs            |  2 +-
 test/SdkTests/SdkTests.csproj                 |  4 +-
 7 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index a3116f1a6..d14d1293e 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -230,30 +230,30 @@ stages:
         additionalBuildParameters: '/p:HostOSName="linux-musl"'
         linuxPortable: false
         runTests: false
-    # - template: eng/build.yml
-    #   parameters:
-    #     agentOs: Linux
-    #     jobName: Build_Linux_Portable_Deb_Release_x64
-    #     container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg'
-    #     buildConfiguration: Release
-    #     buildArchitecture: x64
-    #     # Do not publish zips and tarballs. The linux-x64 binaries are
-    #     # already published by Build_LinuxPortable_Release_x64
-    #     additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true'
-    #     linuxPortable: true
-    #     runTests: false
-    # - template: eng/build.yml
-    #   parameters:
-    #     agentOs: Linux
-    #     jobName: Build_Linux_Portable_Rpm_Release_x64
-    #     container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm'
-    #     buildConfiguration: Release
-    #     buildArchitecture: x64
-    #     # Do not publish zips and tarballs. The linux-x64 binaries are
-    #     # already published by Build_LinuxPortable_Release_x64
-    #     additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
-    #     linuxPortable: true
-    #     runTests: false
+    - template: eng/build.yml
+      parameters:
+        agentOs: Linux
+        jobName: Build_Linux_Portable_Deb_Release_x64
+        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg'
+        buildConfiguration: Release
+        buildArchitecture: x64
+        # Do not publish zips and tarballs. The linux-x64 binaries are
+        # already published by Build_LinuxPortable_Release_x64
+        additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true'
+        linuxPortable: true
+        runTests: false
+    - template: eng/build.yml
+      parameters:
+        agentOs: Linux
+        jobName: Build_Linux_Portable_Rpm_Release_x64
+        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm'
+        buildConfiguration: Release
+        buildArchitecture: x64
+        # Do not publish zips and tarballs. The linux-x64 binaries are
+        # already published by Build_LinuxPortable_Release_x64
+        additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
+        linuxPortable: true
+        runTests: false
     - template: eng/build.yml
       parameters:
         agentOs: Linux
diff --git a/global.json b/global.json
index 3d7627fcd..e90c9dcf2 100644
--- a/global.json
+++ b/global.json
@@ -1,10 +1,9 @@
 {
   "tools": {
-    "dotnet": "9.0.100-alpha.1.23511.2",
+    "dotnet": "9.0.100-alpha.1.23524.3",
     "runtimes": {
       "dotnet": [
-        "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)",
-        "8.0.0-rc.1.23419.4"
+        "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
       ]
     }
   },
diff --git a/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props
index 358c00140..e85bea0e3 100644
--- a/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props
+++ b/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props
@@ -9,6 +9,7 @@
     <Msft80RC2RuntimeVersion>8.0.0-rc.2.23479.6</Msft80RC2RuntimeVersion>
     <MicrosoftNETCoreAppCrossgen2Version>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppCrossgen2Version>
     <MicrosoftNETCoreAppHostPackageVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppHostPackageVersion>
+    <MicrosoftNETCoreAppRefVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppRefVersion>
     <MicrosoftNETCoreAppRuntimeVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppRuntimeVersion>
     <MicrosoftNETILLinkTasksVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETILLinkTasksVersion>
     <MicrosoftDotNetILCompilerVersion>$(Msft80RC2RuntimeVersion)</MicrosoftDotNetILCompilerVersion>
@@ -19,5 +20,6 @@
     <MicrosoftNETCoreILAsmVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreILAsmVersion>
     <MicrosoftNETCoreILDAsmVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreILDAsmVersion>
     <RuntimeNativeSystemIOPortsVersion>$(Msft80RC2RuntimeVersion)</RuntimeNativeSystemIOPortsVersion>
+    
   </PropertyGroup>
 </Project>
diff --git a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
index d85e32ca7..b9dc057ab 100644
--- a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
+++ b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
@@ -49,6 +49,7 @@
     <ExcludedPackage Include="runtime.linux-musl-arm64.runtime.native.System.IO.Ports" />
 
     <PackageDownload Include="Microsoft.NET.ILLink.Tasks" Version="[$(MicrosoftNETILLinkTasksVersion)]" />
+    <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(MicrosoftNETCoreAppRefVersion)]" />
   </ItemGroup>
 
   <Target Name="GetPackagesToDownload"
diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json
index e1487359b..19c613a55 100644
--- a/src/SourceBuild/content/global.json
+++ b/src/SourceBuild/content/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "9.0.100-alpha.1.23511.2"
+    "dotnet": "9.0.100-alpha.1.23524.3"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",
diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs
index 9d36f312d..95487d2b8 100644
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@@ -63,7 +63,7 @@ namespace EndToEnd.Tests
             binDirectory.Should().NotHaveFilesMatching("*.dll", SearchOption.AllDirectories);
         }
 
-        [Fact(Skip ="The current aspnet runtime is built against an 8.0 core runtime")]
+        [Fact]
         public void ItCanRunAnAppUsingTheWebSdk()
         {
             var directory = TestAssets.CreateTestDirectory();
diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj
index 7e8d5bcf8..dbfb6c50f 100644
--- a/test/SdkTests/SdkTests.csproj
+++ b/test/SdkTests/SdkTests.csproj
@@ -64,7 +64,7 @@
       <RuntimeVersionToInstall Include="5.0.0" />
       <RuntimeVersionToInstall Include="6.0.0" />
       <RuntimeVersionToInstall Include="7.0.0" />
-      <RuntimeVersionToInstall Include="8.0.0-rc.1.23419.4" />
+      <RuntimeVersionToInstall Include="8.0.0-rc.2.23479.6" />
     </ItemGroup>
     
   </Target>
@@ -239,7 +239,7 @@
 
     <Exec Command="$(ToolRunPrefix)$(RedistLayoutPath)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
           WorkingDirectory="$(TestLocalToolFolder)"
-          EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME);DOTNET_ROLL_FORWARD=LatestMajor;DOTNET_ROLL_FORWARD_TO_PRERELEASE=1"/>
+          EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>
   </Target>
   
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />