From 4828b572d78873ddbc36f458d7d5a952bc948cae Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Wed, 25 Mar 2020 12:57:57 -0700
Subject: [PATCH 01/29] branding update 3.1.104

---
 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 f472e7892..b8f215014 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>03</VersionPatch>
+    <VersionPatch>04</VersionPatch>
     <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">servicing</ReleaseSuffix>
     <!--
         When DropSuffix is set to 'true', this branch will produce stable outputs for 'Shipping' packages

From 31d07b086f3048c9a204a8550d2969ef1de76e2a Mon Sep 17 00:00:00 2001
From: akharlov <harl_aa@skbkontur.ru>
Date: Tue, 12 Nov 2019 17:10:24 +0500
Subject: [PATCH 02/29] update dependencies versions

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index ef44e6bcd..278fa5989 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
-    <NUnit3DotNetNewTemplatePackageVersion>1.7.1</NUnit3DotNetNewTemplatePackageVersion>
+    <NUnit3DotNetNewTemplatePackageVersion>1.7.2</NUnit3DotNetNewTemplatePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->

From c96062a29f80ffc4bcae0e07c38033fd3d84b5ec Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Mar 2020 00:13:32 +0000
Subject: [PATCH 03/29] Update dependencies from
 https://github.com/dotnet/core-setup build 20200326.1 (#6941)

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4-servicing.20176.1
- Microsoft.NETCore.DotNetHostResolver - 3.1.4-servicing.20176.1
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.4-servicing.20176.1
- Microsoft.NETCore.App.Host.win-x64 - 3.1.4-servicing.20176.1
- Microsoft.NETCore.App.Internal - 3.1.4-servicing.20176.1

Dependency coherency updates

- Microsoft.NETCore.Platforms - 3.1.1-servicing.20176.2 (parent: Microsoft.NetCore.App.Internal)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 NuGet.config            |  1 -
 eng/Version.Details.xml | 24 ++++++++++++------------
 eng/Versions.props      | 12 ++++++------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 520c1647c..18dd2e832 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-templating-4609143" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-46091435/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-core-setup-4a9f85e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-4a9f85e9/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-aspnetcore-e81033e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-e81033e0/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- 3.0.3 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 -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ff8e81d41..e18d6ce50 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.3">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.4-servicing.20176.1">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>4a9f85e9f89d7f686fef2ae2109d876b1e2eed2a</Sha>
+      <Sha>866f89c19bfb6bcb3d861cc424643765a441d396</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.3-servicing.20128.1">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20176.1">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>4a9f85e9f89d7f686fef2ae2109d876b1e2eed2a</Sha>
+      <Sha>866f89c19bfb6bcb3d861cc424643765a441d396</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.3">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.4-servicing.20176.1">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>4a9f85e9f89d7f686fef2ae2109d876b1e2eed2a</Sha>
+      <Sha>866f89c19bfb6bcb3d861cc424643765a441d396</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.3">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.4-servicing.20176.1">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>4a9f85e9f89d7f686fef2ae2109d876b1e2eed2a</Sha>
+      <Sha>866f89c19bfb6bcb3d861cc424643765a441d396</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.3">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.4-servicing.20176.1">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>4a9f85e9f89d7f686fef2ae2109d876b1e2eed2a</Sha>
+      <Sha>866f89c19bfb6bcb3d861cc424643765a441d396</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. -->
@@ -37,9 +37,9 @@
       <Uri>https://github.com/dotnet/core-setup</Uri>
       <Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0" CoherentParentDependency="Microsoft.NetCore.App.Internal">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.1-servicing.20176.2" CoherentParentDependency="Microsoft.NetCore.App.Internal">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
+      <Sha>c5f41f1b6bec47ee8c1a4daba911b65723540da5</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index ef44e6bcd..9708e8008 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,16 +57,16 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/corefx -->
-    <MicrosoftNETCorePlatformsPackageVersion>3.1.0</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>3.1.1-servicing.20176.2</MicrosoftNETCorePlatformsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <MicrosoftNETCoreAppInternalPackageVersion>3.1.3-servicing.20128.1</MicrosoftNETCoreAppInternalPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.3</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20176.1</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.4-servicing.20176.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.4-servicing.20176.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.4-servicing.20176.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.4-servicing.20176.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
     <MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
   </PropertyGroup>

