diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2569e5124..62db8623a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c1cb463e7..acfa240d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23361.3 + 6.0.0-beta.23408.5 @@ -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. --> - 6.0.120 + 6.0.121 diff --git a/global.json b/global.json index 3364ad030..327cfe027 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.120", + "dotnet": "6.0.121", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", - "Microsoft.DotNet.CMake.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.23408.5" } } diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index aa9193387..2d2c0b757 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -14,7 +14,7 @@ parameters: centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b 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 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal @@ -62,9 +62,9 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false - Fedora33-Offline: + Fedora38-Offline: _BootstrapPrep: false - _Container: ${{ parameters.fedora33Container }} + _Container: ${{ parameters.fedora38Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _RunOnline: false @@ -111,9 +111,9 @@ jobs: excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Fedora33-Offline: - _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora33-Offline_Artifacts - _Container: ${{ parameters.fedora33Container }} + Fedora38-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts + _Container: ${{ parameters.fedora38Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 323f7a038..4ee92a5e1 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -322,7 +322,7 @@ - + diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index e7fc6d550..429173290 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -79,13 +79,13 @@ while read -r line; do if [[ $line == *"Private.SourceBuilt.Artifacts"* ]]; then if [ "$downloadArtifacts" == "true" ]; then 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 if [[ $line == *"Private.SourceBuilt.Prebuilts"* ]]; then if [ "$downloadPrebuilts" == "true" ]; then 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 done < $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt