From fb213ff970bee5f677d01bd3e377ac8363952fe2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2020 01:27:28 +0000
Subject: [PATCH] [release/3.1.1xx] Update dependencies from dotnet/toolset
 (#6157)

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

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20065.9

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

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20065.12

Dependency coherency updates

- Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal)

* Remove internal feed

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

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20065.13

Dependency coherency updates

- Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20064.4 (parent: Microsoft.Dotnet.Toolset.Internal)

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

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20065.17

Dependency coherency updates

- Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20064.4 (parent: Microsoft.Dotnet.Toolset.Internal)

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

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20066.7

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20065.11 (parent: Microsoft.Dotnet.Toolset.Internal)

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

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20066.10

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20066.4 (parent: Microsoft.Dotnet.Toolset.Internal)

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

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20067.9

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20066.4 (parent: Microsoft.Dotnet.Toolset.Internal)

* add templating feed to nuget.config

Co-authored-by: William Li <wul@microsoft.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
---
 NuGet.config            |  1 +
 eng/Version.Details.xml | 20 ++++++++++----------
 eng/Versions.props      |  8 ++++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index d890e6588..d8bc04c37 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,6 +7,7 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <add key="darc-pub-dotnet-templating-247f60e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-247f60e9/nuget/v3/index.json" />
     <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-916b5cb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-916b5cba/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c989ba3e3..20c8a4eb5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -69,21 +69,21 @@
       <Uri>https://github.com/dotnet/test-templates</Uri>
       <Sha>5117d3d9d7dfd3583f0c42a639efaf092f957b7b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.1-servicing.19605.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>13abe7e2749d95337e8d72efdc5b71611815fd43</Sha>
+      <Sha>247f60e9e34a03ed99e855eb1ea0c20931a968db</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.102-servicing.20064.10">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.102-servicing.20067.9">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>f63f882f404ff4a768fa6d97c0c4376052d54f8a</Sha>
+      <Sha>6b828b4bda52219e8a68526da1fda677eb28a96c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.101-servicing.19617.12" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>9b38eb3b6cbbc9c82270dbd4e20286007a52a165</Sha>
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.102-servicing.20065.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+      <Uri>https://github.com/dotnet/sdk</Uri>
+      <Sha>595244ad4a8c4ab7be4e4a78641f4da7b4361aae</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.101-servicing.19617.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-cli</Uri>
-      <Sha>91705c83e44dd9221c3071e1bb7a87ba2f47688c</Sha>
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.102-servicing.20066.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+      <Uri>https://github.com/dotnet/cli</Uri>
+      <Sha>3b9b81f5c68f60671ecb50ff5e9d68aedb78c6ef</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-servicing.19605.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 8f9814108..40d6fe185 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.102-servicing.20064.10</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.102-servicing.20067.9</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.1-servicing.19605.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>3.1.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -45,14 +45,14 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/cli -->
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.101-servicing.19617.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.102-servicing.20066.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
-    <MicrosoftNETSdkPackageVersion>3.1.101-servicing.19617.12</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>3.1.102-servicing.20065.3</MicrosoftNETSdkPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>