From 32997dc72835cf23827e85fe6b5e12f4e2581d8c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Mar 2020 00:56:30 +0000
Subject: [PATCH 04/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200326.1 (#6943)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20176.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 e18d6ce50..239f67d83 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>46091435536c53242905ab4e991bdc0bac153e64</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.103-servicing.20167.4">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20176.1">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>4d0fe6c07e644a576aad6e0c3842f61460e48158</Sha>
+      <Sha>13c4b0b04b64cdb4703fbc6c65feed6406bff7b0</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9708e8008..5f576f795 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.103-servicing.20167.4</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20176.1</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From 6cdb8c9f68c0f292a2dc22d9fc3c0b22edd8b777 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Mar 2020 01:31:29 +0000
Subject: [PATCH 05/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200326.2 (#6944)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20176.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 239f67d83..3e0654577 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>46091435536c53242905ab4e991bdc0bac153e64</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20176.1">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20176.2">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>13c4b0b04b64cdb4703fbc6c65feed6406bff7b0</Sha>
+      <Sha>96cfad61ed788d1ebff1ff12be6949128c520783</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 5f576f795..b0a550c14 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20176.1</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20176.2</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From 2078170475fc6e75c666fd060c00f3f34cb4385a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Mar 2020 02:18:10 +0000
Subject: [PATCH 06/29] Update dependencies from
 https://github.com/dotnet/core-setup build 20200326.3 (#6945)

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4-servicing.20176.3
- Microsoft.NETCore.DotNetHostResolver - 3.1.4-servicing.20176.3
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.4-servicing.20176.3
- Microsoft.NETCore.App.Host.win-x64 - 3.1.4-servicing.20176.3
- Microsoft.NETCore.App.Internal - 3.1.4-servicing.20176.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml | 20 ++++++++++----------
 eng/Versions.props      | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3e0654577..b22b67775 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.4-servicing.20176.1">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.4-servicing.20176.3">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>866f89c19bfb6bcb3d861cc424643765a441d396</Sha>
+      <Sha>2364c9f773d5604e7fc5d0a1555c4b077e898583</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20176.1">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20176.3">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>866f89c19bfb6bcb3d861cc424643765a441d396</Sha>
+      <Sha>2364c9f773d5604e7fc5d0a1555c4b077e898583</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.4-servicing.20176.1">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.4-servicing.20176.3">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>866f89c19bfb6bcb3d861cc424643765a441d396</Sha>
+      <Sha>2364c9f773d5604e7fc5d0a1555c4b077e898583</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.4-servicing.20176.1">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.4-servicing.20176.3">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>866f89c19bfb6bcb3d861cc424643765a441d396</Sha>
+      <Sha>2364c9f773d5604e7fc5d0a1555c4b077e898583</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.4-servicing.20176.1">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.4-servicing.20176.3">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>866f89c19bfb6bcb3d861cc424643765a441d396</Sha>
+      <Sha>2364c9f773d5604e7fc5d0a1555c4b077e898583</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. -->
diff --git a/eng/Versions.props b/eng/Versions.props
index b0a550c14..cf1ae4065 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -61,12 +61,12 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20176.1</MicrosoftNETCoreAppInternalPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.4-servicing.20176.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.4-servicing.20176.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20176.3</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.4-servicing.20176.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.4-servicing.20176.3</MicrosoftNETCoreAppHostwinx64PackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.4-servicing.20176.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.4-servicing.20176.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.4-servicing.20176.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.4-servicing.20176.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
     <MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
   </PropertyGroup>

From 76cf158e7f3a75bbfc44e035a9b78019be1cee07 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Mar 2020 04:43:22 +0000
Subject: [PATCH 07/29] Update dependencies from
 https://github.com/dotnet/core-setup build 20200326.4 (#6948)

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4-servicing.20176.4
- Microsoft.NETCore.DotNetHostResolver - 3.1.4-servicing.20176.4
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.4-servicing.20176.4
- Microsoft.NETCore.App.Host.win-x64 - 3.1.4-servicing.20176.4
- Microsoft.NETCore.App.Internal - 3.1.4-servicing.20176.4

Dependency coherency updates

- Microsoft.NETCore.Platforms - 3.1.1-servicing.20176.6 (parent: Microsoft.NetCore.App.Internal)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml | 24 ++++++++++++------------
 eng/Versions.props      | 12 ++++++------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b22b67775..208dbe7ef 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.4-servicing.20176.3">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.4-servicing.20176.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>2364c9f773d5604e7fc5d0a1555c4b077e898583</Sha>
+      <Sha>08b96bae4b5127c9ab110182fdd51e6a045803cf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20176.3">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20176.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>2364c9f773d5604e7fc5d0a1555c4b077e898583</Sha>
+      <Sha>08b96bae4b5127c9ab110182fdd51e6a045803cf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.4-servicing.20176.3">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.4-servicing.20176.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>2364c9f773d5604e7fc5d0a1555c4b077e898583</Sha>
+      <Sha>08b96bae4b5127c9ab110182fdd51e6a045803cf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.4-servicing.20176.3">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.4-servicing.20176.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>2364c9f773d5604e7fc5d0a1555c4b077e898583</Sha>
+      <Sha>08b96bae4b5127c9ab110182fdd51e6a045803cf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.4-servicing.20176.3">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.4-servicing.20176.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>2364c9f773d5604e7fc5d0a1555c4b077e898583</Sha>
+      <Sha>08b96bae4b5127c9ab110182fdd51e6a045803cf</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. -->
@@ -37,9 +37,9 @@
       <Uri>https://github.com/dotnet/core-setup</Uri>
       <Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.1-servicing.20176.2" CoherentParentDependency="Microsoft.NetCore.App.Internal">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.1-servicing.20176.6" CoherentParentDependency="Microsoft.NetCore.App.Internal">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>c5f41f1b6bec47ee8c1a4daba911b65723540da5</Sha>
+      <Sha>78ef3883a0a2ca585ebf9392c2ee6897d611cfe7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index cf1ae4065..fe1d1b989 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,16 +57,16 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/corefx -->
-    <MicrosoftNETCorePlatformsPackageVersion>3.1.1-servicing.20176.2</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>3.1.1-servicing.20176.6</MicrosoftNETCorePlatformsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20176.3</MicrosoftNETCoreAppInternalPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.4-servicing.20176.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.4-servicing.20176.3</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20176.4</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.4-servicing.20176.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.4-servicing.20176.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.4-servicing.20176.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.4-servicing.20176.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.4-servicing.20176.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.4-servicing.20176.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
     <MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
   </PropertyGroup>

From 095be80aeda87b52d53e71ec443e78c63a80aa06 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Mar 2020 05:49:28 +0000
Subject: [PATCH 08/29] [release/3.1.1xx] Update dependencies from
 dotnet/toolset (#6946)

* Update dependencies from https://github.com/dotnet/toolset build 20200326.4

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20176.4

* Update dependencies from https://github.com/dotnet/toolset build 20200326.11

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20176.11

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 208dbe7ef..075a49262 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>46091435536c53242905ab4e991bdc0bac153e64</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20176.2">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20176.11">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>96cfad61ed788d1ebff1ff12be6949128c520783</Sha>
+      <Sha>fa2c6bc7eef109e99847df2658fd319db734b218</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index fe1d1b989..79bb70db3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20176.2</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20176.11</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From 590754b0963b2f41568835ccb478262c3a3940c6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Mar 2020 10:06:45 +0000
Subject: [PATCH 09/29] [release/3.1.1xx] Update dependencies from
 dotnet/toolset (#6950)

* Update dependencies from https://github.com/dotnet/toolset build 20200327.2

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20177.2

* Update dependencies from https://github.com/dotnet/toolset build 20200327.3

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20177.3

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.1.104-servicing.20177.1 (parent: Microsoft.Dotnet.Toolset.Internal)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 075a49262..6f8ff9b8e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,17 +73,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>46091435536c53242905ab4e991bdc0bac153e64</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20176.11">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20177.3">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>fa2c6bc7eef109e99847df2658fd319db734b218</Sha>
+      <Sha>b735bd95fe8b6ab30513b6e47f5251b8c1528c75</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
       <Sha>ab04d19191b70ce82adc3830fdea05eec952505f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.103-servicing.20167.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.104-servicing.20177.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>f6250b79a00848f18e6e7b076b561d0a794983d3</Sha>
+      <Sha>475f453c886769c992125469c06a3f2b490c0b76</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.20127.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 79bb70db3..2d7f8b8c5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20176.11</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20177.3</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.103-servicing.20167.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.104-servicing.20177.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>

From d1f02e7806157d333827c6a3341b00a31dd182d6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Mar 2020 17:57:46 +0000
Subject: [PATCH 10/29] Update dependencies from
 https://github.com/dotnet/test-templates build 20200326.1 (#6956)

- Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.20176.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 6f8ff9b8e..8bc429f37 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -65,9 +65,9 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>e81033e094d4663ffd227bb4aed30b76b0631e6d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.3.1" Version="1.0.2-beta4.20105.2">
+    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.3.1" Version="1.0.2-beta4.20176.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>1b134b5a258aa5dc1aefc27fea90f442abbe41cd</Sha>
+      <Sha>2720fcade72d709a5d2fe80d0b80fbdac54213f6</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/templating</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 2d7f8b8c5..08b4d2822 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,7 +28,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
-    <MicrosoftDotNetTestProjectTemplates31PackageVersion>1.0.2-beta4.20105.2</MicrosoftDotNetTestProjectTemplates31PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates31PackageVersion>1.0.2-beta4.20176.1</MicrosoftDotNetTestProjectTemplates31PackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->

From 4de3a95a450718f33e49376960b5f37621d48d74 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 28 Mar 2020 01:05:54 +0000
Subject: [PATCH 11/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200327.9 (#6961)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20177.9

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 8bc429f37..f4f5b04c0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>46091435536c53242905ab4e991bdc0bac153e64</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20177.3">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20177.9">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>b735bd95fe8b6ab30513b6e47f5251b8c1528c75</Sha>
+      <Sha>3de609639cd27973dd78714b98e771f6bc9d6af6</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 08b4d2822..c26a60904 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20177.3</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20177.9</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From b38f09b6320b843623ae405fda31da6cc8137da0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 28 Mar 2020 01:45:01 +0000
Subject: [PATCH 12/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200327.10 (#6962)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20177.10

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.1.104-servicing.20177.5 (parent: Microsoft.Dotnet.Toolset.Internal)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 f4f5b04c0..0816ad9a0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,17 +73,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>46091435536c53242905ab4e991bdc0bac153e64</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20177.9">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20177.10">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>3de609639cd27973dd78714b98e771f6bc9d6af6</Sha>
+      <Sha>33551afc8b2fb2dcfb495864c52a8274e1cc15cd</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
       <Sha>ab04d19191b70ce82adc3830fdea05eec952505f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.104-servicing.20177.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.104-servicing.20177.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>475f453c886769c992125469c06a3f2b490c0b76</Sha>
+      <Sha>3daeb6bab6026f5f36777590080f90bfc03df5d6</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.20127.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index c26a60904..a5928e7e2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20177.9</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20177.10</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.104-servicing.20177.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.104-servicing.20177.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>

From a6394909dd25d24a43fd811f47b88956798757e4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 29 Mar 2020 00:38:55 +0000
Subject: [PATCH 13/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200328.1 (#6965)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20178.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 0816ad9a0..b61cebbda 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>46091435536c53242905ab4e991bdc0bac153e64</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20177.10">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20178.1">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>33551afc8b2fb2dcfb495864c52a8274e1cc15cd</Sha>
+      <Sha>fdfcaf874c6d06667f97c7645450c2ecb340b4bd</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index a5928e7e2..356705dc5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20177.10</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20178.1</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From 114ad519be0093ae27e67637030e4aeaef2a416e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2020 05:52:15 +0000
Subject: [PATCH 14/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200328.2 (#6966)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20178.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 b61cebbda..7de62985c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>46091435536c53242905ab4e991bdc0bac153e64</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20178.1">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20178.2">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>fdfcaf874c6d06667f97c7645450c2ecb340b4bd</Sha>
+      <Sha>68974f1926ccd170860c6bace2753dcf852f6b37</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 78124dfb6..71452d4f0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20178.1</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20178.2</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From bebcee2892fd6cd1e2d0676d6943e8a34cda1015 Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Mon, 30 Mar 2020 11:56:24 -0700
Subject: [PATCH 15/29] Add docker pull retry (#6969)

---
 eng/dockerrun.sh | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh
index 762e177a7..819858ea2 100755
--- a/eng/dockerrun.sh
+++ b/eng/dockerrun.sh
@@ -99,9 +99,30 @@ fi
 #  VSO
 [ ! -z "$BUILD_BUILDID" ] && DOTNET_BUILD_CONTAINER_NAME="$BUILD_BUILDID"
 
+function retry {
+  local max_count=$1
+  shift
+
+  local count=0
+  until "$@"; do
+    exit=$?
+    wait=$((2 ** $count))
+    count=$(($count + 1))
+    if [[ ${count} -lt ${max_count} ]]; then
+      echo "Retry $count/$max_count returned $exit, wait $wait seconds..."
+      sleep ${wait}
+    else
+      echo "Retry $count/$max_count returned $exit."
+      return ${exit}
+    fi
+  done
+  return 0
+}
+
 # Build the docker container (will be fast if it is already built)
+# with retry since docker pull has high failure rate
 echo "Building Docker Container using Dockerfile: $DOCKERFILE"
-docker build --build-arg WORK_DIR=$DOCKER_HOST_SHARE_DIR --build-arg USER_ID=$(id -u) -t $DOTNET_BUILD_CONTAINER_TAG $DOCKERFILE
+retry 10 docker build --build-arg WORK_DIR=$DOCKER_HOST_SHARE_DIR --build-arg USER_ID=$(id -u) -t $DOTNET_BUILD_CONTAINER_TAG $DOCKERFILE 2>&1
 
 # Run the build in the container
 echo "Launching build in Docker Container"

From e020681b3e9db715d583420a44b317a085167ab3 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2020 20:12:50 +0000
Subject: [PATCH 16/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200329.4 (#6974)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20179.4

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.1.104-servicing.20179.1 (parent: Microsoft.Dotnet.Toolset.Internal)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 7de62985c..0a1488e67 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,17 +73,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>46091435536c53242905ab4e991bdc0bac153e64</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20178.2">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20179.4">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>68974f1926ccd170860c6bace2753dcf852f6b37</Sha>
+      <Sha>21e38e0122639830947f1d608dc4b13b8cf693fd</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
       <Sha>ab04d19191b70ce82adc3830fdea05eec952505f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.104-servicing.20177.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.104-servicing.20179.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>3daeb6bab6026f5f36777590080f90bfc03df5d6</Sha>
+      <Sha>d4c9df160442e40fc991a47c974b1ddb11927802</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.20127.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 71452d4f0..487f175c9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20178.2</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20179.4</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.104-servicing.20177.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.104-servicing.20179.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>

From 2a1e5da15a0bf9ec5b732a697f625e519ee84847 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2020 20:56:04 +0000
Subject: [PATCH 17/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200330.3 (#6975)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20180.3

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.4 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.104-servicing.20180.1 (parent: Microsoft.Dotnet.Toolset.Internal)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 18dd2e832..0a7d24434 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,7 +7,7 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <add key="darc-pub-dotnet-templating-4609143" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-46091435/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-55ff2d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-55ff2d0d/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-aspnetcore-e81033e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-e81033e0/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- 3.0.3 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 -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0a1488e67..a90ff31df 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -69,21 +69,21 @@
       <Uri>https://github.com/dotnet/test-templates</Uri>
       <Sha>2720fcade72d709a5d2fe80d0b80fbdac54213f6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>46091435536c53242905ab4e991bdc0bac153e64</Sha>
+      <Sha>55ff2d0d7b63a97b2e53dc2e94df8d1cae9858ac</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20179.4">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20180.3">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>21e38e0122639830947f1d608dc4b13b8cf693fd</Sha>
+      <Sha>6159526dc79f273c19cac88cc17b02fae22e23e9</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
       <Sha>ab04d19191b70ce82adc3830fdea05eec952505f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.104-servicing.20179.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.104-servicing.20180.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>d4c9df160442e40fc991a47c974b1ddb11927802</Sha>
+      <Sha>85e46f38a04ef87abe85c763eef8629fe884abe2</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.20127.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 487f175c9..9c7ce7da3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20179.4</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20180.3</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.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>3.1.4</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.104-servicing.20179.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.104-servicing.20180.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>

From f9408b1d6553bc0dc82f275753ac70f42c8c8294 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2020 23:42:45 +0000
Subject: [PATCH 18/29] Update dependencies from https://github.com/dotnet/wcf
 build 20200330.1 (#6978)

- System.ServiceModel.Primitives - 4.7.0-rtm.20180.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a90ff31df..77d787175 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -96,9 +96,9 @@
     </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 -->
-    <Dependency Name="System.ServiceModel.Primitives" Version="4.7.0-rtm.20072.1">
+    <Dependency Name="System.ServiceModel.Primitives" Version="4.7.0-rtm.20180.1">
       <Uri>https://github.com/dotnet/wcf</Uri>
-      <Sha>406acaa61fb99736eed7384af5170eb6eac321c5</Sha>
+      <Sha>2df026b433c01867acda77e3a902f84796548670</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

From a6b63a29ad4ed3e17450a4fec7104beb587364f3 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 31 Mar 2020 16:15:47 +0000
Subject: [PATCH 19/29] Update dependencies from https://github.com/dotnet/wcf
 build 20200330.2 (#6981)

- System.ServiceModel.Primitives - 4.7.0-rtm.20180.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 77d787175..201da1542 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -96,7 +96,7 @@
     </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 -->
-    <Dependency Name="System.ServiceModel.Primitives" Version="4.7.0-rtm.20180.1">
+    <Dependency Name="System.ServiceModel.Primitives" Version="4.7.0-rtm.20180.2">
       <Uri>https://github.com/dotnet/wcf</Uri>
       <Sha>2df026b433c01867acda77e3a902f84796548670</Sha>
     </Dependency>

From fc2ceabdd721219f203e6e127af9ef0fa9a84b17 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 31 Mar 2020 16:18:02 +0000
Subject: [PATCH 20/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200330.5 (#6977)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20180.5

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.1.104-servicing.20180.6 (parent: Microsoft.Dotnet.Toolset.Internal)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 201da1542..4751e96f2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,17 +73,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>55ff2d0d7b63a97b2e53dc2e94df8d1cae9858ac</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20180.3">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20180.5">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>6159526dc79f273c19cac88cc17b02fae22e23e9</Sha>
+      <Sha>36773ccfdd7604860c9614c84a861eb257add63c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
       <Sha>ab04d19191b70ce82adc3830fdea05eec952505f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.104-servicing.20180.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.104-servicing.20180.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>85e46f38a04ef87abe85c763eef8629fe884abe2</Sha>
+      <Sha>e164218a8dae2aeedba6b728d9c5f4de5d47ce0a</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.20127.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 9c7ce7da3..37cc515c0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20180.3</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20180.5</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.104-servicing.20180.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.104-servicing.20180.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>

From 40ac46d998cda06c04ce6f39a45ceda8a0c35c83 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 31 Mar 2020 23:58:45 +0000
Subject: [PATCH 21/29] Update dependencies from https://github.com/dotnet/wcf
 build 20200331.1 (#6995)

- System.ServiceModel.Primitives - 4.7.0-rtm.20181.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4751e96f2..f1fdef87b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -96,9 +96,9 @@
     </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 -->
-    <Dependency Name="System.ServiceModel.Primitives" Version="4.7.0-rtm.20180.2">
+    <Dependency Name="System.ServiceModel.Primitives" Version="4.7.0-rtm.20181.1">
       <Uri>https://github.com/dotnet/wcf</Uri>
-      <Sha>2df026b433c01867acda77e3a902f84796548670</Sha>
+      <Sha>a0c3917deaeb4761a5cf28115c74593031354417</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

From 2e1c698d8940ad4bdde970df74bd60d2e97a3eec Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2020 00:14:49 +0000
Subject: [PATCH 22/29] Update dependencies from
 https://github.com/dotnet/core-setup build 20200331.1 (#6998)

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.4
- Microsoft.NETCore.App.Host.win-x64 - 3.1.4
- Microsoft.NETCore.App.Internal - 3.1.4-servicing.20181.1
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4
- Microsoft.NETCore.DotNetHostResolver - 3.1.4

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 NuGet.config            |  1 +
 eng/Version.Details.xml | 20 ++++++++++----------
 eng/Versions.props      | 10 +++++-----
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 0a7d24434..b81ea8cee 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,6 +8,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <add key="darc-pub-dotnet-templating-55ff2d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-55ff2d0d/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-core-setup-87da73b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-87da73b3/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-aspnetcore-e81033e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-e81033e0/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- 3.0.3 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 -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f1fdef87b..1f75e8b1e 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.4-servicing.20176.4">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>08b96bae4b5127c9ab110182fdd51e6a045803cf</Sha>
+      <Sha>87da73b3299b0dd151585d3811bd9b5dec30318b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20176.4">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20181.1">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>08b96bae4b5127c9ab110182fdd51e6a045803cf</Sha>
+      <Sha>87da73b3299b0dd151585d3811bd9b5dec30318b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.4-servicing.20176.4">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>08b96bae4b5127c9ab110182fdd51e6a045803cf</Sha>
+      <Sha>87da73b3299b0dd151585d3811bd9b5dec30318b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.4-servicing.20176.4">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>08b96bae4b5127c9ab110182fdd51e6a045803cf</Sha>
+      <Sha>87da73b3299b0dd151585d3811bd9b5dec30318b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.4-servicing.20176.4">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>08b96bae4b5127c9ab110182fdd51e6a045803cf</Sha>
+      <Sha>87da73b3299b0dd151585d3811bd9b5dec30318b</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. -->
diff --git a/eng/Versions.props b/eng/Versions.props
index 37cc515c0..af3461abc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -61,12 +61,12 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20176.4</MicrosoftNETCoreAppInternalPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.4-servicing.20176.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.4-servicing.20176.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20181.1</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.4-servicing.20176.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.4-servicing.20176.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
     <MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
   </PropertyGroup>

From f145a45008782e3a9f91c83a0b44b26d24a64958 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2020 01:40:21 +0000
Subject: [PATCH 23/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200331.5 (#7002)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20181.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 1f75e8b1e..74a11a370 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>55ff2d0d7b63a97b2e53dc2e94df8d1cae9858ac</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20180.5">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20181.5">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>36773ccfdd7604860c9614c84a861eb257add63c</Sha>
+      <Sha>be2a6a867e21bf033c104ccf88d039f2cf20af71</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index af3461abc..43f334235 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20180.5</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20181.5</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From d68c6ad2fa4cd7aeb4161a391b497a74fecc090f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2020 04:00:36 +0000
Subject: [PATCH 24/29] Update dependencies from
 https://github.com/dotnet/core-setup build 20200331.2 (#7008)

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.4
- Microsoft.NETCore.App.Host.win-x64 - 3.1.4
- Microsoft.NETCore.App.Internal - 3.1.4-servicing.20181.2
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4
- Microsoft.NETCore.DotNetHostResolver - 3.1.4

Dependency coherency updates

- Microsoft.NETCore.Platforms - 3.1.1 (parent: Microsoft.NetCore.App.Internal)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 NuGet.config            |  3 ++-
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index b81ea8cee..cf174b5d2 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,7 +8,8 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <add key="darc-pub-dotnet-templating-55ff2d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-55ff2d0d/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-core-setup-87da73b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-87da73b3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-core-setup-57d5bbb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-57d5bbb5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-corefx-282d5b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-282d5b9f/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-aspnetcore-e81033e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-e81033e0/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- 3.0.3 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 -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 74a11a370..944bd7176 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,23 +3,23 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>87da73b3299b0dd151585d3811bd9b5dec30318b</Sha>
+      <Sha>57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20181.1">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20181.2">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>87da73b3299b0dd151585d3811bd9b5dec30318b</Sha>
+      <Sha>57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>87da73b3299b0dd151585d3811bd9b5dec30318b</Sha>
+      <Sha>57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>87da73b3299b0dd151585d3811bd9b5dec30318b</Sha>
+      <Sha>57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.4">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>87da73b3299b0dd151585d3811bd9b5dec30318b</Sha>
+      <Sha>57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8</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. -->
@@ -37,9 +37,9 @@
       <Uri>https://github.com/dotnet/core-setup</Uri>
       <Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.1-servicing.20176.6" CoherentParentDependency="Microsoft.NetCore.App.Internal">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.1" CoherentParentDependency="Microsoft.NetCore.App.Internal">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>78ef3883a0a2ca585ebf9392c2ee6897d611cfe7</Sha>
+      <Sha>282d5b9f83e7a4e7fe0cef268f4f8f85e6162510</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 43f334235..288084e61 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,11 +57,11 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/corefx -->
-    <MicrosoftNETCorePlatformsPackageVersion>3.1.1-servicing.20176.6</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>3.1.1</MicrosoftNETCorePlatformsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20181.1</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20181.2</MicrosoftNETCoreAppInternalPackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>

From 4ee1d86a3a3a34a8f8da011f527515be802b4f20 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2020 04:32:56 +0000
Subject: [PATCH 25/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200331.8 (#7009)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20181.8

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 944bd7176..7e9a0e8ad 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>55ff2d0d7b63a97b2e53dc2e94df8d1cae9858ac</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20181.5">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20181.8">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>be2a6a867e21bf033c104ccf88d039f2cf20af71</Sha>
+      <Sha>528cf7b2a65690fc1e4e086a178d47587f19c555</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 288084e61..97a3986d3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20181.5</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20181.8</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From e5a274ec0e1203f9ba81f550e9a5532e2ddbae8b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2020 08:18:32 +0000
Subject: [PATCH 26/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200401.1 (#7012)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20201.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 7e9a0e8ad..11f83361a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,9 +73,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>55ff2d0d7b63a97b2e53dc2e94df8d1cae9858ac</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20181.8">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20201.1">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>528cf7b2a65690fc1e4e086a178d47587f19c555</Sha>
+      <Sha>9d443678a3cd77815ea48a426af45990d67fe07b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 97a3986d3..809f52a3a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20181.8</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20201.1</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

From 1a3c663407663d80f281f79c46b4e2fd69029960 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2020 09:05:02 +0000
Subject: [PATCH 27/29] Update dependencies from
 https://github.com/dotnet/toolset build 20200401.4 (#7013)

- Microsoft.Dotnet.Toolset.Internal - 3.1.104-servicing.20201.4

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.1.104-servicing.20181.5 (parent: Microsoft.Dotnet.Toolset.Internal)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 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 11f83361a..90d6dbb77 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,17 +73,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>55ff2d0d7b63a97b2e53dc2e94df8d1cae9858ac</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20201.1">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20201.4">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>9d443678a3cd77815ea48a426af45990d67fe07b</Sha>
+      <Sha>7dd906fe4be316269b549065b112fa7f33fb439f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
       <Sha>ab04d19191b70ce82adc3830fdea05eec952505f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.104-servicing.20180.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.104-servicing.20181.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>e164218a8dae2aeedba6b728d9c5f4de5d47ce0a</Sha>
+      <Sha>f15bca41b35c7f5ef18f976b7cc37fc961db2f21</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.20127.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 809f52a3a..744112be0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20201.1</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.104-servicing.20201.4</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.104-servicing.20180.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.104-servicing.20181.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>

From bf8d4602f586ba1127ec8da2e107403f6c086ed1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2020 15:58:37 +0000
Subject: [PATCH 28/29] Update dependencies from https://github.com/dotnet/wcf
 build 20200331.2 (#7003)

- System.ServiceModel.Primitives - 4.7.0-rtm.20181.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 90d6dbb77..86f6f944f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -96,7 +96,7 @@
     </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 -->
-    <Dependency Name="System.ServiceModel.Primitives" Version="4.7.0-rtm.20181.1">
+    <Dependency Name="System.ServiceModel.Primitives" Version="4.7.0-rtm.20181.2">
       <Uri>https://github.com/dotnet/wcf</Uri>
       <Sha>a0c3917deaeb4761a5cf28115c74593031354417</Sha>
     </Dependency>

From 52653da2d530c411b89f7f01002b4bb8f17bcb27 Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Sat, 11 Apr 2020 15:59:37 -0700
Subject: [PATCH 29/29] Interactive.DependencyManager to sign files

---
 src/redist/targets/Signing.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets
index c6f771010..5d74ef399 100644
--- a/src/redist/targets/Signing.targets
+++ b/src/redist/targets/Signing.targets
@@ -98,6 +98,7 @@
                             $(SdkOutputDirectory)**/fsc.exe;
                             $(SdkOutputDirectory)**/fsi.exe;
                             $(SdkOutputDirectory)**/FSharp.*.dll;
+                            $(SdkOutputDirectory)**/Interactive.DependencyManager.dll;
                             $(SdkOutputDirectory)**/dotnet.dll;
                             $(SdkOutputDirectory)**/dotnet.resources.dll;
                             $(SdkOutputDirectory)**/System.*.dll;