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

Merge branch 'release/3.0.1xx' into merges/release/3.0.100-preview9-to-release/3.0.1xx

Browse source
This commit is contained in:
Livar 2019-08-27 10:43:09 -07:00 committed by GitHub
commit 2243a75129
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
eng/Version.Details.xml
View file

@ -2,57 +2,57 @@
<Dependencies>
<ProductDependencies>
<!-- Winforms / WPF -->
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview9-19421-20">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-rc1-19426-11">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>33c773a5c7602e599053fdbb3a12b7ecfda27e2e</Sha>
<Sha>b33b6c20d855e7f9fdda6383ad12d849079f9b21</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview9-19421-20">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19426-11">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>33c773a5c7602e599053fdbb3a12b7ecfda27e2e</Sha>
<Sha>b33b6c20d855e7f9fdda6383ad12d849079f9b21</Sha>
</Dependency>
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview9-19421-20">
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-rc1-19426-11">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>33c773a5c7602e599053fdbb3a12b7ecfda27e2e</Sha>
<Sha>b33b6c20d855e7f9fdda6383ad12d849079f9b21</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview9.19422.3">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-rc1.19427.1">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>1b2010768e7bb0e42736763ad6e5eecca1838446</Sha>
<Sha>8d817f80700863f1f4139dd91c50bb006c2c22c7</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview9.19422.3">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-rc1.19427.1">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>1b2010768e7bb0e42736763ad6e5eecca1838446</Sha>
<Sha>8d817f80700863f1f4139dd91c50bb006c2c22c7</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview9.19422.3">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-rc1.19427.1">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>1b2010768e7bb0e42736763ad6e5eecca1838446</Sha>
<Sha>8d817f80700863f1f4139dd91c50bb006c2c22c7</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview9.19422.3">
<Dependency Name="dotnet-dev-certs" Version="3.0.0-rc1.19427.1">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>1b2010768e7bb0e42736763ad6e5eecca1838446</Sha>
<Sha>8d817f80700863f1f4139dd91c50bb006c2c22c7</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview9.19422.3">
<Dependency Name="dotnet-user-secrets" Version="3.0.0-rc1.19427.1">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>1b2010768e7bb0e42736763ad6e5eecca1838446</Sha>
<Sha>8d817f80700863f1f4139dd91c50bb006c2c22c7</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="3.0.0-preview9.19422.3">
<Dependency Name="dotnet-watch" Version="3.0.0-rc1.19427.1">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>1b2010768e7bb0e42736763ad6e5eecca1838446</Sha>
<Sha>8d817f80700863f1f4139dd91c50bb006c2c22c7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0-preview8.19381.4">
<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-preview9.19422.16">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-rc1.19427.5">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>5f4cbd190c1f603602e2f1d6c56dc9d0c5ff33a6</Sha>
<Sha>2c92f20c662f949730641ef2765ddcd42f1c08d3</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-preview9.19422.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-rc1.19426.13" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>40acde72a4d02045174281618a60c92f7593d074</Sha>
<Sha>d6eac03c6b0f411b5e7dba871eac7a7b77176b1a</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.19420.3" CoherentParentDependency="Microsoft.WindowsDesktop.App">

24
eng/Versions.props
View file

@ -12,7 +12,7 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview9.19422.16</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-rc1.19427.5</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
@ -24,27 +24,27 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview9.19422.3</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview9.19422.3</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview9.19422.3</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-preview9.19422.3</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-preview9.19422.3</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-preview9.19422.3</dotnetwatchPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-rc1.19427.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-rc1.19427.1</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-rc1.19427.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-rc1.19427.1</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-rc1.19427.1</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-rc1.19427.1</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview9.19422.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-rc1.19426.13</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>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview9-19421-20</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-rc1-19426-11</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
@ -52,11 +52,11 @@
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion>
<NetCoreAppHostPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview9-19421-20</NETStandardLibraryRefPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-rc1-19426-11</NETStandardLibraryRefPackageVersion>
<WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview9-19421-20</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-rc1-19426-11</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup>

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

@ -4,7 +4,7 @@
<VersionMinor>0</VersionMinor>
<VersionSDKMinor>1</VersionSDKMinor>
<VersionPatch>00</VersionPatch>
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview9</ReleaseSuffix>
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">rc1</ReleaseSuffix>
</PropertyGroup>
<Target Name="GetCoreSdkGitCommitInfo">

2
src/redist/targets/packaging/windows/clisdk/bundle.thm
View file

@ -92,7 +92,7 @@
<Text Name="FailureRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
<Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
<Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
<Text Name="FailureRestartText" X="-11" Y="-40" Width="400" Height="23" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
<Text Name="FailureRestartText" X="-11" Y="-40" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
<Button Name="FailureRestartButton" X="-131" Y="-11" Width="95" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
<Button Name="FailureCloseButton" X="-31" Y="-11" Width="95" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
</Page>