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

Merge pull request #4183 from dotnet/merges/release/3.0.1xx-to-release/3.1.1xx

Browse source 
Merge release/3.0.1xx to release/3.1.1xx
This commit is contained in:
Livar 2019-08-27 11:38:37 -07:00 committed by GitHub
commit 8ad2f7c111
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
eng/Version.Details.xml
View file

@ -14,45 +14,45 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f385116c74c1513e7e241f0586675486e9b25115</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview9.19419.1">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-rc1.19422.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>5678f84d60fd76ce417838b8a7a14bcd48cf3f91</Sha>
<Sha>4e142516c6872682a3472acd3860308c05800709</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview9.19419.1">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-rc1.19422.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>5678f84d60fd76ce417838b8a7a14bcd48cf3f91</Sha>
<Sha>4e142516c6872682a3472acd3860308c05800709</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview9.19419.1">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-rc1.19422.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>5678f84d60fd76ce417838b8a7a14bcd48cf3f91</Sha>
<Sha>4e142516c6872682a3472acd3860308c05800709</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview9.19419.1">
<Dependency Name="dotnet-dev-certs" Version="3.0.0-rc1.19422.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>5678f84d60fd76ce417838b8a7a14bcd48cf3f91</Sha>
<Sha>4e142516c6872682a3472acd3860308c05800709</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview9.19419.1">
<Dependency Name="dotnet-user-secrets" Version="3.0.0-rc1.19422.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>5678f84d60fd76ce417838b8a7a14bcd48cf3f91</Sha>
<Sha>4e142516c6872682a3472acd3860308c05800709</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="3.0.0-preview9.19419.1">
<Dependency Name="dotnet-watch" Version="3.0.0-rc1.19422.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>5678f84d60fd76ce417838b8a7a14bcd48cf3f91</Sha>
<Sha>4e142516c6872682a3472acd3860308c05800709</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0-preview8.19381.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>e8d6da33000a416b2b36b4f04b1756dcc99f671d</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-rc1.19421.21">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-rc1.19422.19">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>c6df6cad2c1889778fc047d1009f3e43c3d3559c</Sha>
<Sha>828045ec3ee15784b34fd27d10b88b5d9adf560e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview9.19413.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc1.19422.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a</Sha>
<Sha>83dffb6faab234c0c878e92c1679fa47c0cab3dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-rc1.19421.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-rc1.19422.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>e44cf532a8abc09e29a4f09864e28eb2bc2a447d</Sha>
<Sha>71744d3163293fc31cd1c1917929cf172d22bcaa</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.0-preview9.19415.10" CoherentParentDependency="Microsoft.WindowsDesktop.App">

18
eng/Versions.props
View file

@ -12,7 +12,7 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-rc1.19421.21</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-rc1.19422.19</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
@ -24,23 +24,23 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview9.19419.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview9.19419.1</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview9.19419.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-preview9.19419.1</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-preview9.19419.1</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-preview9.19419.1</dotnetwatchPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-rc1.19422.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-rc1.19422.2</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-rc1.19422.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-rc1.19422.2</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-rc1.19422.2</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-rc1.19422.2</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-rc1.19421.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-rc1.19422.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
<MicrosoftNETSdkPackageVersion>3.0.100-preview9.19413.5</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>3.0.100-rc1.19422.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>