From db7cc87d512335808e3806067f2bf9b31379e1db Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Thu, 1 Apr 2021 22:02:02 +0000
Subject: [PATCH] Merged PR 13895: [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**:
  - **Microsoft.NET.Test.Sdk**: from 16.9.1-release-20210308-01 to 16.9.4 (parent: Microsoft.NET.Sdk)
  - **NuGet.Build.Tasks**: from 5.9.1-rc.1 to 5.9.1-rc.8 (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**: 20210401.17
- **Date Produced**: 4/1/2021 9:22 PM
- **Commit**: 51369266643769f9f0c1184e89715cd1045126d0
- **Branch**: refs/heads/internal/release/5.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.202-servicing.21172.7 to 5.0.202-servicing.21201.17][1]
  - **Microsoft.NET.Sdk**: [from 5.0.202-servicing.21172.7 to 5.0.202-servicing.21201.17][1]
  - **Microsoft.NET.Test.Sdk**: [from 16.9.1-release-20210308-01 to 16.9.4][2]
  - **NuGet.Build.Tasks**: [from 5.9.1-rc.1 to 5.9.1-rc.8][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC461a94d&targetVersion=GC5136926&_a=files
[2]: https://github.com/microsoft/vstest/compare/6a858a3...99b911a
[3]: https://github.com/nuget/nuget.client/compare/fad4343...d525b0e

[DependencyUpdate]: <> (End)

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

diff --git a/NuGet.config b/NuGet.config
index 53f355d24..8b3db04dc 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,17 +10,26 @@
     <add key="darc-int-dotnet-aspnetcore-b7a2ec8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-b7a2ec8c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-pub-dotnet-efcore-5420351-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-54203510-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-efcore-5420351-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-54203510-3/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-efcore-5420351" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-54203510/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-2f740ad-3" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-3/nuget/v3/index.json" />
     <add key="darc-int-dotnet-runtime-2f740ad" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc/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-8470ff3-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-8470ff3-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-1/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-8470ff3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-951b1ad-4" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-951b1ad8-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-951b1ad-3" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-951b1ad8-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-951b1ad-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-951b1ad8-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-951b1ad-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-951b1ad8-1/nuget/v3/index.json" />
     <add key="darc-int-dotnet-windowsdesktop-951b1ad" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-951b1ad8/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -42,9 +51,14 @@
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-2f740ad" value="true" />
+    <add key="darc-int-dotnet-runtime-2f740ad-3" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-951b1ad" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-951b1ad-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-951b1ad-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-951b1ad-3" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-951b1ad-4" 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 bdb03e260..b1bd24113 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -91,13 +91,13 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>8470ff317250d761c72f920b8ea1c0700b230eb3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.202-servicing.21172.7">
+    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.202-servicing.21201.17">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>461a94d08054f1b683ef2855c18acf9de0e1175c</Sha>
+      <Sha>51369266643769f9f0c1184e89715cd1045126d0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.202-servicing.21172.7">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.202-servicing.21201.17">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>461a94d08054f1b683ef2855c18acf9de0e1175c</Sha>
+      <Sha>51369266643769f9f0c1184e89715cd1045126d0</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.5-servicing.21167.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -112,9 +112,9 @@
       <Uri>https://github.com/dotnet/fsharp</Uri>
       <Sha>7ce7132f1459095e635194d09d6f73265352029a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.1-release-20210308-01" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>6a858a323caa439115e9e3cf1c958b04f4ff9993</Sha>
+      <Sha>99b911a57a02fc5d2eeef23e9ab8cbea4505678b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21161.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/mono/linker</Uri>
@@ -129,9 +129,9 @@
       <Uri>https://github.com/dotnet/msbuild</Uri>
       <Sha>5e4b48a27efce55a613664b58d353ab4c8d1f6c1</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="5.9.1-rc.1" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
-      <Sha>fad4343fa8ba919bb8a1b86bb22310824bf14268</Sha>
+    <Dependency Name="NuGet.Build.Tasks" Version="5.9.1-rc.8" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>d525b0e670f3b6cbd5c73a35f04730a9f658c852</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index f6952f2ca..76ed00f75 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -55,8 +55,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>5.0.202-servicing.21172.7</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.202-servicing.21172.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>5.0.202-servicing.21201.17</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.202-servicing.21201.17</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -127,7 +127,7 @@
   <PropertyGroup>
     <VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
     <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
-    <MicrosoftNETTestSdkVersion>16.9.1-release-20210308-01</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>16.9.4</MicrosoftNETTestSdkVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->