From cf0766186737496f2856770a4505c02d43884e9c Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Tue, 10 Dec 2019 17:16:42 +0000
Subject: [PATCH 01/25] Merge pull request 4761 from
 darc-internal/release/3.1.1xx-a3f652c4-54ef-4301-a394-b9bccc5859ac into
 internal/release/3.1.1xx

---
 NuGet.config            |  1 +
 eng/Version.Details.xml | 40 ++++++++++++++++++++--------------------
 eng/Versions.props      | 14 +++++++-------
 eng/build.yml           | 16 ++++++++++++++++
 4 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index f46283b09..c102e2c28 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -13,6 +13,7 @@
     <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-int-dotnet-core-setup-a1388f1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a1388f19/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- 3.0.1 assets are needed 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="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 47ff385a7..41a61576f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.1-servicing.19576.9">
-      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
+      <Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.1-servicing.19576.9">
-      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.1-servicing.19608.4">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
+      <Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.1-servicing.19576.9">
-      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
+      <Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.1-servicing.19576.9">
-      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
+      <Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.1-servicing.19576.9">
-      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
+      <Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
     </Dependency>
     <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
     <!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@@ -86,13 +86,13 @@
       <Sha>cc6bdda9777fff833fe170e3006470e9409521cf</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.19576.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-servicing.19605.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/winforms</Uri>
-      <Sha>2204c3f17bea70ee01be3b450f6b84158a80c154</Sha>
+      <Sha>9483a88b7764a74d71cbd449de6c56c1d5e0af21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-rtm.19576.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
-      <Uri>https://github.com/dotnet/wpf</Uri>
-      <Sha>c8a08a25cbde21c5d45048a8719b1c64216402f7</Sha>
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-rtm.19605.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
+      <Sha>a8e48616c8d8e56469a456eb1ee263268316b827</Sha>
     </Dependency>
     <!-- This is so that WCF packages are included in the final drop for official releases. -->
     <!-- Replace with better solution, see https://github.com/dotnet/arcade/issues/4162 -->
diff --git a/eng/Versions.props b/eng/Versions.props
index cd7f9eed3..1bb18e2a1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -16,11 +16,11 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-servicing.19576.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-servicing.19605.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-rtm.19576.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-rtm.19605.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/templating -->
@@ -61,12 +61,12 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <MicrosoftNETCoreAppInternalPackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppInternalPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>3.1.1-servicing.19608.4</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
     <MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
   </PropertyGroup>
diff --git a/eng/build.yml b/eng/build.yml
index 750111576..82a75e27a 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -73,6 +73,14 @@ phases:
     - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
       - script: 'eng\setbuildinfo.bat $(_BuildArchitecture) $(_BuildConfig)'
         displayName: Set test info (Windows)
+      - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+        - task: PowerShell@2
+          displayName: Setup Private Feeds Credentials
+          inputs:
+            filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+            arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+          env:
+            Token: $(dn-bot-dnceng-artifact-feeds-rw)
       - script: build.cmd
                   $(TestParameter)
                   -pack -publish -ci
@@ -90,6 +98,14 @@ phases:
     - ${{ if ne(parameters.agentOs, 'Windows_NT') }}:
       - script: 'eng/setbuildinfo.sh $(_BuildArchitecture) $(_BuildConfig)'
         displayName: Set test info (Non-Windows)
+      - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+        - task: Bash@3
+          displayName: Setup Private Feeds Credentials
+          inputs:
+            filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+            arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+          env:
+            Token: $(dn-bot-dnceng-artifact-feeds-rw)
     - ${{ if eq(parameters.agentOs, 'Linux') }}:
       - script: ./build.sh
                   $(TestParameter)

From 411c47bd5f048c7f5cb53e020228b7d3f52bc555 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Wed, 11 Dec 2019 00:48:20 +0000
Subject: [PATCH 02/25] Merge pull request 4750 from
 darc-internal/release/3.1.1xx-e5e11180-1618-4315-a523-b7934fb434c1 into
 internal/release/3.1.1xx

