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

Merge in 'release/6.0.3xx' changes

Browse source
This commit is contained in:
dotnet-bot 2023-11-17 02:07:44 +00:00
commit bb3d2797ff
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eng/Versions.props
View file

@ -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>

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

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

@ -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>

1
src/SourceBuild/tarball/content/scripts/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>net6.0</TargetFramework>