Skip to content

Commit 0f031f6

Browse files
Remove unused OverrideBootstrapVersions infrastructure (#45550)
1 parent b07efa9 commit 0f031f6

File tree

3 files changed

+1
-37
lines changed

3 files changed

+1
-37
lines changed

src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<Import Project="$(MSBuildProjectDirectory)/PackageVersions.props" />
4-
<Import Project="$(BootstrapOverrideVersionsProps)" Condition="Exists('$(BootstrapOverrideVersionsProps)')" />
54

65
<PropertyGroup>
76
<TargetFramework>net7.0</TargetFramework>
@@ -130,35 +129,9 @@
130129
Targets="CopyDownloadedPackage"
131130
Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" />
132131

133-
<!-- override PVP with bootstrap-override package versions -->
134-
<Message Text=" Overriding previously-source-built package versions with $(BootstrapOverrideVersionsProps)" Importance="High" Condition="Exists('$(BootstrapOverrideVersionsProps)')" />
135-
<ReadLinesFromFile File="$(UnpackedTarPath)/PackageVersions.props">
136-
<Output TaskParameter="Lines" ItemName="OriginalPackageVersionLines" />
137-
</ReadLinesFromFile>
138-
<ReadLinesFromFile File="$(BootstrapOverrideVersionsProps)">
139-
<Output TaskParameter="Lines" ItemName="BootstrapPackageVersionLines" />
140-
</ReadLinesFromFile>
141-
142-
<ItemGroup>
143-
<OriginalPackageVersionLines Remove="&lt;/Project&gt;" />
144-
<BootstrapPackageVersionLines Remove="&lt;Project&gt;" />
145-
</ItemGroup>
146-
147-
<WriteLinesToFile File="$(UnpackedTarPath)/PackageVersions.props"
148-
Lines="@(OriginalPackageVersionLines)"
149-
Overwrite="true"
150-
Condition="Exists('$(BootstrapOverrideVersionsProps)')"
151-
/>
152-
<WriteLinesToFile File="$(UnpackedTarPath)/PackageVersions.props"
153-
Lines="@(BootstrapPackageVersionLines)"
154-
Overwrite="false"
155-
Condition="Exists('$(BootstrapOverrideVersionsProps)')"
156-
/>
157-
158132
<!-- Repack tarball with new bootstrap name -->
159133
<Message Text=" Repacking tarball to $(NewTarballName)" Importance="High" />
160134
<Exec Command="tar --numeric-owner -czf $(NewTarballName) *.nupkg *.props *.xml SourceBuildReferencePackages/" WorkingDirectory="$(UnpackedTarPath)" />
161-
162135
</Target>
163136

164137
<Target Name="CopyDownloadedPackage">

src/SourceBuild/content/prep-source-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ function BootstrapArtifacts {
196196
fi
197197

198198
# Run restore on project to initiate download of bootstrap packages
199-
"$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"
199+
"$DOTNET_SDK_PATH/dotnet" restore "$workingDir/buildBootstrapPreviouslySB.csproj" /bl:artifacts/log/prep-bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/log/prep-bootstrap.log /p:ArchiveDir="$packagesArchiveDir"
200200

201201
# Remove working directory
202202
rm -rf "$workingDir"

0 commit comments

Comments
 (0)