---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index c102e2c28..0970ac229 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,7 +8,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <add key="darc-pub-dotnet-wcf-eb417fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-wcf-eb417fde/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-53a17fc-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-53a17fce-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-b275b18" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b275b18f/nuget/v3/index.json" />
     <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" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 41a61576f..95268e76b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -71,19 +71,19 @@
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>53a17fce7ce81aa68ddaa7b04f371dc6391d3497</Sha>
+      <Sha>b275b18fd7014d67078e2477f693301ea04e6549</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.100-rtm.19570.7">
-      <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>3adc2b99c60be57c5f85121986f2cb31aa09d8c7</Sha>
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19610.27">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
+      <Sha>27746b520df2eb1b4634a3ae0dfb7024e06eb19b</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>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.100-rtm.19568.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.101-servicing.19572.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>cc6bdda9777fff833fe170e3006470e9409521cf</Sha>
+      <Sha>0e5712bd568bb17296171cf7f6bc31ecf414b0c0</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 1bb18e2a1..cbfbffa88 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.100-rtm.19570.7</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19610.27</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.100-rtm.19568.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.101-servicing.19572.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>

From 54a64c3bc80a2afceb8297de13979df1d58b87a4 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Wed, 11 Dec 2019 04:35:29 +0000
Subject: [PATCH 03/25] Merge pull request 4782 from
 darc-internal/release/3.1.1xx-5cf01c17-9442-47c8-9136-294940530ab7 into
 internal/release/3.1.1xx

---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 95268e76b..16d2ccec4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>b275b18fd7014d67078e2477f693301ea04e6549</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19610.27">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19610.32">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>27746b520df2eb1b4634a3ae0dfb7024e06eb19b</Sha>
+      <Sha>9f7b70198f0a6e97ef3ace071f2456ad9da095b6</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>
diff --git a/eng/Versions.props b/eng/Versions.props
index cbfbffa88..ec402d947 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19610.27</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19610.32</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From 6a0324c2c82e50b54066f9c6fecab21c53807c30 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Wed, 11 Dec 2019 19:20:03 +0000
Subject: [PATCH 04/25] Merge pull request 4785 from
 darc-internal/release/3.1.1xx-d9679d2c-f078-48b8-aed5-c76cc86fd8e8 into
 internal/release/3.1.1xx

---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 16d2ccec4..541198ac7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>b275b18fd7014d67078e2477f693301ea04e6549</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19610.32">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19611.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>9f7b70198f0a6e97ef3ace071f2456ad9da095b6</Sha>
+      <Sha>ca1bbd5403829dc211ac6929e6c79617a70cb9c0</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>
diff --git a/eng/Versions.props b/eng/Versions.props
index ec402d947..82ad29375 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19610.32</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19611.6</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From 26018a4589c49c4d04e99c84566fa776f389a0a7 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Wed, 11 Dec 2019 20:15:33 +0000
Subject: [PATCH 05/25] Merge pull request 4798 from
 darc-internal/release/3.1.1xx-f874e28c-b396-4bf2-ba05-af8b75876cf0 into
 internal/release/3.1.1xx

---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 541198ac7..69fefc678 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>b275b18fd7014d67078e2477f693301ea04e6549</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19611.6">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19611.13">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>ca1bbd5403829dc211ac6929e6c79617a70cb9c0</Sha>
+      <Sha>4b3ff9abc5fceccd1ec8d806a083fb18518fde9f</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>
diff --git a/eng/Versions.props b/eng/Versions.props
index 82ad29375..7150a8ada 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19611.6</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19611.13</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From b7f25e1691293ddb0a9d7ec577421c5c80fe19e5 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Wed, 11 Dec 2019 21:41:22 +0000
Subject: [PATCH 06/25] Merge pull request 4809 from
 darc-internal/release/3.1.1xx-f10b1362-5e72-458f-84c0-4e5f3c0bea3c into
 internal/release/3.1.1xx

---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 69fefc678..2bcdfd152 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>b275b18fd7014d67078e2477f693301ea04e6549</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19611.13">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19611.20">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>4b3ff9abc5fceccd1ec8d806a083fb18518fde9f</Sha>
+      <Sha>983c553c92b5b1888f0ebe321215b62d6c0f6af8</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>
diff --git a/eng/Versions.props b/eng/Versions.props
index 7150a8ada..97885dcba 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19611.13</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19611.20</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From 8fa39f08fa748a7d2cb3e2dd3ae70e879e09aa7d Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Thu, 12 Dec 2019 17:28:35 +0000
Subject: [PATCH 07/25] Merge pull request 4815 from
 darc-internal/release/3.1.1xx-8a68546c-0c46-4572-924b-fcb2aea16ba4 into
 internal/release/3.1.1xx

