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-28 11:22:33 -07:00 committed by GitHub
commit ccdda73b1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
eng/Version.Details.xml
View file

@ -2,66 +2,66 @@
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<!-- Winforms / WPF --> <!-- Winforms / WPF -->
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview9-19423-09"> <Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-rc1-19427-09">
<Uri>https://github.com/dotnet/core-setup</Uri> <Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>2be172345a420387413bab7ce9053a52624c4461</Sha> <Sha>d90543c070331ee577067ee7aedf709d80588a66</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview9-19423-09"> <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19427-09">
<Uri>https://github.com/dotnet/core-setup</Uri> <Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>2be172345a420387413bab7ce9053a52624c4461</Sha> <Sha>d90543c070331ee577067ee7aedf709d80588a66</Sha>
</Dependency> </Dependency>
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview9-19423-09"> <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-rc1-19427-09">
<Uri>https://github.com/dotnet/core-setup</Uri> <Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>2be172345a420387413bab7ce9053a52624c4461</Sha> <Sha>d90543c070331ee577067ee7aedf709d80588a66</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview9.19424.4"> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-rc1.19427.14">
<Uri>https://github.com/aspnet/AspNetCore</Uri> <Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>66de493473521e173fa15ca557f5f97601cedb23</Sha> <Sha>649bcc8f616a856d8db3627d74f2d1edfb4526d5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview9.19424.4"> <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-rc1.19427.14">
<Uri>https://github.com/aspnet/AspNetCore</Uri> <Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>66de493473521e173fa15ca557f5f97601cedb23</Sha> <Sha>649bcc8f616a856d8db3627d74f2d1edfb4526d5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview9.19424.4"> <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-rc1.19427.14">
<Uri>https://github.com/aspnet/AspNetCore</Uri> <Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>66de493473521e173fa15ca557f5f97601cedb23</Sha> <Sha>649bcc8f616a856d8db3627d74f2d1edfb4526d5</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview9.19424.4"> <Dependency Name="dotnet-dev-certs" Version="3.0.0-rc1.19427.14">
<Uri>https://github.com/aspnet/AspNetCore</Uri> <Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>66de493473521e173fa15ca557f5f97601cedb23</Sha> <Sha>649bcc8f616a856d8db3627d74f2d1edfb4526d5</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview9.19424.4"> <Dependency Name="dotnet-user-secrets" Version="3.0.0-rc1.19427.14">
<Uri>https://github.com/aspnet/AspNetCore</Uri> <Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>66de493473521e173fa15ca557f5f97601cedb23</Sha> <Sha>649bcc8f616a856d8db3627d74f2d1edfb4526d5</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-watch" Version="3.0.0-preview9.19424.4"> <Dependency Name="dotnet-watch" Version="3.0.0-rc1.19427.14">
<Uri>https://github.com/aspnet/AspNetCore</Uri> <Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>66de493473521e173fa15ca557f5f97601cedb23</Sha> <Sha>649bcc8f616a856d8db3627d74f2d1edfb4526d5</Sha>
</Dependency> </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> <Uri>https://github.com/dotnet/templating</Uri>
<Sha>e8d6da33000a416b2b36b4f04b1756dcc99f671d</Sha> <Sha>e8d6da33000a416b2b36b4f04b1756dcc99f671d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview9.19426.19"> <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-rc1.19428.8">
<Uri>https://github.com/dotnet/toolset</Uri> <Uri>https://github.com/dotnet/toolset</Uri>
<Sha>09b1fb2a89520ab36ad81eeaeedc3c1104df12fa</Sha> <Sha>e03a1bcdb2302f842acef42fb371c84bc21161e0</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview9.19426.11" 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> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>1c91e0a4d59ba7d254637f3e3a430ad3aab6992f</Sha> <Sha>83dffb6faab234c0c878e92c1679fa47c0cab3dd</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview9.19426.10" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-rc1.19428.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/cli</Uri> <Uri>https://github.com/dotnet/cli</Uri>
<Sha>2859af6e958aa74edfa69ceffa33f1338996e011</Sha> <Sha>5f205ac1256138f818bba051a57be722bc0138cb</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.0-preview9.19420.3" CoherentParentDependency="Microsoft.WindowsDesktop.App"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-preview9.19415.10" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Uri>https://github.com/dotnet/winforms</Uri> <Uri>https://github.com/dotnet/winforms</Uri>
<Sha>7f2c6adc229513b8a3690d0c59079073a783d33f</Sha> <Sha>8b19141d6b0b221167bd7d1731cbc6aa9898da75</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview9.19421.3" CoherentParentDependency="Microsoft.WindowsDesktop.App"> <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview9.19416.2" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Uri>https://github.com/dotnet/wpf</Uri> <Uri>https://github.com/dotnet/wpf</Uri>
<Sha>4524e3a8b4d8ebc8643b6e2185a597700261e1fb</Sha> <Sha>105b673bddd8665580a94878db12ac97af8fa794</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>

