Merge in 'release/3.1' changes

mseada94 · Feb 1, 2022 · 33b0892 · 33b0892
2 parents 3d1933a + 7b6d9a7
commit 33b0892
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -48,10 +48,10 @@ stages:
             pool:
               ${{ if eq(variables['System.TeamProject'], 'public') }}:
                 name: NetCore1ESPool-Svc-Public
-                demands: ImageOverride -equals Build.Server.Amd64.VS2017.Open
+                demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
               ${{ if ne(variables['System.TeamProject'], 'public') }}:
                 name: NetCore1ESPool-Svc-Internal
-                demands: ImageOverride -equals Build.Server.Amd64.VS2017
+                demands: ImageOverride -equals Build.Server.Amd64.VS2019
             variables:
               - _InternalBuildArgs: ''
               - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -321,9 +321,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21552.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21561.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7</Sha>
+      <Sha>3df4410511ad9900804da00ec680bd1c7d6f21e1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.4.1-beta4-20127-10" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/roslyn</Uri>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.1.415",
+    "dotnet": "3.1.416",
     "runtimes": {
       "dotnet": [
         "2.1.30",
@@ -9,9 +9,9 @@
     }
   },
   "sdk": {
-    "version": "3.1.415"
+    "version": "3.1.416"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21552.6"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21561.2"
   }
 }