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

Merge pull request #5768 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:
William Li 2019-12-05 10:54:40 -08:00 • committed by GitHub
commit 731d27c264
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.vsts-ci.yml
View file

@ -4,6 +4,7 @@ trigger:
include:
- master
- release/*
- internal/release/3.*
variables:
- name: _PublishBlobFeedUrl

3
NuGet.config
View file

@ -9,10 +9,9 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<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-templating-53a17fc-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-53a17fce-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-core-setup-c16a319" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-c16a3196/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-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-aspnet-AspNetCore-c31f51e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-c31f51e5/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- 3.0.1 assets are needed and not on nuget.org yet or other feeds below. Darc cannot see that due to nonstandard way these are pulled in to a non-3.0 branch -->
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />

52
eng/Version.Details.xml
View file

@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="3.1.0">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="3.1.1-servicing.19576.4">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>c16a31965d1ff8c4564d420610e2991265e77501</Sha>
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.0">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.1-servicing.19576.4">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>c16a31965d1ff8c4564d420610e2991265e77501</Sha>
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.1-servicing.19576.4">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>c16a31965d1ff8c4564d420610e2991265e77501</Sha>
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.0-rtm.19570.3">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.1-servicing.19576.4">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>c16a31965d1ff8c4564d420610e2991265e77501</Sha>
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.0">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.1-servicing.19576.4">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>c16a31965d1ff8c4564d420610e2991265e77501</Sha>
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.0">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.1-servicing.19576.4">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>c16a31965d1ff8c4564d420610e2991265e77501</Sha>
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.0">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.1-servicing.19576.4">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>c16a31965d1ff8c4564d420610e2991265e77501</Sha>
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</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,27 +41,27 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.0">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
<Sha>c31f51e5c778dc817862d0c932e7cfe9223d4899</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.0">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
<Sha>c31f51e5c778dc817862d0c932e7cfe9223d4899</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1" Version="3.1.0-rtm.19566.1">
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1" Version="3.1.0-rtm.19573.3">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
<Sha>c31f51e5c778dc817862d0c932e7cfe9223d4899</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.1.0-rtm.19566.1">
<Dependency Name="dotnet-dev-certs" Version="3.1.0-rtm.19573.3">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
<Sha>c31f51e5c778dc817862d0c932e7cfe9223d4899</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.1.0-rtm.19566.1">
<Dependency Name="dotnet-user-secrets" Version="3.1.0-rtm.19573.3">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
<Sha>c31f51e5c778dc817862d0c932e7cfe9223d4899</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="3.1.0-rtm.19566.1">
<Dependency Name="dotnet-watch" Version="3.1.0-rtm.19573.3">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
<Sha>c31f51e5c778dc817862d0c932e7cfe9223d4899</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.3.1" Version="1.0.2-beta4.19465.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -88,9 +88,9 @@
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>24b0195c1f4c4a707ca6c3a3bd4715a65fcd8bfe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-rtm.19568.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-rtm.19572.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>7aac1f7396bfc03177b1fc85b7d4e49b5222b102</Sha>
<Sha>e85bb34bcb91bf7b8859d6fd84fd440508498aea</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 -->

28
eng/Versions.props
View file

@ -20,7 +20,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-rtm.19568.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-rtm.19572.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
@ -32,16 +32,16 @@
</PropertyGroup>
<PropertyGroup>
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
<NUnit3DotNetNewTemplatePackageVersion>1.7.0</NUnit3DotNetNewTemplatePackageVersion>
<NUnit3DotNetNewTemplatePackageVersion>1.7.1</NUnit3DotNetNewTemplatePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.0</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.1.0</MicrosoftAspNetCoreAppRefPackageVersion>
<VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>3.1.0-rtm.19566.1</VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>
<dotnetdevcertsPackageVersion>3.1.0-rtm.19566.1</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.1.0-rtm.19566.1</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.1.0-rtm.19566.1</dotnetwatchPackageVersion>
<VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>3.1.0-rtm.19573.3</VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>
<dotnetdevcertsPackageVersion>3.1.0-rtm.19573.3</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.1.0-rtm.19573.3</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.1.0-rtm.19573.3</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
@ -61,13 +61,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<MicrosoftNETCoreAppInternalPackageVersion>3.1.0-rtm.19570.3</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.0</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.0</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.0</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.0</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.1-servicing.19576.4</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.1-servicing.19576.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.1-servicing.19576.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.1-servicing.19576.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>3.1.1-servicing.19576.4</MicrosoftWindowsDesktopAppRefPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
@ -93,7 +93,7 @@
<!-- 3.0 Template versions -->
<MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>4.8.0-rc2.19462.10</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
<MicrosoftDotNetWpfProjectTemplates30PackageVersion>3.0.0</MicrosoftDotNetWpfProjectTemplates30PackageVersion>
<NUnit3Templates30PackageVersion>1.6.4</NUnit3Templates30PackageVersion>
<NUnit3Templates30PackageVersion>1.6.5</NUnit3Templates30PackageVersion>
<MicrosoftDotNetCommonItemTemplates30PackageVersion>2.0.0-preview8.19373.1</MicrosoftDotNetCommonItemTemplates30PackageVersion>
<MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplates30PackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
<MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19354.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>