From 50cc344a8045ecf7ab63488104397dcfceae3f22 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 17:47:42 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20230421.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23221.2
---
 eng/Version.Details.xml                             | 12 ++++++------
 eng/Versions.props                                  |  2 +-
 eng/common/templates/job/job.yml                    | 12 ++++++++----
 eng/common/templates/steps/component-governance.yml | 10 ++++++++++
 global.json                                         |  4 ++--
 5 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 eng/common/templates/steps/component-governance.yml

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 30b9a6d9e..561fbab89 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -192,18 +192,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23211.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23221.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
+      <Sha>746a46f3963c9359da5dab5425bc0feaf9e88068</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23211.2">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23221.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
+      <Sha>746a46f3963c9359da5dab5425bc0feaf9e88068</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23211.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23221.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
+      <Sha>746a46f3963c9359da5dab5425bc0feaf9e88068</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23219.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 3348fbaac..b5dd8fdc1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -33,7 +33,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23221.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index e3ba93980..3cb5145ea 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -24,7 +24,7 @@ parameters:
   enablePublishBuildAssets: false
   enablePublishTestResults: false
   enablePublishUsingPipelines: false
-  disableComponentGovernance: false
+  disableComponentGovernance: ''
   mergeTestResults: false
   testRunTitle: ''
   testResultsFormat: ''
@@ -142,9 +142,13 @@ jobs:
         richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
       continueOnError: true
 
-  - ${{ 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
+  - template: /eng/common/templates/steps/component-governance.yml
+    parameters:
+      ${{ if eq(parameters.disableComponentGovernance, '') }}:
+        ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
+          disableComponentGovernance: false
+        ${{ else }}:
+          disableComponentGovernance: 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/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml
new file mode 100644
index 000000000..babc2757d
--- /dev/null
+++ b/eng/common/templates/steps/component-governance.yml
@@ -0,0 +1,10 @@
+parameters:
+  disableComponentGovernance: false
+
+steps:
+- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
+  - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
+    displayName: Set skipComponentGovernanceDetection variable
+- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
+  - task: ComponentGovernanceComponentDetection@0
+    continueOnError: true
\ No newline at end of file
diff --git a/global.json b/global.json
index 550a365a9..3e657a132 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
     "cmake": "3.16.4"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2",
-    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23221.2",
+    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23221.2"
   }
 }