From 885be3959da5f212a115b9c96c43ca101383529b Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Tue, 18 Apr 2023 17:20:52 +0000
Subject: [PATCH] Merged PR 30761: [internal/release/7.0.1xx] 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 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20230418.7
- **Date Produced**: April 18, 2023 3:37:25 PM UTC
- **Commit**: b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.106 to 7.0.106][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.106-servicing.23215.4 to 7.0.106-servicing.23218.7][1]
  - **Microsoft.NET.Sdk**: [from 7.0.106-servicing.23215.4 to 7.0.106-servicing.23218.7][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.106-servicing.23215.4 to 7.0.106-servicing.23218.7][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.6 to 7.0.6][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.6][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2]
  - **dotnet-dev-certs**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2]
  - **dotnet-user-jwts**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2]
  - **dotnet-user-secrets**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2a0eb01fb6&targetVersion=GCb50d5e5d55&_a=files
[2]: https://dev.azure.com/dnceng/in...
---
 NuGet.config            | 13 +++++++++----
 eng/Version.Details.xml | 38 +++++++++++++++++++-------------------
 eng/Versions.props      | 14 +++++++-------
 3 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 50985bcc0..2f6d8c615 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,22 +7,25 @@
     <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-d4bac30" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d4bac300/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-4515d4e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4515d4e1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-b0eec69" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b0eec69e/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-b0eec69-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b0eec69e-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-7e646be" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7e646be4/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-e3acf02" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e3acf029/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-e3acf02-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e3acf029-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-2a0eb01" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-2a0eb01f/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-b50d5e5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-b50d5e5d/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0af2ffd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0af2ffd3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0af2ffd-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0af2ffd3-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -44,14 +47,16 @@
   <disabledPackageSources>
     <!--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-d4bac30" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-4515d4e" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-e3acf02-1" value="true" />
     <add key="darc-int-dotnet-runtime-e3acf02" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-2a0eb01" value="true" />
+    <add key="darc-int-dotnet-sdk-b50d5e5" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-0af2ffd-1" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-0af2ffd" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0780c8c52..bcc919800 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -54,32 +54,32 @@
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
+      <Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.6-servicing.23214.13" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.6-servicing.23217.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
+      <Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
+      <Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.6-servicing.23214.13" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.6-servicing.23217.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
+      <Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="7.0.6-servicing.23214.13" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="7.0.6-servicing.23217.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
+      <Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="7.0.6-servicing.23214.13" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-jwts" Version="7.0.6-servicing.23217.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
+      <Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="7.0.6-servicing.23214.13" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="7.0.6-servicing.23217.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>d4bac3001364e830ea9d8cc929b9dba56196e4f8</Sha>
+      <Sha>4515d4e1d70b50f899ee35cedf6be3a31098dd92</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>
@@ -100,20 +100,20 @@
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.106">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>2a0eb01fb62e042a9f3a91ee257a85df08cf6589</Sha>
+      <Sha>b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.106-servicing.23215.4">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.106-servicing.23218.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>2a0eb01fb62e042a9f3a91ee257a85df08cf6589</Sha>
+      <Sha>b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.106-servicing.23215.4">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.106-servicing.23218.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>2a0eb01fb62e042a9f3a91ee257a85df08cf6589</Sha>
+      <Sha>b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.106-servicing.23215.4">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.106-servicing.23218.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>2a0eb01fb62e042a9f3a91ee257a85df08cf6589</Sha>
+      <Sha>b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53</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="7.0.6-servicing.23213.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 90b0d5a94..cfe6e097a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -58,11 +58,11 @@
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>7.0.6</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.6-servicing.23214.13</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.6-servicing.23214.13</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
-    <dotnetdevcertsPackageVersion>7.0.6-servicing.23214.13</dotnetdevcertsPackageVersion>
-    <dotnetuserjwtsPackageVersion>7.0.6-servicing.23214.13</dotnetuserjwtsPackageVersion>
-    <dotnetusersecretsPackageVersion>7.0.6-servicing.23214.13</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.6-servicing.23217.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.6-servicing.23217.6</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
+    <dotnetdevcertsPackageVersion>7.0.6-servicing.23217.6</dotnetdevcertsPackageVersion>
+    <dotnetuserjwtsPackageVersion>7.0.6-servicing.23217.6</dotnetuserjwtsPackageVersion>
+    <dotnetusersecretsPackageVersion>7.0.6-servicing.23217.6</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
@@ -70,8 +70,8 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.106</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>7.0.106-servicing.23215.4</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.106-servicing.23215.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.106-servicing.23218.7</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.106-servicing.23218.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>