Merge in 'release/3.1' changes

dotnet · Feb 16, 2022 · 0dee78f · 0dee78f
2 parents 55ac59b + b4f19e3
commit 0dee78f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -2,21 +2,21 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22077.9">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22114.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
+      <Sha>184ce2c7f17508264ffa19b307d97e7568da05ab</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.22114.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
+      <Sha>184ce2c7f17508264ffa19b307d97e7568da05ab</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.22077.9">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.22114.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
+      <Sha>184ce2c7f17508264ffa19b307d97e7568da05ab</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.22077.9">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.22114.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
+      <Sha>184ce2c7f17508264ffa19b307d97e7568da05ab</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.21310.1">
       <Uri>https://github.com/dotnet/corefx</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -15,9 +15,9 @@
     <UsingToolXliff>false</UsingToolXliff>
     <!-- Package versions -->
     <!-- arcade -->
-    <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.22077.9</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.22077.9</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetHelixSdkVersion>2.0.0-beta.22077.9</MicrosoftDotNetHelixSdkVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.22114.9</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.22114.9</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetHelixSdkVersion>2.0.0-beta.22114.9</MicrosoftDotNetHelixSdkVersion>
     <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
     <!-- roslyn -->
     <MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>

diff --git 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/global.json b/global.json
@@ -7,8 +7,8 @@
     "python": "2.7.15"
   },
   "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.22114.9",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.22114.9",
     "Microsoft.Build.NoTargets": "1.0.53",
     "Microsoft.Build.Traversal": "2.0.2"
   }