mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Override some versions for nonshipping runtime packages. (#15045)

Browse source 
Source-build 7.0.0 created these packages with an incorrect version number which is stuckthe previously-source-built PVP for the 7.0.1 release.  This causes a problem if bootstapping because the Microsoft versions of these packages don't actually exist, so trying to download them fails.  This change allows us to override the version read out of PVP and set it to the actual version used by runtime.
This commit is contained in:
Chris Rummel 2022-11-28 17:12:22 -06:00 • committed by GitHub
parent d02d33e069
commit ca64f84e41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props Normal file
View file

@ -0,0 +1,11 @@
<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.0-rtm.22518.5</NonshippingRuntimeVersionFor700>
<MicrosoftNETHostModelVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETHostModelVersion>
<MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETCoreTestHostVersion>
<RuntimeLinuxX64MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</RuntimeLinuxX64MicrosoftNETCoreTestHostVersion>
</PropertyGroup>
</Project>

1
src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
View file

@ -2,6 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(MSBuildProjectDirectory)/PackageVersions.props" />
<Import Project="$(BootstrapOverrideVersionsProps)" Condition="Exists('$(BootstrapOverrideVersionsProps)')" />
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>

2
src/SourceBuild/tarball/content/prep.sh
View file

@ -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/eng/bootstrap/OverrideBootstrapVersions.props"
# Remove working directory
rm -rf $workingDir