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

Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx

Browse source
This commit is contained in:
Nick Guerrera 2019-09-30 11:38:51 -07:00
commit 9154996a8b
3 changed files with 37 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
eng/Version.Details.xml
View file

@ -2,31 +2,31 @@
<Dependencies>
<ProductDependencies>
<!-- Winforms / WPF -->
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.1.0-preview1.19475.6">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.1.0-preview1.19477.22">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>5fa4772596a1c18d62a179f39704160c7f6dc223</Sha>
<Sha>e5ea848cf4173815a04921132e163e9e8ee17587</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.0-preview1.19470.9">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.0-preview1.19477.22">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>72b39b0473993b932a08c8fc24a8988d45b416a5</Sha>
<Sha>e5ea848cf4173815a04921132e163e9e8ee17587</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview1.19475.6">
<Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview1.19477.22">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>5fa4772596a1c18d62a179f39704160c7f6dc223</Sha>
<Sha>e5ea848cf4173815a04921132e163e9e8ee17587</Sha>
</Dependency>
<Uri>https://github.com/dotnet/core-setup</Uri>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetAppHost" Version="3.1.0-preview1.19470.9">
<Dependency Name="Microsoft.NETCore.DotNetAppHost" Version="3.1.0-preview1.19477.22">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>72b39b0473993b932a08c8fc24a8988d45b416a5</Sha>
<Sha>e5ea848cf4173815a04921132e163e9e8ee17587</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.0-preview1.19470.9">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.0-preview1.19477.22">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>72b39b0473993b932a08c8fc24a8988d45b416a5</Sha>
<Sha>e5ea848cf4173815a04921132e163e9e8ee17587</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.0-preview1.19470.9">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.0-preview1.19477.22">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>72b39b0473993b932a08c8fc24a8988d45b416a5</Sha>
<Sha>e5ea848cf4173815a04921132e163e9e8ee17587</Sha>
</Dependency>
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
@ -62,30 +62,30 @@
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>1937c804fa83ee3adddc7e648c610f880c24188e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.1-servicing.19476.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.0-preview1.19476.7" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>a776e417c83c52908298b3767e462feae8b18b98</Sha>
<Sha>fa98e14b1b8d84a1a711ef909384f16ada8bbe7c</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.100-preview1.19474.6">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.100-preview1.19480.2">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>256b3e07a94d90a0585b1f8da8d3b99526272637</Sha>
<Sha>caaf8a50f875e9857d3c56a6e8a020c60f6830d5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.100-preview1.19469.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.100-preview1.19477.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>902380600200731914d936fca50b60e3e06dcb16</Sha>
<Sha>8cfc10488c50eea7b0562f5de36dcdc64bf2fb37</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.100-preview1.19474.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.100-preview1.19479.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>4a9e195d7123e1c3d774cf8e6881d3ff93f47c44</Sha>
<Sha>448a99fcc1eac067880ba4263bd6a3945d0f76de</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.1-preview1.19474.4" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-preview1.19476.2" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>066b5db8f092c09d8e2d46c27d355e29d1d28d69</Sha>
<Sha>3e3e5cde020a9084e8eab4c4f1a278b9d7e63566</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-preview1.19475.5" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-preview1.19476.4" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>4d424cad44e237f1607c2a61485aa6ee2df5ce43</Sha>
<Sha>a0912c73f4a4069f28aa0483ad7b0ed30d745018</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>

24
eng/Versions.props
View file

@ -12,15 +12,15 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.1.100-preview1.19474.6</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>3.1.100-preview1.19480.2</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-preview1.19474.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-preview1.19476.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-preview1.19475.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-preview1.19476.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@ -33,33 +33,33 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.100-preview1.19474.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.100-preview1.19479.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
<MicrosoftNETSdkPackageVersion>3.1.100-preview1.19469.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>3.1.100-preview1.19477.6</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.0-preview1.19470.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.1.0-preview1.19475.6</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.0-preview1.19477.22</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.1.0-preview1.19477.22/MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>3.1.0-preview1.19470.9</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.0-preview1.19470.9</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>3.1.0-preview1.19477.22</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.0-preview1.19477.22</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<SharedHostVersion>$(MicrosoftNETCoreDotNetHostResolverPackageVersion)</SharedHostVersion>
<HostFxrVersion>$(MicrosoftNETCoreDotNetAppHostPackageVersion)</HostFxrVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0-preview1.19470.9</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0-preview1.19477.22</MicrosoftNETCoreAppRefPackageVersion>
<NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackVersion>
<NetCoreAppHostPackVersion>$(MicrosoftNETCoreDotNetAppHostPackageVersion)</NetCoreAppHostPackVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
<WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppRefPackageVersion)</WindowsDesktopTargetingPackVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.0-preview1.19470.9</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.1.0-preview1.19475.6</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.0-preview1.19477.22</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.1.0-preview1.19477.22</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup>

1
src/redist/targets/Signing.targets
View file

@ -175,6 +175,7 @@
DependsOnTargets="SetSignProps">
<ItemGroup>
<TemplatesMsiFilesToSign Include="$(Templates31MSIInstallerFile)" />
<TemplatesMsiFilesToSign Include="$(Templates30MSIInstallerFile)" />
<TemplatesMsiFilesToSign Include="$(Templates22MSIInstallerFile)" />
<TemplatesMsiFilesToSign Include="$(Templates21MSIInstallerFile)" />