---
 NuGet.config            |  1 -
 eng/Version.Details.xml | 14 +++++++-------
 eng/Versions.props      |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 0970ac229..e172ad077 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,7 +8,6 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <add key="darc-pub-dotnet-wcf-eb417fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-wcf-eb417fde/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-b275b18" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b275b18f/nuget/v3/index.json" />
     <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" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2bcdfd152..3523c189b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -69,21 +69,21 @@
       <Uri>https://github.com/dotnet/test-templates</Uri>
       <Sha>5117d3d9d7dfd3583f0c42a639efaf092f957b7b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.1-servicing.19605.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>b275b18fd7014d67078e2477f693301ea04e6549</Sha>
+      <Sha>13abe7e2749d95337e8d72efdc5b71611815fd43</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19611.20">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19611.30">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>983c553c92b5b1888f0ebe321215b62d6c0f6af8</Sha>
+      <Sha>1cb2a6b0555546fafb826dd9a460ae745aebbdf7</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>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.101-servicing.19572.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
-      <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>0e5712bd568bb17296171cf7f6bc31ecf414b0c0</Sha>
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.101-servicing.19611.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-cli</Uri>
+      <Sha>5280f052b738e730d5f532a607f7a0927f0e17c2</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 97885dcba..70c89e948 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19611.20</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19611.30</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
@@ -24,7 +24,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/templating -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>3.1.0</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>3.1.1-servicing.19605.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -45,7 +45,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/cli -->
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.101-servicing.19572.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.101-servicing.19611.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>

From ebf5aa9febac4400ea6c1a6bae306ec74e53e419 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Fri, 13 Dec 2019 01:20:28 +0000
Subject: [PATCH 08/25] Merge pull request 4855 from
 darc-internal/release/3.1.1xx-e2001068-286f-4cc1-900d-0cb32526337e into
 internal/release/3.1.1xx

---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3523c189b..b36636b4c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>13abe7e2749d95337e8d72efdc5b71611815fd43</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19611.30">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19612.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>1cb2a6b0555546fafb826dd9a460ae745aebbdf7</Sha>
+      <Sha>30423cac34cfde2a76fb79c272fdab3af2da7771</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>
diff --git a/eng/Versions.props b/eng/Versions.props
index 70c89e948..5f4b1afaa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19611.30</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19612.11</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From c3256e9afcc515be8ba8810e81cf2e0b19dba3ac Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Fri, 13 Dec 2019 18:05:30 +0000
Subject: [PATCH 09/25] Merge pull request 4864 from
 darc-internal/release/3.1.1xx-24157826-ad02-4b74-b758-67ab1c60fd7c into
 internal/release/3.1.1xx

---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b36636b4c..e49ec7091 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>13abe7e2749d95337e8d72efdc5b71611815fd43</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19612.11">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19613.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>30423cac34cfde2a76fb79c272fdab3af2da7771</Sha>
+      <Sha>c1cfe7d31a69104973078736db3aea749950535e</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>
diff --git a/eng/Versions.props b/eng/Versions.props
index 5f4b1afaa..d8490ec0e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19612.11</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19613.6</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From 22908d4dbab8e115ee79e4cd59ee581f39f91352 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Sat, 14 Dec 2019 21:43:15 +0000
Subject: [PATCH 10/25] Merge pull request 4881 from
 darc-internal/release/3.1.1xx-2d45ab9b-9467-462d-9a40-23e1232b68ad into
 internal/release/3.1.1xx

---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e49ec7091..c31cb284e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>13abe7e2749d95337e8d72efdc5b71611815fd43</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19613.6">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19614.8">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>c1cfe7d31a69104973078736db3aea749950535e</Sha>
+      <Sha>8b2b3edde80fd305b05854638176ae16a158217e</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>
diff --git a/eng/Versions.props b/eng/Versions.props
index d8490ec0e..7cad2c8c4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19613.6</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19614.8</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From 8024fb99eb67badfb57eb81ef6fb4718452ca499 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Mon, 16 Dec 2019 05:24:38 +0000
Subject: [PATCH 11/25] Merge pull request 4901 from
 darc-internal/release/3.1.1xx-fd7543bd-f655-4095-b64e-13fca15ea1a4 into
 internal/release/3.1.1xx

