From cd347a4202f738fbd04cee4c49cc822b1d6c9a4d Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 18 Dec 2024 20:47:11 +0000
Subject: [PATCH 1/3] Remove unused OverrideBootstrapVersions infrastructure

---
 .../buildBootstrapPreviouslySB.csproj         | 26 -------------------
 src/SourceBuild/content/prep-source-build.sh  |  2 +-
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
index 66e72a179810..e92d5282f1c2 100644
--- a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
+++ b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="$(MSBuildProjectDirectory)/PackageVersions.props" />
-  <Import Project="$(BootstrapOverrideVersionsProps)" Condition="Exists('$(BootstrapOverrideVersionsProps)')" />
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
@@ -130,31 +129,6 @@
       Targets="CopyDownloadedPackage"
       Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" />
 
-    <!-- override PVP with bootstrap-override package versions -->
-    <Message Text="  Overriding previously-source-built package versions with $(BootstrapOverrideVersionsProps)" Importance="High" Condition="Exists('$(BootstrapOverrideVersionsProps)')" />
-    <ReadLinesFromFile File="$(UnpackedTarPath)/PackageVersions.props">
-      <Output TaskParameter="Lines" ItemName="OriginalPackageVersionLines" />
-    </ReadLinesFromFile>
-    <ReadLinesFromFile File="$(BootstrapOverrideVersionsProps)">
-      <Output TaskParameter="Lines" ItemName="BootstrapPackageVersionLines" />
-    </ReadLinesFromFile>
-
-    <ItemGroup>
-      <OriginalPackageVersionLines Remove="&lt;/Project&gt;" />
-      <BootstrapPackageVersionLines Remove="&lt;Project&gt;" />
-    </ItemGroup>
-
-    <WriteLinesToFile File="$(UnpackedTarPath)/PackageVersions.props"
-                      Lines="@(OriginalPackageVersionLines)"
-                      Overwrite="true"
-                      Condition="Exists('$(BootstrapOverrideVersionsProps)')"
-    />
-    <WriteLinesToFile File="$(UnpackedTarPath)/PackageVersions.props"
-                      Lines="@(BootstrapPackageVersionLines)"
-                      Overwrite="false"
-                      Condition="Exists('$(BootstrapOverrideVersionsProps)')"
-    />
-
     <!-- Repack tarball with new bootstrap name -->
     <Message Text="  Repacking tarball to $(NewTarballName)" Importance="High" />
     <Exec Command="tar --numeric-owner -czf $(NewTarballName) *.nupkg *.props *.xml SourceBuildReferencePackages/" WorkingDirectory="$(UnpackedTarPath)" />
diff --git a/src/SourceBuild/content/prep-source-build.sh b/src/SourceBuild/content/prep-source-build.sh
index 0f4d1d551a03..e4be73a656ce 100755
--- a/src/SourceBuild/content/prep-source-build.sh
+++ b/src/SourceBuild/content/prep-source-build.sh
@@ -196,7 +196,7 @@ function BootstrapArtifacts {
   fi
 
   # Run restore on project to initiate download of bootstrap packages
-  "$DOTNET_SDK_PATH/dotnet" restore "$workingDir/buildBootstrapPreviouslySB.csproj" /bl:artifacts/log/prep-bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/log/prep-bootstrap.log /p:ArchiveDir="$packagesArchiveDir" /p:BootstrapOverrideVersionsProps="$REPO_ROOT/eng/bootstrap/OverrideBootstrapVersions.props"
+  "$DOTNET_SDK_PATH/dotnet" restore "$workingDir/buildBootstrapPreviouslySB.csproj" /bl:artifacts/log/prep-bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/log/prep-bootstrap.log /p:ArchiveDir="$packagesArchiveDir""
 
   # Remove working directory
   rm -rf "$workingDir"

From 3bf32c5730ddf486bc766cadca61cbe3a4011104 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 18 Dec 2024 21:01:21 +0000
Subject: [PATCH 2/3] Remove actual OverrideBootstrapVersions.props file

---
 .../eng/bootstrap/OverrideBootstrapVersions.props        | 9 ---------
 .../eng/bootstrap/buildBootstrapPreviouslySB.csproj      | 1 -
 2 files changed, 10 deletions(-)
 delete mode 100644 src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props

diff --git a/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props
deleted file mode 100644
index 4da9c2172a88..000000000000
--- a/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!-- 7.0.0 produced improperly versioned runtime assets because the OfficialBuildId
-         was not set correctly.  This is the actual shipping version that it should have been -->
-    <NonshippingRuntimeVersionFor700>7.0.4-servicing.23107.6</NonshippingRuntimeVersionFor700>
-    
-    <MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETCoreTestHostVersion>
-  </PropertyGroup>
-</Project>
diff --git a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
index e92d5282f1c2..93f3581ab1be 100644
--- a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
+++ b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
@@ -132,7 +132,6 @@
     <!-- Repack tarball with new bootstrap name -->
     <Message Text="  Repacking tarball to $(NewTarballName)" Importance="High" />
     <Exec Command="tar --numeric-owner -czf $(NewTarballName) *.nupkg *.props *.xml SourceBuildReferencePackages/" WorkingDirectory="$(UnpackedTarPath)" />
-
   </Target>
 
   <Target Name="CopyDownloadedPackage">

From f9b7980e904c7773a9c65c589095f4be70a3b1c9 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 18 Dec 2024 21:37:36 +0000
Subject: [PATCH 3/3] Fix syntax error

---
 src/SourceBuild/content/prep-source-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/prep-source-build.sh b/src/SourceBuild/content/prep-source-build.sh
index e4be73a656ce..bf00571ade92 100755
--- a/src/SourceBuild/content/prep-source-build.sh
+++ b/src/SourceBuild/content/prep-source-build.sh
@@ -196,7 +196,7 @@ function BootstrapArtifacts {
   fi
 
   # Run restore on project to initiate download of bootstrap packages
-  "$DOTNET_SDK_PATH/dotnet" restore "$workingDir/buildBootstrapPreviouslySB.csproj" /bl:artifacts/log/prep-bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/log/prep-bootstrap.log /p:ArchiveDir="$packagesArchiveDir""
+  "$DOTNET_SDK_PATH/dotnet" restore "$workingDir/buildBootstrapPreviouslySB.csproj" /bl:artifacts/log/prep-bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/log/prep-bootstrap.log /p:ArchiveDir="$packagesArchiveDir"
 
   # Remove working directory
   rm -rf "$workingDir"