From 215af6aa607999dc021d4a35478a93aa934c9b23 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2020 03:58:54 +0000
Subject: [PATCH] [release/3.1.1xx] Update dependencies from dotnet/core-setup
 (#6158)

* Update dependencies from https://github.com/dotnet/core-setup build 20200115.5

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.App.Host.win-x64 - 3.1.2
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.5
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.DotNetHostResolver - 3.1.2

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20064.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/core-setup build 20200115.9

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.App.Host.win-x64 - 3.1.2
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.9
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.DotNetHostResolver - 3.1.2

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20064.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/core-setup build 20200115.10

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.App.Host.win-x64 - 3.1.2
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.10
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.DotNetHostResolver - 3.1.2

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20065.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/core-setup build 20200115.12

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.App.Host.win-x64 - 3.1.2
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.12
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.DotNetHostResolver - 3.1.2

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20065.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/core-setup build 20200115.14

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.App.Host.win-x64 - 3.1.2
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.14
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.DotNetHostResolver - 3.1.2

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20065.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/core-setup build 20200116.1

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.App.Host.win-x64 - 3.1.2
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.1
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.DotNetHostResolver - 3.1.2

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20065.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/core-setup build 20200116.6

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.App.Host.win-x64 - 3.1.2
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.6
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.DotNetHostResolver - 3.1.2

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20065.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/core-setup build 20200116.9

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.App.Host.win-x64 - 3.1.2
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.9
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.DotNetHostResolver - 3.1.2

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.2-servicing.20066.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/core-setup build 20200116.11

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.App.Host.win-x64 - 3.1.2
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.11
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.DotNetHostResolver - 3.1.2

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.2-servicing.20066.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

Co-authored-by: William Godbe <wigodbe@microsoft.com>
---
 NuGet.config            |  3 +--
 eng/Version.Details.xml | 18 +++++++++---------
 eng/Versions.props      |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 88bbf897e..892a230b3 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,8 +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-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-core-setup-92224c9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-92224c91/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-dotnet-aspnetcore-36e7902" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-36e79022/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" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c5bf36a97..a4946464a 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.2">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d</Sha>
+      <Sha>92224c91b9a8dda9b77c41b583fbd711378adc87</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20064.3">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20066.11">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d</Sha>
+      <Sha>92224c91b9a8dda9b77c41b583fbd711378adc87</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.2">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d</Sha>
+      <Sha>92224c91b9a8dda9b77c41b583fbd711378adc87</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.2">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d</Sha>
+      <Sha>92224c91b9a8dda9b77c41b583fbd711378adc87</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.2">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d</Sha>
+      <Sha>92224c91b9a8dda9b77c41b583fbd711378adc87</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. -->
@@ -90,9 +90,9 @@
       <Uri>https://github.com/dotnet/winforms</Uri>
       <Sha>9483a88b7764a74d71cbd449de6c56c1d5e0af21</Sha>
     </Dependency>
-    <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 Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.2-servicing.20066.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+      <Uri>https://github.com/dotnet/wpf</Uri>
+      <Sha>589ace3c9fdfa0f1ea1640b82304a6a7ac597871</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 062b68c24..ad6cb801f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-rtm.19605.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.2-servicing.20066.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/templating -->
@@ -61,7 +61,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <MicrosoftNETCoreAppInternalPackageVersion>3.1.2-servicing.20064.3</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>3.1.2-servicing.20066.11</MicrosoftNETCoreAppInternalPackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>