---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c31cb284e..4cbb512fa 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.19614.8">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19614.13">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>8b2b3edde80fd305b05854638176ae16a158217e</Sha>
+      <Sha>6c3b3f32b1296e34ccf8ad3c70938627e7988a38</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>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.101-servicing.19611.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.101-servicing.19614.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-cli</Uri>
-      <Sha>5280f052b738e730d5f532a607f7a0927f0e17c2</Sha>
+      <Sha>3e8fe138f9d0de881c63c156542c83449dd6810d</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 7cad2c8c4..8d82e7c67 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19614.8</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19614.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.19611.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.101-servicing.19614.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>

From c3d285a8d6100a1d12e01c4a293ec2d0214526be Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Mon, 16 Dec 2019 17:07:19 +0000
Subject: [PATCH 12/25] Merge pull request 4919 from
 darc-internal/release/3.1.1xx-eb2bb7a6-212a-41e7-a387-723bfa6646e0 into
 internal/release/3.1.1xx

---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4cbb512fa..84d51036b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>13abe7e2749d95337e8d72efdc5b71611815fd43</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19614.13">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19616.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>6c3b3f32b1296e34ccf8ad3c70938627e7988a38</Sha>
+      <Sha>024daf9040f1e2eeafb8f6d2f2481a3f1a30b3c6</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>
diff --git a/eng/Versions.props b/eng/Versions.props
index 8d82e7c67..8a1fc7b43 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19614.13</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19616.2</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From 6c6057a558bb8afbec196b41eb6990c8e70edc44 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Mon, 16 Dec 2019 21:25:31 +0000
Subject: [PATCH 13/25] Merge pull request 4933 from
 darc-internal/release/3.1.1xx-e48d237c-3135-44bc-81bc-3d9071bd4925 into
 internal/release/3.1.1xx

---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 84d51036b..e31722294 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.19616.2">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19616.8">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
-      <Sha>024daf9040f1e2eeafb8f6d2f2481a3f1a30b3c6</Sha>
+      <Sha>b531fe7a7601f9a0b933b999c810b73cd1aab481</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>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.101-servicing.19614.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <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>
-      <Sha>3e8fe138f9d0de881c63c156542c83449dd6810d</Sha>
+      <Sha>2b25bd5b14de69a227490ed0e44b4475672d3ebe</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 8a1fc7b43..32afbf88f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19616.2</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19616.8</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.19614.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.101-servicing.19616.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>

From 784091d577b6653e0177954ae5d830e51e50513e Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Mon, 16 Dec 2019 13:48:14 -0800
Subject: [PATCH 14/25] Bump 2.1.x implicit versions

Disable SDK tests that do 2.1.x self-contained

Delete GivenSelfContainedAppsRollForward. It doesn't work with 3.x+ already and won't work with 2.x MSRCs.
---
 .../targets/GenerateBundledVersions.targets   |   6 +-
 .../GivenSelfContainedAppsRollForward.cs      | 195 ------------------
 test/SdkTests/TestConfig.xml                  |  10 +
 3 files changed, 13 insertions(+), 198 deletions(-)
 delete mode 100644 test/EndToEnd/GivenSelfContainedAppsRollForward.cs

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 56984cdcd..66af4016c 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -92,7 +92,7 @@
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.0"
-                               LatestVersion="2.1.14" />
+                               LatestVersion="2.1.15" />
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="2.2"
                                DefaultVersion="2.2.0"
@@ -100,11 +100,11 @@
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.1"
-                               LatestVersion="2.1.14"/>
+                               LatestVersion="2.1.15"/>
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.1"
-                               LatestVersion="2.1.14"/>
+                               LatestVersion="2.1.15"/>
 
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
                                TargetFrameworkVersion="2.2"
diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
deleted file mode 100644
index 9dda617fa..000000000
--- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Xml.Linq;
-using FluentAssertions;
-using Microsoft.DotNet.TestFramework;
-using Microsoft.DotNet.Tools.Test.Utilities;
-using NuGet.ProjectModel;
-using NuGet.Versioning;
-using Xunit;
-
-namespace EndToEnd
-{
-    public partial class GivenSelfContainedAppsRollForward : TestBase
-    {
-
-        [Theory]
-        //  MemberData is used instead of InlineData here so we can access it in another test to
-        //  verify that we are covering the latest release of .NET Core
-        [ClassData(typeof(SupportedNetCoreAppVersions))]
-        public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion)
-        {
-            if (minorVersion == "3.0" || minorVersion == "3.1")
-            {
-                //  https://github.com/dotnet/core-sdk/issues/621
-                return;
-            }
-            ItRollsForwardToTheLatestVersion(TestProjectCreator.NETCorePackageName, minorVersion);
-        }
-
-        [Theory]
-        [ClassData(typeof(SupportedAspNetCoreVersions))]
-        public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion)
-        {
-            if (minorVersion == "3.0" || minorVersion == "3.1")
-            {
-                //  https://github.com/dotnet/core-sdk/issues/621
-                return;
-            }
-            ItRollsForwardToTheLatestVersion(TestProjectCreator.AspNetCoreAppPackageName, minorVersion);
-        }
-
-        [Theory]
-        [ClassData(typeof(SupportedAspNetCoreAllVersions))]
-        public void ItRollsForwardToTheLatestAspNetCoreAllVersion(string minorVersion)
-        {
-            ItRollsForwardToTheLatestVersion(TestProjectCreator.AspNetCoreAllPackageName, minorVersion);
-        }
-
-        internal void ItRollsForwardToTheLatestVersion(string packageName, string minorVersion)
-        {
-            var testProjectCreator = new TestProjectCreator()
-            {
-                PackageName = packageName,
-                MinorVersion = minorVersion,
-                //  Set RuntimeIdentifier to opt in to roll-forward behavior
-                RuntimeIdentifier = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier()
-            };
-
-            var testInstance = testProjectCreator.Create();
-
-            string projectDirectory = testInstance.Root.FullName;
-
-            //  Get the version rolled forward to
-            new RestoreCommand()
-                    .WithWorkingDirectory(projectDirectory)
-                    .Execute()
-                    .Should().Pass();
-
-            string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json");
-            var assetsFile = new LockFileFormat().Read(assetsFilePath);
-
-            var rolledForwardVersion = GetPackageVersion(assetsFile, packageName);
-            rolledForwardVersion.Should().NotBeNull();
-
-            if (rolledForwardVersion.IsPrerelease)
-            {
-                //  If this version of .NET Core is still prerelease, then:
-                //  - Floating the patch by adding ".*" to the major.minor version won't work, but
-                //  - There aren't any patches to roll-forward to, so we skip testing this until the version
-                //    leaves prerelease.
-                return;
-            }
-
-            testProjectCreator.Identifier = "floating";
-
-            var floatingProjectInstance = testProjectCreator.Create();
-
-            var floatingProjectPath = Path.Combine(floatingProjectInstance.Root.FullName, "TestAppSimple.csproj");
-
-            var floatingProject = XDocument.Load(floatingProjectPath);
-            var ns = floatingProject.Root.Name.Namespace;
-
-
-            if (packageName == TestProjectCreator.NETCorePackageName)
-            {
-                //  Float the RuntimeFrameworkVersion to get the latest version of the runtime available from feeds
-                floatingProject.Root.Element(ns + "PropertyGroup")
-                    .Add(new XElement(ns + "RuntimeFrameworkVersion", $"{minorVersion}.*"));
-            }
-            else
-            {
-                floatingProject.Root.Element(ns + "ItemGroup")
-                    .Element(ns + "PackageReference")
-                    .Add(new XAttribute("Version", $"{minorVersion}.*"),
-                        new XAttribute("AllowExplicitVersion", "true"));
-            }
-
-            floatingProject.Save(floatingProjectPath);
-
-            new RestoreCommand()
-                    .WithWorkingDirectory(floatingProjectInstance.Root.FullName)
-                    .Execute()
-                    .Should().Pass();
-
-            string floatingAssetsFilePath = Path.Combine(floatingProjectInstance.Root.FullName, "obj", "project.assets.json");
-
-            var floatedAssetsFile = new LockFileFormat().Read(floatingAssetsFilePath);
-
-            var floatedVersion = GetPackageVersion(floatedAssetsFile, packageName);
-            floatedVersion.Should().NotBeNull();
-
-            rolledForwardVersion.ToNormalizedString().Should().BeEquivalentTo(floatedVersion.ToNormalizedString(),
-                $"the latest patch version for {packageName} {minorVersion} in Microsoft.NETCoreSdk.BundledVersions.props " +
-                "needs to be updated (see the ImplicitPackageVariable items in MSBuildExtensions.targets in this repo)");
-        }
-
-        private static NuGetVersion GetPackageVersion(LockFile lockFile, string packageName)
-        {
-            return lockFile?.Targets?.SingleOrDefault(t => t.RuntimeIdentifier != null)
-                ?.Libraries?.SingleOrDefault(l =>
-                    string.Compare(l.Name, packageName, StringComparison.CurrentCultureIgnoreCase) == 0)
-                ?.Version;
-        }
-
-        [Fact]
-        public void WeCoverLatestNetCoreAppRollForward()
-        {
-            //  Run "dotnet new console", get TargetFramework property, and make sure it's covered in SupportedNetCoreAppVersions
-            var directory = TestAssets.CreateTestDirectory();
-            string projectDirectory = directory.FullName;
-
-            new NewCommandShim()
-                .WithWorkingDirectory(projectDirectory)
-                .Execute("console --no-restore")
-                .Should().Pass();
-
-            string projectPath = Path.Combine(projectDirectory, Path.GetFileName(projectDirectory) + ".csproj");
-
-            var project = XDocument.Load(projectPath);
-            var ns = project.Root.Name.Namespace;
-
-            string targetFramework = project.Root.Element(ns + "PropertyGroup")
-                .Element(ns + "TargetFramework")
-                .Value;
-
-            SupportedNetCoreAppVersions.Versions.Select(v => $"netcoreapp{v}")
-                .Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)}.{nameof(SupportedNetCoreAppVersions.Versions)} property should include the default version " +
-                "of .NET Core created by \"dotnet new\"");
-        }
-
-        [Fact]
-        public void WeCoverLatestAspNetCoreAppRollForward()
-        {
-            var directory = TestAssets.CreateTestDirectory();
-            string projectDirectory = directory.FullName;
-
-            //  Run "dotnet new web", get TargetFramework property, and make sure it's covered in SupportedAspNetCoreAppVersions
-
-            new NewCommandShim()
-                .WithWorkingDirectory(projectDirectory)
-                .Execute("web --no-restore")
-                .Should().Pass();
-
-            string projectPath = Path.Combine(projectDirectory, Path.GetFileName(projectDirectory) + ".csproj");
-
-            var project = XDocument.Load(projectPath);
-            var ns = project.Root.Name.Namespace;
-
-            string targetFramework = project.Root.Element(ns + "PropertyGroup")
-                .Element(ns + "TargetFramework")
-                .Value;
-
-            SupportedAspNetCoreVersions.Versions.Select(v => $"netcoreapp{v}")
-                .Should().Contain(targetFramework, $"the {nameof(SupportedAspNetCoreVersions)} should include the default version " +
-                "of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\"");
-
-           
-        }
-
-    }
-}
diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml
index 13c5859e5..958b52b30 100644
--- a/test/SdkTests/TestConfig.xml
+++ b/test/SdkTests/TestConfig.xml
@@ -145,6 +145,16 @@
             Skip="true"
             Issue=""
             Reason="Needs .NET Core 1.1"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_from_the_output_folder"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 2.1.15"/>
