Merge in 'release/3.1' changes

dotnet · Jul 7, 2021 · ec2894b · ec2894b
2 parents be1461c + dd80dab
commit ec2894b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -418,17 +418,17 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
       <Sha>904ee5cc71a77faea808d43636a4e3e8c175c006</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21228.7">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21322.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
+      <Sha>1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21228.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21322.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
+      <Sha>1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21228.7">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21322.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
+      <Sha>1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.17-servicing.21315.14" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -64,7 +64,7 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21228.7</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21322.2</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->

diff --git a/global.json b/global.json
@@ -26,7 +26,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.15.2",
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21228.7",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21228.7"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21322.2",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21322.2"
   }
 }