From 383637d63f76578633966bfa99d6ae38820e8dbd Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Fri, 23 Apr 2021 22:29:51 +0000
Subject: [PATCH] Merged PR 14475: [internal/release/5.0.2xx] 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**:
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.EntityFrameworkCore**: from 5.0.5 to 5.0.6 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - **dotnet-dev-certs**: from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a
- **Build**: 20210423.17
- **Date Produced**: 4/23/2021 9:02 PM
- **Commit**: 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9
- **Branch**: refs/heads/internal/release/5.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.203-servicing.21222.11 to 5.0.203-servicing.21223.17][1]
  - **Microsoft.NET.Sdk**: [from 5.0.203-servicing.21222.11 to 5.0.203-servicing.21223.17][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: [from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 5.0.6 to 5.0.6][2]
  - **Microsoft.EntityFrameworkCore**: [from 5.0.5 to 5.0.6][3]
  - **dotnet-dev-certs**: [from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5][2]
  - **dotnet-user-secrets**: [from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb802590&targetVersion=GC7cebab8&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCf3eeec8&targetVersion=GCdc5e11a&_a=files
[3]: https://github.com/dotnet/efcore/compare/5420351...42e8143

[DependencyUpdate]: <> (End)

[marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a)
---
 NuGet.config            | 18 ++++++++++++++++--
 eng/Version.Details.xml | 26 +++++++++++++-------------
 eng/Versions.props      | 10 +++++-----
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 61f217cfa..be7ee6a60 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,22 +7,29 @@
     <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-f3eeec8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-f3eeec88/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-dc5e11a" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-dc5e11ab/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-42e8143" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-42e81439/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-478b2f8-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-478b2f8-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c-1/nuget/v3/index.json" />
     <add key="darc-int-dotnet-runtime-478b2f8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-msbuild -->
     <!--  End: Package sources from dotnet-msbuild -->
     <!--  Begin: Package sources from dotnet-templating -->
+    <add key="darc-pub-dotnet-templating-50e1aa0-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-50e1aa01-5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-50e1aa0-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-50e1aa01-4/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-50e1aa0-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-50e1aa01-3/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-50e1aa0-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-50e1aa01-2/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-50e1aa0-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-50e1aa01-1/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-50e1aa0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-50e1aa01/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-297185f-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-297185fc-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-297185f-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-297185fc-1/nuget/v3/index.json" />
     <add key="darc-int-dotnet-windowsdesktop-297185f" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-297185fc/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -40,13 +47,20 @@
     <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-f3eeec8" value="true" />
+    <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-42e8143" value="true" />
+    <!--  End: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-aspnetcore-dc5e11a" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-478b2f8" value="true" />
+    <add key="darc-int-dotnet-runtime-478b2f8-1" value="true" />
+    <add key="darc-int-dotnet-runtime-478b2f8-2" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-297185f" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-297185f-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-297185f-2" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- Added by darc above. due to dependencies on 3.0.0 and 2.1.0 packs, but we can get those from nuget.org -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8a03e4e8e..cc8272844 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -61,23 +61,23 @@
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>f3eeec88e64270e9e783d713fea8503f28b1a932</Sha>
+      <Sha>dc5e11abdb05b322f4b74b3afbcfb352fe984b2e</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0" Version="5.0.6-servicing.21221.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0" Version="5.0.6-servicing.21223.5" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>f3eeec88e64270e9e783d713fea8503f28b1a932</Sha>
+      <Sha>dc5e11abdb05b322f4b74b3afbcfb352fe984b2e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>54203510db732a088a3e7e58d49b98ada7c14227</Sha>
+      <Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="5.0.6-servicing.21221.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="5.0.6-servicing.21223.5" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>f3eeec88e64270e9e783d713fea8503f28b1a932</Sha>
+      <Sha>dc5e11abdb05b322f4b74b3afbcfb352fe984b2e</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="5.0.6-servicing.21221.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="5.0.6-servicing.21223.5" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>f3eeec88e64270e9e783d713fea8503f28b1a932</Sha>
+      <Sha>dc5e11abdb05b322f4b74b3afbcfb352fe984b2e</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.20420.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
@@ -91,13 +91,13 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>50e1aa014b0b35cb9aa2c5157d054ee654949dff</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.203-servicing.21222.11">
+    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.203-servicing.21223.17">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>b8025906f7463b6e477893c81238dc7003b353a3</Sha>
+      <Sha>7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.203-servicing.21222.11">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.203-servicing.21223.17">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>b8025906f7463b6e477893c81238dc7003b353a3</Sha>
+      <Sha>7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9</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="5.0.6-servicing.21221.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 1ec3a417b..65a57890f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,17 +46,17 @@
     <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>5.0.0</MicrosoftAspNetCoreAppRefPackageVersion>
     <MicrosoftAspNetCoreAppRefInternalPackageVersion>5.0.0-rtm.20526.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>5.0.6-servicing.21221.2</VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>
-    <dotnetdevcertsPackageVersion>5.0.6-servicing.21221.2</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>5.0.6-servicing.21221.2</dotnetusersecretsPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>5.0.6-servicing.21223.5</VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>
+    <dotnetdevcertsPackageVersion>5.0.6-servicing.21223.5</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>5.0.6-servicing.21223.5</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>5.0.203-servicing.21222.11</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.203-servicing.21222.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>5.0.203-servicing.21223.17</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.203-servicing.21223.17</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>