[main] Update dependencies from dotnet/arcade (#682)

[main] Update dependencies from dotnet/arcade


 - Bump .NET SDK in the bootstrap script

eng/Version.Details.xml

@@ -3,13 +3,13 @@
  <ProductDependencies>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21366.1">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21372.16">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>b03966cd85285e425ffe56003c0ab57e103dd14e</Sha>
+ <Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21366.1">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21372.16">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>b03966cd85285e425ffe56003c0ab57e103dd14e</Sha>
+ <Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
  </Dependency>
  </ToolsetDependencies>
 </Dependencies>

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

global.json

@@ -1,9 +1,9 @@
 {
  "tools": {
- "dotnet": "6.0.100-preview.4.21255.9"
+ "dotnet": "6.0.100-preview.6.21355.2"
  },
  "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"
  }
 }

tools/xharness-bootstrap.sh

@@ -36,7 +36,7 @@ chmod u+x "$dotnet_install"
 dotnet_dir="$here/.dotnet"
 
 printf "Installing .NET SDK locally to \033[0;33m%s\033[0m..\n" "$dotnet_dir"
-$dotnet_install --install-dir "$dotnet_dir" --version "6.0.100-preview.4.21255.9"
+$dotnet_install --install-dir "$dotnet_dir" --version "6.0.100-preview.6.21355.2"
 echo 'dotnet installed'
 
 export DOTNET_ROOT="$here/.dotnet"