[release/3.1.2xx] Update dependencies from dotnet/core-setup (#6231)
* Update dependencies from https://github.com/dotnet/core-setup build 20200120.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20070.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-servicing.20069.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.2-servicing.20069.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Add 3.1.2 template feed Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
This commit is contained in:
dotnet-maestro[bot]
GitHub
parent
38a1c438b7
commit
147128e365
3 changed files with 15 additions and 15 deletions
|
|
@ -7,9 +7,8 @@
|
|||
<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-core-setup-966115a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-966115a9/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" />
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
|
|
@ -22,6 +21,7 @@
|
|||
<add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
|
||||
<add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
|
||||
<add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-templating-247f60e9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-247f60e9/nuget/v3/index.json" />
|
||||
</packageSources>
|
||||
<disabledPackageSources>
|
||||
<clear />
|
||||
|
|
|
|||
|
|
@ -3,23 +3,23 @@
|
|||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.2">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
|
||||
<Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20067.4">
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20070.1">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
|
||||
<Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.2">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
|
||||
<Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.2">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
|
||||
<Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.2">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
|
||||
<Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
|
||||
|
|
@ -86,13 +86,13 @@
|
|||
<Sha>cbf29e13514ba9d3be54eff7ccfe4b9df93e581b</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">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-servicing.20069.13" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>9483a88b7764a74d71cbd449de6c56c1d5e0af21</Sha>
|
||||
<Sha>b3a34e6695615d67a167fdbc436fce1e885f986e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.2-servicing.20066.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.2-servicing.20069.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>589ace3c9fdfa0f1ea1640b82304a6a7ac597871</Sha>
|
||||
<Sha>b30a16a465c9a0ed7e641a9d55df2f6e5c878a81</Sha>
|
||||
</Dependency>
|
||||
<!-- This is so that WCF packages are included in the final drop for official releases. -->
|
||||
<!-- Replace with better solution, see https://github.com/dotnet/arcade/issues/4162 -->
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-servicing.19605.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-servicing.20069.13</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.2-servicing.20066.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.2-servicing.20069.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>3.1.2-servicing.20067.4</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>3.1.2-servicing.20070.1</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
|
||||
|
|
|
|||
Loading…
Reference in a new issue