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

Merge pull request #6179 from dotnet-maestro-bot/merge/release/3.1.1xx-to-release/3.1.2xx

Browse source 
[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'
This commit is contained in:
Sarah Oslund 2020-01-21 12:54:58 -08:00 committed by GitHub
commit 762f617853
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
NuGet.config
View file

@ -7,11 +7,11 @@
<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-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-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-aspnet-AspNetCore-2b7e994" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-2b7e994b/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.-->
<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" />

72
eng/Version.Details.xml
View file

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.2">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.1-servicing.19608.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20067.4">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.2">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.2">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.2">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</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. -->
@ -41,29 +41,29 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.0">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.2">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.2">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.1-servicing.19615.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.2-servicing.20068.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.1.1-servicing.19615.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
<Dependency Name="dotnet-dev-certs" Version="3.1.2-servicing.20068.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.1.1-servicing.19615.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
<Dependency Name="dotnet-user-secrets" Version="3.1.2-servicing.20068.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="3.1.1-servicing.19615.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
<Dependency Name="dotnet-watch" Version="3.1.2-servicing.20068.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.3.1" Version="1.0.2-beta4.19570.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -90,9 +90,9 @@
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>9483a88b7764a74d71cbd449de6c56c1d5e0af21</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-rtm.19605.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>a8e48616c8d8e56469a456eb1ee263268316b827</Sha>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.2-servicing.20066.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>589ace3c9fdfa0f1ea1640b82304a6a7ac597871</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 -->

26
eng/Versions.props
View file

@ -20,11 +20,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-rtm.19605.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.2-servicing.20066.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>3.1.1-servicing.19605.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>3.1.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
@ -36,12 +36,12 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.1.0</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.1-servicing.19615.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.1.1-servicing.19615.10</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.1.1-servicing.19615.10</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.1.1-servicing.19615.10</dotnetwatchPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.1.2</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.2-servicing.20068.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.1.2-servicing.20068.1</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.1.2-servicing.20068.1</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.1.2-servicing.20068.1</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
@ -61,12 +61,12 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<MicrosoftNETCoreAppInternalPackageVersion>3.1.1-servicing.19608.4</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.2-servicing.20067.4</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>

2
src/redist/targets/GenerateLayout.targets
View file

@ -16,7 +16,7 @@
<!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
<NETCoreAppTargetingPackBlobVersion>3.1.0-rtm.19565.2</NETCoreAppTargetingPackBlobVersion>
<AspNetCoreTargetingPackBlobVersion>3.1.0</AspNetCoreTargetingPackBlobVersion>
<AspNetCoreTargetingPackBlobVersion>3.1.2-servicing.20068.1</AspNetCoreTargetingPackBlobVersion>
<WindowsDesktopTargetingPackBlobVersion>3.1.0-rtm.19565.2</WindowsDesktopTargetingPackBlobVersion>
<NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
</PropertyGroup>

2
src/redist/targets/Versions.targets
View file

@ -8,7 +8,7 @@
<!--
When DropSuffix is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
<DropSuffix>true</DropSuffix>
<DropSuffix>false</DropSuffix>
</PropertyGroup>
<Target Name="GetCoreSdkGitCommitInfo">