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

Merge pull request #6511 from wli3/update-3.1.2-runtime

Browse source 
Update to 3.1.2 runtime
This commit is contained in:
msftbot[bot] 2020-02-21 23:47:53 +00:00 • committed by GitHub
commit 5c9dbda992
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 57 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NuGet.config
View file

@ -7,7 +7,9 @@
<packageSources> <packageSources>
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<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-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-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-c3acdcac-2/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--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-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" /> <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />

80
eng/Version.Details.xml
View file

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.1"> <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri> <Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha> <Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.1-servicing.19608.4"> <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20067.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri> <Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha> <Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.1"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri> <Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha> <Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.1"> <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri> <Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha> <Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.1"> <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri> <Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha> <Sha>966115a91565d43cd545c1b8acd83eda2a0cb4cb</Sha>
</Dependency> </Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack --> <!-- 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. --> <!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@ -41,33 +41,33 @@
<Uri>https://github.com/dotnet/corefx</Uri> <Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha> <Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.0"> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha> <Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.1"> <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha> <Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.1-servicing.19615.10"> <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.2-servicing.20068.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha> <Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.1.1-servicing.19615.10"> <Dependency Name="dotnet-dev-certs" Version="3.1.2-servicing.20068.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha> <Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.1.1-servicing.19615.10"> <Dependency Name="dotnet-user-secrets" Version="3.1.2-servicing.20068.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha> <Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-watch" Version="3.1.1-servicing.19615.10"> <Dependency Name="dotnet-watch" Version="3.1.2-servicing.20068.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha> <Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.3.1" Version="1.0.2-beta4.19570.1"> <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.3.1" Version="1.0.2-beta4.20079.1">
<Uri>https://github.com/dotnet/test-templates</Uri> <Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>5117d3d9d7dfd3583f0c42a639efaf092f957b7b</Sha> <Sha>07c739a22eeb760e60322ac0989c998328fe0aa2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.1-servicing.19605.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal"> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.1-servicing.19605.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/templating</Uri> <Uri>https://github.com/dotnet/templating</Uri>
@ -86,13 +86,13 @@
<Sha>003454db824f0bd58d0b7a967e42f11f20692a48</Sha> <Sha>003454db824f0bd58d0b7a967e42f11f20692a48</Sha>
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup --> <!-- 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> <Uri>https://github.com/dotnet/winforms</Uri>
<Sha>9483a88b7764a74d71cbd449de6c56c1d5e0af21</Sha> <Sha>b3a34e6695615d67a167fdbc436fce1e885f986e</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-rtm.19605.7" 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://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> <Uri>https://github.com/dotnet/wpf</Uri>
<Sha>a8e48616c8d8e56469a456eb1ee263268316b827</Sha> <Sha>b30a16a465c9a0ed7e641a9d55df2f6e5c878a81</Sha>
</Dependency> </Dependency>
<!-- This is so that WCF packages are included in the final drop for official releases. --> <!-- 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 --> <!-- Replace with better solution, see https://github.com/dotnet/arcade/issues/4162 -->

28
eng/Versions.props
View file

@ -16,11 +16,11 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- 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>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf --> <!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-rtm.19605.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion> <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.2-servicing.20069.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating --> <!-- Dependency from https://github.com/dotnet/templating -->
@ -28,7 +28,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates --> <!-- Dependency from https://github.com/dotnet/test-templates -->
<MicrosoftDotNetTestProjectTemplates31PackageVersion>1.0.2-beta4.20105.2</MicrosoftDotNetTestProjectTemplates31PackageVersion> <MicrosoftDotNetTestProjectTemplates31PackageVersion>1.0.2-beta4.20079.1</MicrosoftDotNetTestProjectTemplates31PackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' --> <!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
@ -36,12 +36,12 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore --> <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.1.0</MicrosoftAspNetCoreAppRefPackageVersion> <MicrosoftAspNetCoreAppRefPackageVersion>3.1.2</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.1-servicing.19615.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion> <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.2-servicing.20068.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.1.1-servicing.19615.10</dotnetdevcertsPackageVersion> <dotnetdevcertsPackageVersion>3.1.2-servicing.20068.1</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.1.1-servicing.19615.10</dotnetusersecretsPackageVersion> <dotnetusersecretsPackageVersion>3.1.2-servicing.20068.1</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.1.1-servicing.19615.10</dotnetwatchPackageVersion> <dotnetwatchPackageVersion>3.1.2-servicing.20068.1</dotnetwatchPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli --> <!-- Dependencies from https://github.com/dotnet/cli -->
@ -61,12 +61,12 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup --> <!-- Dependencies from https://github.com/dotnet/core-setup -->
<MicrosoftNETCoreAppInternalPackageVersion>3.1.1-servicing.19608.4</MicrosoftNETCoreAppInternalPackageVersion> <MicrosoftNETCoreAppInternalPackageVersion>3.1.2-servicing.20067.4</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.1</MicrosoftNETCoreAppHostwinx64PackageVersion> <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion> <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.1</MicrosoftNETCoreDotNetHostResolverPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion> <MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion> <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup> </PropertyGroup>

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

@ -15,7 +15,7 @@
<!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. --> <!-- 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> <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> <WindowsDesktopTargetingPackBlobVersion>3.1.0-rtm.19565.2</WindowsDesktopTargetingPackBlobVersion>
<NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion> <NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
</PropertyGroup> </PropertyGroup>