Merge branch 'release/3.1' into internal-merge-3.1-2022-05-10-1215

Author: dougbu

NuGet.config

@@ -4,18 +4,10 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-razor-tooling -->
-    <add key="darc-int-dotnet-razor-tooling-f7f8678" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-razor-tooling-f7f86786/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-razor-tooling -->
     <!--  Begin: Package sources from dotnet-corefx -->
     <!--  End: Package sources from dotnet-corefx -->
     <!--  Begin: Package sources from dotnet-core-setup -->
-    <add key="darc-int-dotnet-core-setup-9165b88" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-9165b88e/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-core-setup -->
-    <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-d3511a1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-d3511a1a/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-efcore -->
-    <!--  Begin: Package sources from dotnet-extensions -->
-    <add key="darc-int-dotnet-extensions-fc49d8e" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-fc49d8e2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-extensions -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -27,16 +19,6 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-razor-tooling -->
-    <add key="darc-int-dotnet-razor-tooling-f7f8678" value="true" />
-    <!--  End: Package sources from dotnet-razor-tooling -->
-    <!--  Begin: Package sources from dotnet-extensions -->
-    <add key="darc-int-dotnet-extensions-fc49d8e" value="true" />
-    <!--  End: Package sources from dotnet-extensions -->
-    <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-d3511a1" value="true" />
-    <!--  End: Package sources from dotnet-efcore -->
-    <!--  Begin: Package sources from dotnet-core-setup -->
-    <add key="darc-int-dotnet-core-setup-9165b88" value="true" />
     <!--  End: Package sources from dotnet-core-setup -->
     <!--  Begin: Package sources from dotnet-corefx -->
     <!--  End: Package sources from dotnet-corefx -->

eng/Version.Details.xml

@@ -418,13 +418,13 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
       <Sha>fc49d8e29a7fb8d87d1210396cc3b90e8982934c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22212.4">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22260.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>110afd89a939ac6476282e27d7290583ad3b1715</Sha>
+      <Sha>65777bddfce6966941a4ade1b53efa5e5fc9c87d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22212.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22260.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>110afd89a939ac6476282e27d7290583ad3b1715</Sha>
+      <Sha>65777bddfce6966941a4ade1b53efa5e5fc9c87d</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.25-servicing.22218.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

eng/Versions.props

@@ -64,7 +64,7 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22212.4</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22260.3</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "3.1.418"
+    "version": "3.1.419"
   },
   "tools": {
-    "dotnet": "3.1.418",
+    "dotnet": "3.1.419",
     "runtimes": {
       "dotnet/x64": [
         "$(MicrosoftNETCoreAppInternalPackageVersion)"
@@ -26,6 +26,6 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.22.10",
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22212.4"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22260.3"
   }
 }