+
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASelfContainedApp.It_can_make_a_Windows_GUI_exe"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 2.1.15"/>
     
   </SkippedTests>
 </Tests>

From e5837fa361a011aa8ea33dd969451bb7c7e85ed9 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Mon, 16 Dec 2019 22:08:02 +0000
Subject: [PATCH 15/25] Merge pull request 4898 from
 darc-internal/release/3.1.1xx-1a8919d3-cda2-437b-9784-4b0111084702 into
 internal/release/3.1.1xx

---
 NuGet.config                              |  1 +
 eng/Version.Details.xml                   | 32 +++++++++++------------
 eng/Versions.props                        | 10 +++----
 src/redist/targets/GenerateLayout.targets |  2 +-
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index e172ad077..dc720faec 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -13,6 +13,7 @@
     <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-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.1 assets are needed 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="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e31722294..8ae7b2a0f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,27 +43,27 @@
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.0">
       <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
+      <Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.0">
-      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
+      <Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1" Version="3.1.0-rtm.19575.14">
-      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.1-servicing.19615.10">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
+      <Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="3.1.0-rtm.19575.14">
-      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
+    <Dependency Name="dotnet-dev-certs" Version="3.1.1-servicing.19615.10">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
+      <Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="3.1.0-rtm.19575.14">
-      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
+    <Dependency Name="dotnet-user-secrets" Version="3.1.1-servicing.19615.10">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
+      <Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
     </Dependency>
