From 08a4d84aac730e3bab167256c259d7215f94b6d8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 5 Apr 2022 20:16:15 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20220309.6

Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
 From Version 1.0.0-beta.22077.9 -> To Version 1.0.0-beta.22159.6
---
 eng/Version.Details.xml            | 20 ++++++++++----------
 eng/Versions.props                 |  6 +++---
 eng/common/templates/job/job.yml   |  1 +
 eng/common/templates/jobs/jobs.yml |  4 ----
 global.json                        |  4 ++--
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f0b03fdead1..36531dec20e 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.22077.9">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22159.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
+      <Sha>aebcd10d76469b2e84cffd39d043574bc5357d22</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.22077.9">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.22159.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
+      <Sha>aebcd10d76469b2e84cffd39d043574bc5357d22</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.22077.9">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.22159.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
+      <Sha>aebcd10d76469b2e84cffd39d043574bc5357d22</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.22077.9">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.22159.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
+      <Sha>aebcd10d76469b2e84cffd39d043574bc5357d22</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22077.9">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22159.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
+      <Sha>aebcd10d76469b2e84cffd39d043574bc5357d22</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 7fc7714162e..8137e9a0a7b 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.22077.9</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.22077.9</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftDotNetGenAPIVersion>1.0.0-beta.22077.9</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetApiCompatVersion>1.0.0-beta.22159.6</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.22159.6</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetGenAPIVersion>1.0.0-beta.22159.6</MicrosoftDotNetGenAPIVersion>
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/corefxlab -->
   <PropertyGroup>
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 7a464c0d722..c43c779e3ca 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -162,6 +162,7 @@ jobs:
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
       - task: ComponentGovernanceComponentDetection@0
+        continueOnError: true
 
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 0bd064ba208..bd9090cb0b5 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -17,10 +17,6 @@ parameters:
   # Optional: Enable publishing using release pipelines
   enablePublishUsingPipelines: false
 
-  # Optional: Disable component governance detection. In general, component governance
-  # should be on for all jobs. Use only in the event of issues.
-  disableComponentGovernance: false
-
   graphFileGeneration:
     # Optional: Enable generating the graph files at the end of the build
     enabled: false
diff --git a/global.json b/global.json
index 8a9f0b30564..bcf670e4865 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22077.9",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.22077.9"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22159.6",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.22159.6"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1",