From 08d2f8d22353d07b199095b5eb8e8939cd4cd567 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Tue, 18 Oct 2022 15:08:47 +0000
Subject: [PATCH] Merged PR 26829: [internal/release/6.0.3xx] Update
 dependencies from dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20221017.35
- **Date Produced**: October 18, 2022 6:46:26 AM UTC
- **Commit**: a1b8eada07c2e6b43e853b842f42198c7412b4bc
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22517.22 to 6.0.306-servicing.22517.35][1]
  - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22517.22 to 6.0.306-servicing.22517.35][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15][2]
  - **dotnet-dev-certs**: [from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15][2]
  - **dotnet-user-secrets**: [from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7a9f7da&targetVersion=GCa1b8ead&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC5d56e0e&targetVersion=GCcb12e45&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
---
 NuGet.config            |  4 ++--
 eng/Version.Details.xml | 28 ++++++++++++++--------------
 eng/Versions.props      | 12 ++++++------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index ab8a35844..dd67fb095 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,7 +7,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-5d56e0e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-5d56e0ed/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-cb12e45" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cb12e458/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
@@ -41,7 +41,7 @@
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-5d56e0e" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-cb12e45" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-c672e90" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c00a176d7..f18060e62 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -54,28 +54,28 @@
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.11" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>5d56e0ed88d86767cd80711a1642cbcfcda1c569</Sha>
+      <Sha>cb12e458e05385ddde3f1172aa1a9978ac9bc896</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.11-servicing.22507.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.11-servicing.22517.15" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>5d56e0ed88d86767cd80711a1642cbcfcda1c569</Sha>
+      <Sha>cb12e458e05385ddde3f1172aa1a9978ac9bc896</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.11" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>5d56e0ed88d86767cd80711a1642cbcfcda1c569</Sha>
+      <Sha>cb12e458e05385ddde3f1172aa1a9978ac9bc896</Sha>
       <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.11-servicing.22507.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.11-servicing.22517.15" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>5d56e0ed88d86767cd80711a1642cbcfcda1c569</Sha>
+      <Sha>cb12e458e05385ddde3f1172aa1a9978ac9bc896</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="6.0.11-servicing.22507.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="6.0.11-servicing.22517.15" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>5d56e0ed88d86767cd80711a1642cbcfcda1c569</Sha>
+      <Sha>cb12e458e05385ddde3f1172aa1a9978ac9bc896</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="6.0.11-servicing.22507.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="6.0.11-servicing.22517.15" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>5d56e0ed88d86767cd80711a1642cbcfcda1c569</Sha>
+      <Sha>cb12e458e05385ddde3f1172aa1a9978ac9bc896</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22207.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
@@ -103,14 +103,14 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
       <Sha>9303db79522b69698068b6926d45b4c84fa6368f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.306-servicing.22517.22">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.306-servicing.22517.35">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>7a9f7daae15db5611a881fad3f94502a61f976c5</Sha>
+      <Sha>a1b8eada07c2e6b43e853b842f42198c7412b4bc</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.306-servicing.22517.22">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.306-servicing.22517.35">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>7a9f7daae15db5611a881fad3f94502a61f976c5</Sha>
+      <Sha>a1b8eada07c2e6b43e853b842f42198c7412b4bc</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="6.0.11-servicing.22513.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 00e579853..afb07ba00 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,18 +46,18 @@
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.11</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>6.0.11</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.11-servicing.22507.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.11-servicing.22507.1</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
-    <dotnetdevcertsPackageVersion>6.0.11-servicing.22507.1</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>6.0.11-servicing.22507.1</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.11-servicing.22517.15</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.11-servicing.22517.15</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+    <dotnetdevcertsPackageVersion>6.0.11-servicing.22517.15</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>6.0.11-servicing.22517.15</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.306-servicing.22517.22</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.306-servicing.22517.22</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.306-servicing.22517.35</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.306-servicing.22517.35</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>