From 5d283092c259bcd08ec73329ee76c7c055dfcc39 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 4 Nov 2021 21:46:16 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20211102.6

Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
 From Version 1.0.0-beta.21427.4 -> To Version 1.0.0-beta.21552.6
---
 eng/Version.Details.xml                  | 20 ++++++++++----------
 eng/Versions.props                       |  6 +++---
 eng/common/templates/job/execute-sdl.yml |  2 +-
 eng/common/templates/job/onelocbuild.yml |  2 +-
 eng/common/templates/jobs/jobs.yml       |  4 ++--
 global.json                              |  4 ++--
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6ccf97d8495..9948951a50f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -67,13 +67,13 @@
       <Uri>https://github.com/dotnet/core-setup</Uri>
       <Sha>1a04dd08e56bf52e88668c1ef2bd3f630ad442a5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21427.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21552.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>98e2fbaad9f2f7bbe091bb0b9dd37d03206becc9</Sha>
+      <Sha>afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.21427.4">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.21552.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>98e2fbaad9f2f7bbe091bb0b9dd37d03206becc9</Sha>
+      <Sha>afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
@@ -99,17 +99,17 @@
       <Uri>https://github.com/dotnet/coreclr</Uri>
       <Sha>c2e8c9f71737d87a95610851587e2a1eaf18c91c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21427.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21552.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>98e2fbaad9f2f7bbe091bb0b9dd37d03206becc9</Sha>
+      <Sha>afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.21427.4">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.21552.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>98e2fbaad9f2f7bbe091bb0b9dd37d03206becc9</Sha>
+      <Sha>afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21427.4">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21552.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>98e2fbaad9f2f7bbe091bb0b9dd37d03206becc9</Sha>
+      <Sha>afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7</Sha>
     </Dependency>
     <Dependency Name="System.Resources.Extensions" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 1b61aa6804e..df9bda5a54d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -52,9 +52,9 @@
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/arcade -->
   <PropertyGroup>
-    <MicrosoftDotNetApiCompatVersion>1.0.0-beta.21427.4</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.21427.4</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftDotNetGenAPIVersion>1.0.0-beta.21427.4</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetApiCompatVersion>1.0.0-beta.21552.6</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.21552.6</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetGenAPIVersion>1.0.0-beta.21552.6</MicrosoftDotNetGenAPIVersion>
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/corefxlab -->
   <PropertyGroup>
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 34ea015684c..459f21c878e 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -19,7 +19,7 @@ jobs:
   variables:
     - group: DotNet-VSTS-Bot
   pool:
-    name: Hosted VS2017
+    vmImage: windows-2019
   steps:
   - checkout: self
     clean: true
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index b27d6faf303..e804cf3f38d 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -4,7 +4,7 @@ parameters:
 
   # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
   pool:
-    vmImage: vs2017-win2016
+    vmImage: windows-2019
 
   CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
   GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 6a2f98c036f..a5c6ad2940d 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -74,7 +74,7 @@ jobs:
         - ${{ each job in parameters.jobs }}:
           - ${{ job.job }}
       pool:
-        vmImage: vs2017-win2016
+        vmImage: windows-2019
       runAsPublic: ${{ parameters.runAsPublic }}
       publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
       enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -87,4 +87,4 @@ jobs:
       dependsOn:
         - Asset_Registry_Publish
       pool:
-        vmImage: vs2017-win2016
+        vmImage: windows-2019
diff --git a/global.json b/global.json
index 64c14be7ed9..1846a2f230b 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21427.4",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21427.4"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21552.6",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21552.6"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1",