-    <Dependency Name="dotnet-watch" Version="3.1.0-rtm.19575.14">
-      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
+    <Dependency Name="dotnet-watch" Version="3.1.1-servicing.19615.10">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
+      <Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.3.1" Version="1.0.2-beta4.19570.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 32afbf88f..5283969aa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,12 +36,12 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.0</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>3.1.0</MicrosoftAspNetCoreAppRefPackageVersion>
-    <VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>3.1.0-rtm.19575.14</VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>
-    <dotnetdevcertsPackageVersion>3.1.0-rtm.19575.14</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>3.1.0-rtm.19575.14</dotnetusersecretsPackageVersion>
-    <dotnetwatchPackageVersion>3.1.0-rtm.19575.14</dotnetwatchPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.1-servicing.19615.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <dotnetdevcertsPackageVersion>3.1.1-servicing.19615.10</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>3.1.1-servicing.19615.10</dotnetusersecretsPackageVersion>
+    <dotnetwatchPackageVersion>3.1.1-servicing.19615.10</dotnetwatchPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/cli -->
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 1970faf41..fc40a747a 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -11,7 +11,7 @@
 
   <PropertyGroup>
     <!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
-    <AspNetCoreBlobVersion>$(VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion)</AspNetCoreBlobVersion>
+    <AspNetCoreBlobVersion>$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)</AspNetCoreBlobVersion>
     <CoreSetupBlobVersion>$(MicrosoftNETCoreAppInternalPackageVersion)</CoreSetupBlobVersion>
 
     <!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->

From b925821a074fcca4e9c60b1f6fe262c7f3b0d762 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Mon, 16 Dec 2019 14:08:20 -0800
Subject: [PATCH 16/25] Bump to 3.0.2 for SCD; use 3.1.0 for SCD

---
 .../targets/GenerateBundledVersions.targets      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 66af4016c..a214842a0 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -14,11 +14,11 @@
       <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion>
       <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion>
 
-      <_NETCoreApp30RuntimePackVersion>3.0.1</_NETCoreApp30RuntimePackVersion>
+      <_NETCoreApp30RuntimePackVersion>3.0.2</_NETCoreApp30RuntimePackVersion>
       <_NETCoreApp30TargetingPackVersion>3.0.0</_NETCoreApp30TargetingPackVersion>
-      <_WindowsDesktop30RuntimePackVersion>3.0.1</_WindowsDesktop30RuntimePackVersion>
+      <_WindowsDesktop30RuntimePackVersion>3.0.2</_WindowsDesktop30RuntimePackVersion>
       <_WindowsDesktop30TargetingPackVersion>3.0.0</_WindowsDesktop30TargetingPackVersion>
-      <_AspNet30RuntimePackVersion>3.0.1</_AspNet30RuntimePackVersion>
+      <_AspNet30RuntimePackVersion>3.0.2</_AspNet30RuntimePackVersion>
       <_AspNet30TargetingPackVersion>3.0.1</_AspNet30TargetingPackVersion>
 
       <!-- Use only major and minor in target framework version -->
@@ -155,7 +155,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <KnownFrameworkReference Include="Microsoft.NETCore.App"
                               TargetFramework="netcoreapp3.1"
                               RuntimeFrameworkName="Microsoft.NETCore.App"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
+                              DefaultRuntimeFrameworkVersion="3.1.0"
                               LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
                               TargetingPackName="Microsoft.NETCore.App.Ref"
                               TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
@@ -174,7 +174,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
                               TargetFramework="netcoreapp3.1"
                               RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
