From 276c71d299f6f6dcc3abfd6b3f1fb90c667b4aaa Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Mon, 30 Jan 2023 21:51:06 +0000
Subject: [PATCH] Merged PR 29268: [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.3 to 7.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (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**: 20230130.6
- **Date Produced**: January 30, 2023 9:03:42 PM UTC
- **Commit**: ced1028bbbf0ce31e736e0e9d137a1b690fbb50d
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.103 to 7.0.103][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.103-servicing.23075.10 to 7.0.103-servicing.23080.6][1]
  - **Microsoft.NET.Sdk**: [from 7.0.103-servicing.23075.10 to 7.0.103-servicing.23080.6][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.103-servicing.23075.10 to 7.0.103-servicing.23080.6][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.3 to 7.0.3][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2]
  - **dotnet-dev-certs**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2]
  - **dotnet-user-jwts**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2]
  - **dotnet-user-secrets**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2]

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

diff --git a/NuGet.config b/NuGet.config
index 4eb5d7654..ad090420b 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,11 +7,11 @@
     <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-3102273" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3102273b/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-3102273-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3102273b-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-febee99" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-febee99d/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-67006e8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-67006e8f/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-67006e8-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-67006e8f-2/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-emsdk-67006e8-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-67006e8f-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
@@ -21,10 +21,11 @@
     <add key="darc-int-dotnet-runtime-0a2bda1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a2bda10/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-72e0c34" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-72e0c344/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-ced1028" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-ced1028b/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0e61925" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0e619254/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0e61925-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0e619254-2/nuget/v3/index.json" />
     <add key="darc-int-dotnet-windowsdesktop-0e61925-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0e619254-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.-->
@@ -47,16 +48,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-3102273-1" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-3102273" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-febee99" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-0a2bda1" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-72e0c34" value="true" />
+    <add key="darc-int-dotnet-sdk-ced1028" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0e61925-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-0e61925-2" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-0e61925" 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 4c41aa2fa..9aa70ccdb 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.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3102273b1819997a17c88dac78e89ac59052cdc2</Sha>
+      <Sha>febee99db845fd8766a13bdb391a07c3ee90b4ba</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.3-servicing.23074.4" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.3-servicing.23080.9" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3102273b1819997a17c88dac78e89ac59052cdc2</Sha>
+      <Sha>febee99db845fd8766a13bdb391a07c3ee90b4ba</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3102273b1819997a17c88dac78e89ac59052cdc2</Sha>
+      <Sha>febee99db845fd8766a13bdb391a07c3ee90b4ba</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.3-servicing.23074.4" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.3-servicing.23080.9" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3102273b1819997a17c88dac78e89ac59052cdc2</Sha>
+      <Sha>febee99db845fd8766a13bdb391a07c3ee90b4ba</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="7.0.3-servicing.23074.4" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="7.0.3-servicing.23080.9" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3102273b1819997a17c88dac78e89ac59052cdc2</Sha>
+      <Sha>febee99db845fd8766a13bdb391a07c3ee90b4ba</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="7.0.3-servicing.23074.4" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-jwts" Version="7.0.3-servicing.23080.9" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3102273b1819997a17c88dac78e89ac59052cdc2</Sha>
+      <Sha>febee99db845fd8766a13bdb391a07c3ee90b4ba</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="7.0.3-servicing.23074.4" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="7.0.3-servicing.23080.9" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3102273b1819997a17c88dac78e89ac59052cdc2</Sha>
+      <Sha>febee99db845fd8766a13bdb391a07c3ee90b4ba</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.103">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>72e0c344fc8beab0f0e558b58b212193f66b86fe</Sha>
+      <Sha>ced1028bbbf0ce31e736e0e9d137a1b690fbb50d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.103-servicing.23075.10">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.103-servicing.23080.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>72e0c344fc8beab0f0e558b58b212193f66b86fe</Sha>
+      <Sha>ced1028bbbf0ce31e736e0e9d137a1b690fbb50d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.103-servicing.23075.10">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.103-servicing.23080.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>72e0c344fc8beab0f0e558b58b212193f66b86fe</Sha>
+      <Sha>ced1028bbbf0ce31e736e0e9d137a1b690fbb50d</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.103-servicing.23075.10">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.103-servicing.23080.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>72e0c344fc8beab0f0e558b58b212193f66b86fe</Sha>
+      <Sha>ced1028bbbf0ce31e736e0e9d137a1b690fbb50d</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.3-servicing.23072.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 21da345bd..f7874947f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -52,11 +52,11 @@
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.3</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>7.0.3</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.3-servicing.23074.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.3-servicing.23074.4</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
-    <dotnetdevcertsPackageVersion>7.0.3-servicing.23074.4</dotnetdevcertsPackageVersion>
-    <dotnetuserjwtsPackageVersion>7.0.3-servicing.23074.4</dotnetuserjwtsPackageVersion>
-    <dotnetusersecretsPackageVersion>7.0.3-servicing.23074.4</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.3-servicing.23080.9</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.3-servicing.23080.9</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
+    <dotnetdevcertsPackageVersion>7.0.3-servicing.23080.9</dotnetdevcertsPackageVersion>
+    <dotnetuserjwtsPackageVersion>7.0.3-servicing.23080.9</dotnetuserjwtsPackageVersion>
+    <dotnetusersecretsPackageVersion>7.0.3-servicing.23080.9</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
@@ -64,8 +64,8 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.103</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>7.0.103-servicing.23075.10</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.103-servicing.23075.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.103-servicing.23080.6</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.103-servicing.23080.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>