28
eng/Versions.props
View file

@ -12,39 +12,39 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel> <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview9.19426.19</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-rc1.19428.8</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview9.19420.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview9.19415.10</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf --> <!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview9.19421.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion> <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview9.19416.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore --> <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview9.19424.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-rc1.19427.14</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview9.19424.4</MicrosoftAspNetCoreAppRefPackageVersion> <MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-rc1.19427.14</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview9.19424.4</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion> <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-rc1.19427.14</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-preview9.19424.4</dotnetdevcertsPackageVersion> <dotnetdevcertsPackageVersion>3.0.0-rc1.19427.14</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-preview9.19424.4</dotnetusersecretsPackageVersion> <dotnetusersecretsPackageVersion>3.0.0-rc1.19427.14</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-preview9.19424.4</dotnetwatchPackageVersion> <dotnetwatchPackageVersion>3.0.0-rc1.19427.14</dotnetwatchPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli --> <!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview9.19426.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-rc1.19428.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk (to run tests) --> <!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
<MicrosoftNETSdkPackageVersion>3.0.100-preview9.19426.11</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>3.0.100-rc1.19422.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview9-19423-09</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreAppPackageVersion>3.0.0-rc1-19427-09</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion> <MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetAppHostPackageVersion> <MicrosoftNETCoreDotNetAppHostPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
@ -52,11 +52,11 @@
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion> <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion> <NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion>
<NetCoreAppHostPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackVersion> <NetCoreAppHostPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview9-19423-09</NETStandardLibraryRefPackageVersion> <NETStandardLibraryRefPackageVersion>2.1.0-rc1-19427-09</NETStandardLibraryRefPackageVersion>
<WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion> <WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion> <AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion> <AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview9-19423-09</MicrosoftWindowsDesktopAppPackageVersion> <MicrosoftWindowsDesktopAppPackageVersion>3.0.0-rc1-19427-09</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion> <MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

2
src/CopyToLatest/targets/BranchInfo.props
View file

@ -1,5 +1,5 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Channel>release/3.0.100-preview9</Channel> <Channel>release/3.0.1xx</Channel>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

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

@ -4,7 +4,7 @@
<VersionMinor>0</VersionMinor> <VersionMinor>0</VersionMinor>
<VersionSDKMinor>1</VersionSDKMinor> <VersionSDKMinor>1</VersionSDKMinor>
<VersionPatch>00</VersionPatch> <VersionPatch>00</VersionPatch>
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview9</ReleaseSuffix> <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">rc1</ReleaseSuffix>
</PropertyGroup> </PropertyGroup>
<Target Name="GetCoreSdkGitCommitInfo"> <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> <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="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" /> <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="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> <Button Name="FailureCloseButton" X="-31" Y="-11" Width="95" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
</Page> </Page>