+                              DefaultRuntimeFrameworkVersion="3.1.0"
                               LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
                               TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
                               TargetingPackVersion="$(MicrosoftWindowsDesktopAppRefPackageVersion)"
@@ -186,7 +186,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
                               TargetFramework="netcoreapp3.1"
                               RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
+                              DefaultRuntimeFrameworkVersion="3.1.0"
                               LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
                               TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
                               TargetingPackVersion="$(MicrosoftWindowsDesktopAppRefPackageVersion)"
@@ -199,7 +199,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
                               TargetFramework="netcoreapp3.1"
                               RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
+                              DefaultRuntimeFrameworkVersion="3.1.0"
                               LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
                               TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
                               TargetingPackVersion="$(MicrosoftWindowsDesktopAppRefPackageVersion)"
@@ -212,7 +212,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <KnownFrameworkReference Include="Microsoft.AspNetCore.App"
                               TargetFramework="netcoreapp3.1"
                               RuntimeFrameworkName="Microsoft.AspNetCore.App"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)"
+                              DefaultRuntimeFrameworkVersion="3.1.0"
                               LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)"
                               TargetingPackName="Microsoft.AspNetCore.App.Ref"
                               TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"

From a8cef816ede0acf37b164904ac97f4ac42b0e2cf Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Mon, 16 Dec 2019 14:47:54 -0800
Subject: [PATCH 17/25] Stabilize package versions

---
 src/redist/targets/Versions.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets
index a83319ba0..a0523482b 100644
--- a/src/redist/targets/Versions.targets
+++ b/src/redist/targets/Versions.targets
@@ -8,7 +8,7 @@
     <!--
         When DropSuffix is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
-    <DropSuffix>false</DropSuffix>
+    <DropSuffix>true</DropSuffix>
   </PropertyGroup>
   
   <Target Name="GetCoreSdkGitCommitInfo">

From 0d83942b575f88e04bc670afd4d653bca89f55eb Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Mon, 16 Dec 2019 14:51:04 -0800
Subject: [PATCH 18/25] Disable test that needs 2.1.latest on Mac OS

---
 test/SdkTests/TestConfig.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml
index 958b52b30..a1bbf00f4 100644
--- a/test/SdkTests/TestConfig.xml
+++ b/test/SdkTests/TestConfig.xml
@@ -155,6 +155,11 @@
             Skip="true"
             Issue=""
             Reason="Needs .NET Core 2.1.15"/>
+
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 2.1.15 on Mac OS"/>
     
   </SkippedTests>
 </Tests>

From 49c775957662df2452f2d46efbb67db2e75b23df Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Mon, 16 Dec 2019 15:20:00 -0800
Subject: [PATCH 19/25] Add 3.0.2 feeds

---
 NuGet.config | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/NuGet.config b/NuGet.config
index e172ad077..96bf5bc60 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -14,7 +14,9 @@
     <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-int-dotnet-core-setup-a1388f1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a1388f19/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
-    <!-- 3.0.1 assets are needed 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 -->
+    <!-- 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 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 20/25] 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 21/25] 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 22/25] 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 23/25] 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 0a98aa94e6a97984c60bcb773fadac0bb40165df Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 14 Jan 2020 18:46:53 -0800
Subject: [PATCH 24/25] Remove internal feeds

---
 NuGet.config | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 5e8fc206d..8d760329e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -12,12 +12,7 @@
     <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-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" />

From 8131a95fc26059a5328630ef8e67074319af65c3 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 14 Jan 2020 18:47:57 -0800
Subject: [PATCH 25/25] Bump branding to 3.1.102

---
 src/redist/targets/Versions.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets
index a0523482b..2526db643 100644
--- a/src/redist/targets/Versions.targets
+++ b/src/redist/targets/Versions.targets
@@ -3,7 +3,7 @@
     <VersionMajor>3</VersionMajor>
     <VersionMinor>1</VersionMinor>
     <VersionSDKMinor>1</VersionSDKMinor>
-    <VersionPatch>01</VersionPatch>
+    <VersionPatch>02</VersionPatch>
     <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">servicing</ReleaseSuffix>
     <!--
         When DropSuffix is set to 'true', this branch will produce stable outputs for 'Shipping' packages