From 4513d7c026644d9a432d135a9da0f49e09418af3 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Wed, 18 Dec 2019 00:41:20 +0000
Subject: [PATCH 1/4] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-toolset build 20191217.9

- Microsoft.Dotnet.Toolset.Internal - 3.1.101-servicing.19617.9

Dependency coherency updates

- Microsoft.NET.Sdk - 3.1.101-servicing.19617.12 (parent: Microsoft.Dotnet.Toolset.Internal)
---
 NuGet.config            |  4 +---
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index ce5c64f79..2e6b22e5c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -11,13 +11,11 @@
     <add key="darc-pub-dotnet-core-setup-7d57652" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-7d57652f/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-core-setup-65f04fb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-65f04fb6/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
-    <add key="darc-pub-aspnet-AspNetCore-7db6969" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-7db69699/nuget/v3/index.json" />
+    <add key="darc-pub-aspnet-AspNetCore-2b7e994" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-2b7e994b/nuget/v3/index.json" />
     <add key="darc-int-dotnet-core-setup-a1388f1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a1388f19/nuget/v3/index.json" />
     <add key="darc-int-aspnet-AspNetCore-e276c81" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-AspNetCore-e276c817/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- 3.0.2 runtme pack/apphost packs are needed for tests, and not on nuget.org yet or other feeds below. Darc cannot see that due to nonstandard way these are pulled in to a non-3.0 branch -->
-    <add key="darc-int-dotnet-core-setup-a2c3406" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a2c3406f/nuget/v3/index.json" />
-    <add key="darc-int-aspnet-AspNetCore-561deb0" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-AspNetCore-561deb05/nuget/v3/index.json" />
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8ae7b2a0f..bcbb9759c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,13 +73,13 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>13abe7e2749d95337e8d72efdc5b71611815fd43</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19616.8">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19617.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>b531fe7a7601f9a0b933b999c810b73cd1aab481</Sha>
+      <Sha>da12161d1d2c37d23639fa054852813615b10e07</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.100-rtm.19568.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
-      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>49bbede419cf63e15c70f4b463f80e4811fe3f34</Sha>
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.101-servicing.19617.12" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
+      <Sha>9b38eb3b6cbbc9c82270dbd4e20286007a52a165</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.101-servicing.19616.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-cli</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 5283969aa..23f5ee319 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19616.8</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19617.9</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
@@ -52,7 +52,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
-    <MicrosoftNETSdkPackageVersion>3.1.100-rtm.19568.4</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>3.1.101-servicing.19617.12</MicrosoftNETSdkPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>

From 57f46608fc6a7bc92c92ae00c825e452715b397e Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Tue, 17 Dec 2019 17:37:36 -0800
Subject: [PATCH 2/4] Add back missing package feeds

---
 NuGet.config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NuGet.config b/NuGet.config
index 2e6b22e5c..5e8fc206d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -16,6 +16,8 @@
     <add key="darc-int-aspnet-AspNetCore-e276c81" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-AspNetCore-e276c817/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- 3.0.2 runtme pack/apphost packs are needed for tests, and not on nuget.org yet or other feeds below. Darc cannot see that due to nonstandard way these are pulled in to a non-3.0 branch -->
+    <add key="darc-int-dotnet-core-setup-a2c3406" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a2c3406f/nuget/v3/index.json" />
+    <add key="darc-int-aspnet-AspNetCore-561deb0" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-AspNetCore-561deb05/nuget/v3/index.json" />
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />

From 01ae0b08721e18fb958541dcbc1d4e73c1d02832 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Wed, 18 Dec 2019 02:21:07 +0000
Subject: [PATCH 3/4] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-toolset build 20191217.13

- Microsoft.Dotnet.Toolset.Internal - 3.1.101-servicing.19617.13

Dependency coherency updates

- Microsoft.NET.Sdk - 3.1.101-servicing.19617.12 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.101-servicing.19617.2 (parent: Microsoft.Dotnet.Toolset.Internal)
---
 NuGet.config            | 2 --
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 5e8fc206d..2e6b22e5c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -16,8 +16,6 @@
     <add key="darc-int-aspnet-AspNetCore-e276c81" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-AspNetCore-e276c817/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- 3.0.2 runtme pack/apphost packs are needed for tests, and not on nuget.org yet or other feeds below. Darc cannot see that due to nonstandard way these are pulled in to a non-3.0 branch -->
-    <add key="darc-int-dotnet-core-setup-a2c3406" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a2c3406f/nuget/v3/index.json" />
-    <add key="darc-int-aspnet-AspNetCore-561deb0" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-AspNetCore-561deb05/nuget/v3/index.json" />
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bcbb9759c..095d67098 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,17 +73,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>13abe7e2749d95337e8d72efdc5b71611815fd43</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19617.9">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19617.13">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>da12161d1d2c37d23639fa054852813615b10e07</Sha>
+      <Sha>411fe514b956a39d6080575cf35d2d64054a7ec0</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.101-servicing.19617.12" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
       <Sha>9b38eb3b6cbbc9c82270dbd4e20286007a52a165</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.101-servicing.19616.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.101-servicing.19617.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-cli</Uri>
-      <Sha>2b25bd5b14de69a227490ed0e44b4475672d3ebe</Sha>
+      <Sha>91705c83e44dd9221c3071e1bb7a87ba2f47688c</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-servicing.19605.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 23f5ee319..886382ecc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19617.9</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19617.13</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
@@ -45,7 +45,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/cli -->
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.101-servicing.19616.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.101-servicing.19617.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>

From 96c254b7dc0bdad148796f10f21845ec0b9adedc Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Tue, 17 Dec 2019 19:16:46 -0800
Subject: [PATCH 4/4] Add back missing package feeds

---
 NuGet.config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NuGet.config b/NuGet.config
index 2e6b22e5c..5e8fc206d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -16,6 +16,8 @@
     <add key="darc-int-aspnet-AspNetCore-e276c81" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-AspNetCore-e276c817/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- 3.0.2 runtme pack/apphost packs are needed for tests, and not on nuget.org yet or other feeds below. Darc cannot see that due to nonstandard way these are pulled in to a non-3.0 branch -->
+    <add key="darc-int-dotnet-core-setup-a2c3406" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a2c3406f/nuget/v3/index.json" />
+    <add key="darc-int-aspnet-AspNetCore-561deb0" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-AspNetCore-561deb05/nuget/v3/index.json" />
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />