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

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

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

Dependency coherency updates

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

* Update NuGet.config

Co-authored-by: William Godbe <wigodbe@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2020-01-18 23:20:54 +00:00 committed by GitHub
parent 56ce343ea2
commit 464bff08aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions

View file

@ -9,9 +9,9 @@
<!--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" />
<add key="darc-pub-dotnet-aspnetcore-c3acdca" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-c3acdcac/nuget/v3/index.json" />
<add key="darc-pub-dotnet-core-setup-193fb40a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-193fb40a/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />

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.20067.13">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.102-servicing.20068.4">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>5574f6216fb2f5970f5f4589de9d4c4e57e238a4</Sha>
<Sha>6bd21c205a22091af2c1a0a52872c9ac28524ec4</Sha>
</Dependency>
<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.102-servicing.20067.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.102-servicing.20068.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>2c11da834b80b019651861a3364d2501d803f48f</Sha>
<Sha>9dd5dd9f0cf0b48d4d97ad628ca230df3c072d42</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.20067.13</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>3.1.102-servicing.20068.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.102-servicing.20067.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.102-servicing.20068.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>