From ee809e5f00f8ef518462f2fb6fa0be368896f38c Mon Sep 17 00:00:00 2001
From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Date: Wed, 15 Nov 2023 15:02:47 +0100
Subject: [PATCH] .NET Source-Build 6.0.125 November 2023 Updates (#17781)

---
 eng/Versions.props                                    |  2 +-
 src/SourceBuild/tarball/content/global.json           |  2 +-
 src/SourceBuild/tarball/content/prep.sh               |  2 +-
 .../scripts/bootstrap/OverrideBootstrapVersions.props | 11 +++++++++++
 .../bootstrap/buildBootstrapPreviouslySB.csproj       |  1 +
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 src/SourceBuild/tarball/content/scripts/bootstrap/OverrideBootstrapVersions.props

diff --git a/eng/Versions.props b/eng/Versions.props
index 517ffef7a..c858d3a61 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -174,7 +174,7 @@
       or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
       necessary, and this property is removed from the file.
     -->
-    <PrivateSourceBuiltArtifactsPackageVersion>6.0.124</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>6.0.125</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
   <!-- Workload manifest package versions -->
   <PropertyGroup>
diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json
index e64601b87..06cde48c2 100644
--- a/src/SourceBuild/tarball/content/global.json
+++ b/src/SourceBuild/tarball/content/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "6.0.124"
+    "dotnet": "6.0.125"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",
diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh
index 429173290..89e00b1bb 100755
--- a/src/SourceBuild/tarball/content/prep.sh
+++ b/src/SourceBuild/tarball/content/prep.sh
@@ -118,7 +118,7 @@ if [ "$buildBootstrap" == "true" ]; then
     fi
 
     # Run restore on project to initiate download of bootstrap packages
-    $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/"
+    $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" /p:BootstrapOverrideVersionsProps="$SCRIPT_ROOT/scripts/bootstrap/OverrideBootstrapVersions.props"
 
     # Remove working directory
     rm -rf $workingDir
diff --git a/src/SourceBuild/tarball/content/scripts/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/tarball/content/scripts/bootstrap/OverrideBootstrapVersions.props
new file mode 100644
index 000000000..234abd681
--- /dev/null
+++ b/src/SourceBuild/tarball/content/scripts/bootstrap/OverrideBootstrapVersions.props
@@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+     <!-- 6.0.25 produced improperly versioned runtime assets because the OfficialBuildId
+          was not set correctly. This is the actual shipping version that it should have been -->
+     <NonshippingRuntimeVersionFor6_0_25>6.0.25-servicing.23520.6</NonshippingRuntimeVersionFor6_0_25>
+
+     <MicrosoftNETHostModelVersion>$(NonshippingRuntimeVersionFor6_0_25)</MicrosoftNETHostModelVersion>
+     <MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor6_0_25)</MicrosoftNETCoreTestHostVersion>
+     <RuntimeLinuxX64MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor6_0_25)</RuntimeLinuxX64MicrosoftNETCoreTestHostVersion>
+  </PropertyGroup>
+</Project>
diff --git a/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj
index 14921a48f..c11dfcb3e 100644
--- a/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj
+++ b/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj
@@ -2,6 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="$(MSBuildProjectDirectory)/PackageVersions.props" />
+  <Import Project="$(BootstrapOverrideVersionsProps)" Condition="Exists('$(BootstrapOverrideVersionsProps)')" />
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>