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

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

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

Dependency coherency updates

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

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

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

Dependency coherency updates

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

* nuget.config fixup

Co-authored-by: William Godbe <wigodbe@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2020-01-18 03:36:30 +00:00 committed by GitHub
parent fb213ff970
commit f8ca0e494f
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> <Uri>https://github.com/dotnet/templating</Uri>
<Sha>247f60e9e34a03ed99e855eb1ea0c20931a968db</Sha> <Sha>247f60e9e34a03ed99e855eb1ea0c20931a968db</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.102-servicing.20067.9"> <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.102-servicing.20067.12">
<Uri>https://github.com/dotnet/toolset</Uri> <Uri>https://github.com/dotnet/toolset</Uri>
<Sha>6b828b4bda52219e8a68526da1fda677eb28a96c</Sha> <Sha>82505ec7fc985a2dd3393a93814d7c3bb3438c00</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.102-servicing.20065.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal"> <Dependency Name="Microsoft.NET.Sdk" Version="3.1.102-servicing.20065.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>595244ad4a8c4ab7be4e4a78641f4da7b4361aae</Sha> <Sha>595244ad4a8c4ab7be4e4a78641f4da7b4361aae</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.102-servicing.20066.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.102-servicing.20067.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/cli</Uri> <Uri>https://github.com/dotnet/cli</Uri>
<Sha>3b9b81f5c68f60671ecb50ff5e9d68aedb78c6ef</Sha> <Sha>2c11da834b80b019651861a3364d2501d803f48f</Sha>
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup --> <!-- 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"> <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> <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.1.102-servicing.20067.9</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>3.1.102-servicing.20067.12</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->
@ -45,7 +45,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli --> <!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.102-servicing.20066.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.102-servicing.20067.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>