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

Merge branch 'release/7.0.4xx'

Browse source
This commit is contained in:
Jason Zhai 2023-08-09 22:50:56 -07:00
commit c3098a65da
6 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -197,19 +197,19 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23361.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23408.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha> <Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.23361.3"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.23408.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha> <Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23361.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23408.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha> <Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22580.2"> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22580.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

4
eng/Versions.props
View file

@ -19,7 +19,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.23361.3</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->
@ -174,7 +174,7 @@
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
necessary, and this property is removed from the file. necessary, and this property is removed from the file.
--> -->
<PrivateSourceBuiltArtifactsPackageVersion>6.0.120</PrivateSourceBuiltArtifactsPackageVersion> <PrivateSourceBuiltArtifactsPackageVersion>6.0.121</PrivateSourceBuiltArtifactsPackageVersion>
</PropertyGroup> </PropertyGroup>
<!-- Workload manifest package versions --> <!-- Workload manifest package versions -->
<PropertyGroup> <PropertyGroup>

6
global.json
View file

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "6.0.120", "dotnet": "6.0.121",
"runtimes": { "runtimes": {
"dotnet": [ "dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "3.16.4" "cmake": "3.16.4"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23361.3" "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5"
} }
} }

12
src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
View file

@ -14,7 +14,7 @@ parameters:
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c
debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b
debian9Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-arm64v8-20220405201138-a251961 debian9Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-arm64v8-20220405201138-a251961
fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-20230609193134-47458d2
ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b
poolInternalAmd64: poolInternalAmd64:
name: NetCore1ESPool-Svc-Internal name: NetCore1ESPool-Svc-Internal
@ -62,9 +62,9 @@ jobs:
_EnablePoison: false _EnablePoison: false
_ExcludeOmniSharpTests: false _ExcludeOmniSharpTests: false
_RunOnline: false _RunOnline: false
Fedora33-Offline: Fedora38-Offline:
_BootstrapPrep: false _BootstrapPrep: false
_Container: ${{ parameters.fedora33Container }} _Container: ${{ parameters.fedora38Container }}
_EnablePoison: true _EnablePoison: true
_ExcludeOmniSharpTests: false _ExcludeOmniSharpTests: false
_RunOnline: false _RunOnline: false
@ -111,9 +111,9 @@ jobs:
excludeSdkContentTests: true excludeSdkContentTests: true
installerBuildResourceId: ${{ parameters.installerBuildResourceId }} installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
matrix: matrix:
Fedora33-Offline: Fedora38-Offline:
_PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora33-Offline_Artifacts _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts
_Container: ${{ parameters.fedora33Container }} _Container: ${{ parameters.fedora38Container }}
_EnablePoison: false _EnablePoison: false
_ExcludeOmniSharpTests: false _ExcludeOmniSharpTests: false
_RunOnline: false _RunOnline: false

2
src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
View file

@ -322,7 +322,7 @@
<MakeDir Directories="$(ExternalTarballsDir)" /> <MakeDir Directories="$(ExternalTarballsDir)" />
<ItemGroup> <ItemGroup>
<ArtifactUrls Include="$(SourceBuiltArtifactsTarballUrl)$(SourceBuiltArtifactsTarballName).$(PrivateSourceBuiltArtifactsPackageVersion).tar.gz" /> <ArtifactUrls Include="$(SourceBuiltArtifactsTarballUrl)$(SourceBuiltArtifactsTarballName).$(PrivateSourceBuiltArtifactsPackageVersion).centos.7-x64.tar.gz" />
<ArtifactUrls <ArtifactUrls
Include="$(SourceBuiltArtifactsTarballUrl)$(SourceBuiltPrebuiltsTarballName).$(PrivateSourceBuiltPrebuiltsPackageVersion).tar.gz" Include="$(SourceBuiltArtifactsTarballUrl)$(SourceBuiltPrebuiltsTarballName).$(PrivateSourceBuiltPrebuiltsPackageVersion).tar.gz"
Condition="'$(PrivateSourceBuiltPrebuiltsPackageVersion)' != ''" /> Condition="'$(PrivateSourceBuiltPrebuiltsPackageVersion)' != ''" />

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

@ -79,13 +79,13 @@ while read -r line; do
if [[ $line == *"Private.SourceBuilt.Artifacts"* ]]; then if [[ $line == *"Private.SourceBuilt.Artifacts"* ]]; then
if [ "$downloadArtifacts" == "true" ]; then if [ "$downloadArtifacts" == "true" ]; then
echo " Downloading source-built artifacts from $line..." echo " Downloading source-built artifacts from $line..."
(cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) (cd $SCRIPT_ROOT/packages/archive/ && curl --fail --retry 5 -O $line)
fi fi
fi fi
if [[ $line == *"Private.SourceBuilt.Prebuilts"* ]]; then if [[ $line == *"Private.SourceBuilt.Prebuilts"* ]]; then
if [ "$downloadPrebuilts" == "true" ]; then if [ "$downloadPrebuilts" == "true" ]; then
echo " Downloading source-built prebuilts from $line..." echo " Downloading source-built prebuilts from $line..."
(cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) (cd $SCRIPT_ROOT/packages/archive/ && curl --fail --retry 5 -O $line)
fi fi
fi fi
done < $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt done < $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt