Browse Source

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

[main] Update dependencies from dotnet/arcade
dotnet-maestro[bot] 4 years ago
parent
commit
982bfe1749

+ 8 - 8
eng/Version.Details.xml

@@ -280,22 +280,22 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21606.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
+      <Sha>5d969787afb2fd87f642458687e3ad41094ac3ab</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21576.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21606.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
+      <Sha>5d969787afb2fd87f642458687e3ad41094ac3ab</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.21576.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.21606.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
+      <Sha>5d969787afb2fd87f642458687e3ad41094ac3ab</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21576.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21606.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
+      <Sha>5d969787afb2fd87f642458687e3ad41094ac3ab</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

+ 2 - 2
eng/Versions.props

@@ -134,8 +134,8 @@
     <MicrosoftEntityFrameworkCoreVersion>7.0.0-alpha.1.21606.2</MicrosoftEntityFrameworkCoreVersion>
     <MicrosoftEntityFrameworkCoreDesignVersion>7.0.0-alpha.1.21606.2</MicrosoftEntityFrameworkCoreDesignVersion>
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.21576.4</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.21576.4</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.21606.6</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.21606.6</MicrosoftDotNetBuildTasksTemplatingVersion>
   </PropertyGroup>
   <!--
 

+ 1 - 1
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>

+ 1 - 1
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

+ 1 - 1
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 {

+ 2 - 2
global.json

@@ -29,7 +29,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.22.10",
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.4"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21606.6",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21606.6"
   }
 }