diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59e5715ff4c..796f5fdcfcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/runtime - 293d47286161827ecc0d6e96f9eb7b82dafe8307 + f7e4c261815c66fde2c1e750b744f193e236c17e https://github.com/dotnet/runtime @@ -35,9 +35,9 @@ f7e4c261815c66fde2c1e750b744f193e236c17e - + https://github.com/dotnet/runtime - 293d47286161827ecc0d6e96f9eb7b82dafe8307 + f7e4c261815c66fde2c1e750b744f193e236c17e https://github.com/dotnet/runtime @@ -49,13 +49,13 @@ - + https://github.com/dotnet/arcade - b03966cd85285e425ffe56003c0ab57e103dd14e + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - b03966cd85285e425ffe56003c0ab57e103dd14e + 6224d1b573b73caaa84176bd83dabe75f202cdc7 diff --git a/eng/Versions.props b/eng/Versions.props index 0c6c4db0b3d..441c05b7a46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ 6.0.0-rc.1.21369.2 6.0.0-rc.1.21369.2 - 6.0.0-preview.6.21276.2 + 6.0.0-rc.1.21369.2 6.0.0-rc.1.21369.2 6.0.0-rc.1.21369.2 6.0.0-rc.1.21369.2 @@ -25,7 +25,7 @@ 6.0.0-rc.1.21369.2 6.0.0-rc.1.21369.2 6.0.0-rc.1.21369.2 - 6.0.0-preview.6.21276.2 + 6.0.0-rc.1.21369.2 3.7.0 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index e20637ed6a1..705b7a1c847 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -29,6 +29,11 @@ steps: officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' fi + internalRuntimeDownloadArgs= + if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then + internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + fi + targetRidArgs= if [ '${{ parameters.platform.targetRID }}' != '' ]; then targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' @@ -43,6 +48,7 @@ steps: --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ $officialBuildArgs \ + $internalRuntimeDownloadArgs \ $targetRidArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true diff --git a/global.json b/global.json index 3c1cc214e55..40ceb84331f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-preview.5.21302.13", + "dotnet": "6.0.100-preview.6.21355.2", "runtimes": { "dotnet": [ "3.1.16", @@ -13,12 +13,12 @@ } }, "sdk": { - "version": "6.0.100-preview.5.21302.13", + "version": "6.0.100-preview.6.21355.2", "allowPrerelease": true, "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21366.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21366.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21372.16", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21372.16" } }