mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merged PR 4980: [internal/release/3.1.1xx] Update dependencies from 1 repositories

Browse source 
This pull request updates the following dependencies

[marker]: <> (Begin:ed80f9fd-b1a7-4893-c5d2-08d76fa9c820)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-toolset
- **Build**: 20191217.13
- **Date Produced**: 12/18/2019 1:18 AM
- **Commit**: 411fe514b956a39d6080575cf35d2d64054a7ec0
- **Branch**: refs/heads/internal/release/3.1.1xx
- **Updates**:
  - **Microsoft.Dotnet.Toolset.Internal** -> 3.1.101-servicing.19617.13

[marker]: <> (End:ed80f9fd-b1a7-4893-c5d2-08d76fa9c820)

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

- **Microsoft.NET.Sdk** -> 3.1.101-servicing.19617.12 (parent: Microsoft.Dotnet.Toolset.Internal)
- **Microsoft.DotNet.MSBuildSdkResolver** -> 3.1.101-servicing.19617.2 (parent: Microsoft.Dotnet.Toolset.Internal)

[marker]: <> (End:Coherency Updates)
This commit is contained in:
DotNet Bot 2019-12-18 04:42:39 +00:00 • committed by Matt Mitchell
commit f87a68cf84
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NuGet.config
View file

@ -11,7 +11,7 @@
<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-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
<add key="darc-pub-aspnet-AspNetCore-7db6969" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-7db69699/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" />
<add key="darc-int-dotnet-core-setup-a1388f1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a1388f19/nuget/v3/index.json" />
<add key="darc-int-aspnet-AspNetCore-e276c81" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-AspNetCore-e276c817/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

14
eng/Version.Details.xml
View file

@ -73,17 +73,17 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>13abe7e2749d95337e8d72efdc5b71611815fd43</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19616.8">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19617.13">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
<Sha>b531fe7a7601f9a0b933b999c810b73cd1aab481</Sha>
<Sha>411fe514b956a39d6080575cf35d2d64054a7ec0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.100-rtm.19568.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>49bbede419cf63e15c70f4b463f80e4811fe3f34</Sha>
<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>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.101-servicing.19616.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<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>2b25bd5b14de69a227490ed0e44b4475672d3ebe</Sha>
<Sha>91705c83e44dd9221c3071e1bb7a87ba2f47688c</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">

6
eng/Versions.props
View file

@ -12,7 +12,7 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19616.8</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>3.1.101-servicing.19617.13</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
@ -45,14 +45,14 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.101-servicing.19616.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.101-servicing.19617.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
<MicrosoftNETSdkPackageVersion>3.1.100-rtm.19568.4</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>3.1.101-servicing.19617.12</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>