[release/3.1.1xx] Update dependencies from dotnet/toolset (#6305)

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

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

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

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

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20105.1 (parent: Microsoft.Dotnet.Toolset.Internal)

* Add templating feed back

Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
This commit is contained in:
dotnet-maestro[bot] 2020-02-11 20:17:02 +00:00 committed by GitHub
parent 82381cb194
commit a630ee787d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View file

@ -73,17 +73,17 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>247f60e9e34a03ed99e855eb1ea0c20931a968db</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.102-servicing.20070.8">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.102-servicing.20107.8">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>a46d93e5e100f9046cb589b5d4ba70bde41f3480</Sha>
<Sha>ca6e2d1f4e505278a23f007da0ed3b3e26f8b135</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.102-servicing.20068.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>90a093bbbe2c46ef19e301d717bed3cfaa56abb3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.102-servicing.20069.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.102-servicing.20105.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>32fddd23b1e53272472f6feb27f5e12a445b7236</Sha>
<Sha>49d7c3215e2df91bee631721171e57f0029cdf0d</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">

View file

@ -12,7 +12,7 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.1.102-servicing.20070.8</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>3.1.102-servicing.20107.8</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
@ -45,7 +45,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.102-servicing.20069.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.102-servicing.20105.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>