From b1c1345289e5ada885a89448b7e9a6b7e9110096 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 20 Jul 2023 22:18:14 +0000
Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#17034)

[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-rc.1.23369.24 to 8.0.0-rc.1.23370.1 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.7.0-rc.111 to 6.8.0-preview.1.37 (parent: Microsoft.NET.Sdk)

 - Fix incorrect package version property for System.Security.Cryptography.Pkcs
---
 eng/Version.Details.xml                       | 48 ++++++++--------
 eng/Versions.props                            | 22 ++++----
 ...ckage-version-property-for-System.Se.patch | 56 +++++++++++++++++++
 3 files changed, 91 insertions(+), 35 deletions(-)
 create mode 100644 src/SourceBuild/patches/nuget-client/0001-Fix-incorrect-package-version-property-for-System.Se.patch

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c27d8952f..a99229f2d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -52,34 +52,34 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>16dc5330051a97aec4ba89d21263cdccc7b7552c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rc.1.23369.24" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rc.1.23370.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4161f16141a984ff7e4faaebe0ebe8623a3a178f</Sha>
+      <Sha>24bbfb6d8398684091cc970bd342df185c8f9421</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-rc.1.23369.24" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-rc.1.23370.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4161f16141a984ff7e4faaebe0ebe8623a3a178f</Sha>
+      <Sha>24bbfb6d8398684091cc970bd342df185c8f9421</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23369.24" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23370.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4161f16141a984ff7e4faaebe0ebe8623a3a178f</Sha>
+      <Sha>24bbfb6d8398684091cc970bd342df185c8f9421</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23369.24" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23370.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4161f16141a984ff7e4faaebe0ebe8623a3a178f</Sha>
+      <Sha>24bbfb6d8398684091cc970bd342df185c8f9421</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="8.0.0-rc.1.23369.24" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="8.0.0-rc.1.23370.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4161f16141a984ff7e4faaebe0ebe8623a3a178f</Sha>
+      <Sha>24bbfb6d8398684091cc970bd342df185c8f9421</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="8.0.0-rc.1.23369.24" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-jwts" Version="8.0.0-rc.1.23370.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4161f16141a984ff7e4faaebe0ebe8623a3a178f</Sha>
+      <Sha>24bbfb6d8398684091cc970bd342df185c8f9421</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="8.0.0-rc.1.23369.24" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="8.0.0-rc.1.23370.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4161f16141a984ff7e4faaebe0ebe8623a3a178f</Sha>
+      <Sha>24bbfb6d8398684091cc970bd342df185c8f9421</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
@@ -102,22 +102,22 @@
       <Uri>https://github.com/dotnet/test-templates</Uri>
       <Sha>86fd4cd1c57057f920678e29d6ecbba491abd142</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-rc.1.23370.3">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-rc.1.23370.7">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>9e5c47e2bd7fe2d58ff6a7a666086b5ea7e8fd67</Sha>
+      <Sha>dcadb5cb8c432c6417fd0e81d7f0af844ad7d842</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-rc.1.23370.3">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-rc.1.23370.7">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>9e5c47e2bd7fe2d58ff6a7a666086b5ea7e8fd67</Sha>
+      <Sha>dcadb5cb8c432c6417fd0e81d7f0af844ad7d842</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-rc.1.23370.3">
+    <Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-rc.1.23370.7">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>9e5c47e2bd7fe2d58ff6a7a666086b5ea7e8fd67</Sha>
+      <Sha>dcadb5cb8c432c6417fd0e81d7f0af844ad7d842</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-rc.1.23370.3">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-rc.1.23370.7">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>9e5c47e2bd7fe2d58ff6a7a666086b5ea7e8fd67</Sha>
+      <Sha>dcadb5cb8c432c6417fd0e81d7f0af844ad7d842</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.7.23363.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -156,9 +156,9 @@
       <Sha>0ff2a83e927c14235a95d04291e16fbdc3b29237</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.7.0-rc.111" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="NuGet.Build.Tasks" Version="6.8.0-preview.1.37" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>13f2b6af6e9864711e815cfbffd7aa5015c52cec</Sha>
+      <Sha>19cd9c2cdc18e0ce795d2d69b4ab06eb8865c86b</Sha>
       <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
diff --git a/eng/Versions.props b/eng/Versions.props
index d17da0293..b5aeeeb49 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -68,22 +68,22 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23369.24</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-rc.1.23369.24</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-rc.1.23369.24</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23369.24</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
-    <dotnetdevcertsPackageVersion>8.0.0-rc.1.23369.24</dotnetdevcertsPackageVersion>
-    <dotnetuserjwtsPackageVersion>8.0.0-rc.1.23369.24</dotnetuserjwtsPackageVersion>
-    <dotnetusersecretsPackageVersion>8.0.0-rc.1.23369.24</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23370.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-rc.1.23370.1</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-rc.1.23370.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23370.1</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
+    <dotnetdevcertsPackageVersion>8.0.0-rc.1.23370.1</dotnetdevcertsPackageVersion>
+    <dotnetuserjwtsPackageVersion>8.0.0-rc.1.23370.1</dotnetuserjwtsPackageVersion>
+    <dotnetusersecretsPackageVersion>8.0.0-rc.1.23370.1</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-rc.1.23370.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>8.0.100-rc.1.23370.3</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-rc.1.23370.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-rc.1.23370.7</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftNETSdkPackageVersion>8.0.100-rc.1.23370.7</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-rc.1.23370.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -123,7 +123,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
-    <NuGetBuildTasksPackageVersion>6.7.0-rc.111</NuGetBuildTasksPackageVersion>
+    <NuGetBuildTasksPackageVersion>6.8.0-preview.1.37</NuGetBuildTasksPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/deployment-tools -->
   <PropertyGroup>
diff --git a/src/SourceBuild/patches/nuget-client/0001-Fix-incorrect-package-version-property-for-System.Se.patch b/src/SourceBuild/patches/nuget-client/0001-Fix-incorrect-package-version-property-for-System.Se.patch
new file mode 100644
index 000000000..6fb832839
--- /dev/null
+++ b/src/SourceBuild/patches/nuget-client/0001-Fix-incorrect-package-version-property-for-System.Se.patch
@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nikola Milosavljevic <nikolam@microsoft.com>
+Date: Thu, 20 Jul 2023 19:19:25 +0000
+Subject: [PATCH] Fix incorrect package version property for
+ System.Security.Cryptography.Pkcs
+
+Backport: https://github.com/NuGet/Home/issues/12767
+---
+ Directory.Packages.props | 4 ++--
+ eng/Version.Details.xml  | 4 ++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Directory.Packages.props b/Directory.Packages.props
+index 88f5e0802..0d557109a 100644
+--- a/Directory.Packages.props
++++ b/Directory.Packages.props
+@@ -2,7 +2,6 @@
+   <PropertyGroup>
+     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+ 
+-    <CryptographyPackagesVersion Condition="'$(CryptographyPackagesVersion)' == ''">6.0.4</CryptographyPackagesVersion>
+     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion Condition="'$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)' == ''">3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
+     <NewtonsoftJsonPackageVersion Condition="'$(NewtonsoftJsonPackageVersion)' == ''">13.0.1</NewtonsoftJsonPackageVersion>
+     <SystemPackagesVersion Condition="'$(SystemPackagesVersion)' == ''">4.3.0</SystemPackagesVersion>
+@@ -24,6 +23,7 @@
+     <MicrosoftExtensionsFileSystemGlobbingPackageVersion Condition="'$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)' == ''">6.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+     <MicrosoftWebXdtPackageVersion Condition="'$(MicrosoftWebXdtPackageVersion)' == ''">3.0.0</MicrosoftWebXdtPackageVersion>
+     <SystemComponentModelCompositionPackageVersion Condition="'$(SystemComponentModelCompositionPackageVersion)' == ''">4.5.0</SystemComponentModelCompositionPackageVersion>
++    <SystemSecurityCryptographyPkcsVersion Condition="'$(SystemSecurityCryptographyPkcsVersion)' == ''">6.0.4</SystemSecurityCryptographyPkcsVersion>
+     <!-- System.Security.Cryptography.Xml is a dependency of Microsoft.Build.Tasks.Core. This property can be probably removed when MSBuild is updated to a newer version. -->
+     <SystemSecurityCryptographyXmlVersion Condition="'$(SystemSecurityCryptographyXmlVersion)' == ''">6.0.1</SystemSecurityCryptographyXmlVersion>
+     <SystemSecurityCryptographyXmlVersion Condition="'$(MicrosoftBuildVersion)' == '16.8.0' Or '$(MicrosoftBuildVersion)' == '16.11.0'">4.7.1</SystemSecurityCryptographyXmlVersion>
+@@ -95,7 +95,7 @@
+     <PackageVersion Include="System.Resources.ResourceManager" Version="$(SystemPackagesVersion)" />
+     <PackageVersion Include="System.Runtime.Extensions" Version="$(SystemPackagesVersion)" />
+     <PackageVersion Include="System.Runtime.InteropServices" Version="$(SystemPackagesVersion)" />
+-    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="$(CryptographyPackagesVersion)" />
++    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
+     <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
+     <PackageVersion Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlVersion)" />
+     <PackageVersion Include="System.Text.Encoding.Extensions" Version="$(SystemPackagesVersion)" />
+diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
+index 38e1eba71..d8352707b 100644
+--- a/eng/Version.Details.xml
++++ b/eng/Version.Details.xml
+@@ -34,6 +34,10 @@
+       <Uri>https://github.com/dotnet/corefx</Uri>
+       <Sha>30ab651fcb4354552bd4891619a0bdd81e0ebdbf</Sha>
+     </Dependency>
++    <Dependency Name="System.Security.Cryptography.Pkcs" Version="6.0.4">
++      <Uri>https://github.com/dotnet/runtime</Uri>
++      <Sha>e37fab9fc9f7bce120a7165491ed392a73f8ab51</Sha>
++    </Dependency>
+     <Dependency Name="System.Security.Cryptography.Xml" Version="6.0.1">
+       <Uri>https://github.com/dotnet/runtime</Uri>
+       <Sha>55fb7ef977e7d120dc12f0960edcff0739d7ee0e</Sha>