Merge in 'release/3.1' changes

dotnet · Nov 9, 2022 · 8175968 · 8175968
2 parents e083f8a + 32bb61e
commit 8175968
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -14,8 +14,6 @@
     <!--  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-0e404aa" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0e404aa9/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-core-setup-0e404aa-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0e404aa9-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-core-setup -->
     <!--  End: Package sources from dotnet-extensions -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -28,8 +26,6 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-core-setup -->
-    <add key="darc-int-dotnet-core-setup-0e404aa-1" value="true" />
-    <add key="darc-int-dotnet-core-setup-0e404aa" value="true" />
     <!--  Begin: Package sources from dotnet-efcore -->
     <add key="darc-int-dotnet-efcore-64e7452" value="true" />
     <!--  End: Package sources from dotnet-efcore -->

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -418,13 +418,13 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
       <Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22512.2">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22558.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>869528d3af327eb6de19b414631280734dfe76e6</Sha>
+      <Sha>7120a7d1b74dcbce97e34dded2c9e9011639b175</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22512.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22558.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>869528d3af327eb6de19b414631280734dfe76e6</Sha>
+      <Sha>7120a7d1b74dcbce97e34dded2c9e9011639b175</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.31-servicing.22514.1" 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.22512.2</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22558.6</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->

diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.110.1"/>
+  <package id="Microsoft.Guardian.Cli" version="0.130.0"/>
 </packages>
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
@@ -66,7 +66,7 @@ jobs:
       continueOnError: ${{ parameters.sdlContinueOnError }}
   - ${{ if eq(parameters.overrideParameters, '') }}:
     - powershell: eng/common/sdl/execute-all-sdl-tools.ps1
-        -GuardianPackageName Microsoft.Guardian.Cli.0.110.1
+        -GuardianPackageName Microsoft.Guardian.Cli.0.130.0
         -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
         -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
         ${{ parameters.additionalParameters }}

diff --git a/global.json b/global.json
@@ -26,6 +26,6 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.22.10",
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22512.2"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22558.6"
   }
 }