Update dependencies from https://github.com/dotnet/arcade build 20211203.6 (#2777)

[main] Update dependencies from dotnet/arcade

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6863256127455ecf972efe4e3194ff8f87412e4e..1e32b0c02755a09877a1fb678df75d77ae4fe505 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -19,14 +19,14 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21603.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
+      <Sha>b3e949192067c8acdaaae35015534f76e92d79d4</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.21576.4">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.21603.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
+      <Sha>b3e949192067c8acdaaae35015534f76e92d79d4</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.101-servicing.21567.21">
       <Uri>https://github.com/dotnet/installer</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
index e6ad084b82824f9a204224c9c056f94d6a91f9f3..507bbe51b1a79ecf6cc2d99321910e45235daefc 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,7 +56,7 @@
     <SystemTextEncodingsWebVersion>4.7.2</SystemTextEncodingsWebVersion>
     <SystemTextJsonVersion>4.7.1</SystemTextJsonVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.21576.4</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.21603.6</MicrosoftDotNetRemoteExecutorVersion>
     <cdbsosversion>10.0.18362</cdbsosversion>
     <NewtonSoftJsonVersion>12.0.2</NewtonSoftJsonVersion>
   </PropertyGroup>

diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index 3bd8b29ebd721b5a9f01e957f72bf03e7f58225c..4585cfd6bba1ed50ca0249769ddca08b96b6c307 100644 (file)
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.53.3"/>
+  <package id="Microsoft.Guardian.Cli" version="0.109.0"/>
 </packages>

diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 3aafc82e4171a7262f7471374091393bb45878e9..8128f2c357052c16a1a689501b13879fae742c9c 100644 (file)
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -54,7 +54,7 @@ jobs:
     # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
     # sync with the packages.config file.
     - name: DefaultGuardianVersion
-      value: 0.53.3
+      value: 0.109.0
     - name: GuardianVersion
       value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
     - name: GuardianPackagesConfigFile

diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index e555c34269f6e8eb1c50ed6b354cd80cf80ecdc7..17f0a365805d51c896b31434dbdbeb021a04b5ed 100644 (file)
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -178,7 +178,7 @@ function InstallDotNetSdk {
   if [[ $# -ge 3 ]]; then
     architecture=$3
   fi
-  InstallDotNet "$root" "$version" $architecture 'sdk' 'false' $runtime_source_feed $runtime_source_feed_key
+  InstallDotNet "$root" "$version" $architecture 'sdk' 'true' $runtime_source_feed $runtime_source_feed_key
 }
 
 function InstallDotNet {

diff --git a/global.json b/global.json
index eb989bfc4b2e01211c8e4944b1696791b64e3d83..c41fbf72ca111f02223b2e6dce880531b534e494 100644 (file)
--- a/global.json
+++ b/global.json
@@ -16,6 +16,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "2.0.1",
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21603.6"
   }
 }