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

[master] Update dependencies from dotnet/windowsdesktop (#5171)

Browse source 
* Update dependencies from https://github.com/dotnet/windowsdesktop build 20191008.4

- Microsoft.WindowsDesktop.App - 5.0.0-alpha1.19508.4

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-alpha1.19462.11 (parent: Microsoft.WindowsDesktop.App)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha1.19462.16 (parent: Microsoft.WindowsDesktop.App)

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20191008.5

- Microsoft.WindowsDesktop.App - 5.0.0-alpha1.19508.5

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-alpha1.19462.11 (parent: Microsoft.WindowsDesktop.App)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha1.19462.16 (parent: Microsoft.WindowsDesktop.App)

* Use dotnet/windowsdesktop outputs
This commit is contained in:
dotnet-maestro[bot] 2019-10-08 17:50:59 +00:00 • committed by GitHub
parent bdad1d25a4
commit dab2f0c140
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -2,9 +2,9 @@
<Dependencies>
<ProductDependencies>
<!-- Winforms / WPF -->
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-alpha1.19507.3">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f88738a6c69ffcfad8784c4cd7080efb99d474a9</Sha>
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-alpha1.19508.5">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>6db804ec52c804a0514fc4d19f48f3e36a8f3a14</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha1.19507.3">
<Uri>https://github.com/dotnet/core-setup</Uri>
@ -54,14 +54,14 @@
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>d282ff20f28166f0e35c63929cd2124c7ba09f6a</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="5.0.0-alpha1.19503.1" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-alpha1.19462.11" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>cf14d40dae262b353c5e2aa6cf0d35507dc279dc</Sha>
<Sha>aa251536c8ae637e95faf529480e8020d69aa361</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-alpha1.19504.4" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-alpha1.19462.16" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>2e840efbac4cf916fe35d22d279d42ed02915cc6</Sha>
<Sha>11a8ba5060577dbddae4303e53583f8d4a82f172</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>

8
eng/Versions.props
View file

@ -16,11 +16,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-alpha1.19503.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-alpha1.19462.11</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-alpha1.19504.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-alpha1.19462.16</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@ -53,10 +53,10 @@
<NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion>
<NetCoreAppHostPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-alpha1.19507.3</NETStandardLibraryRefPackageVersion>
<WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-alpha1.19507.3</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-alpha1.19508.5</MicrosoftWindowsDesktopAppPackageVersion>
<WindowsDesktopTargetingPackVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</WindowsDesktopTargetingPackVersion>
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup>

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

@ -70,7 +70,7 @@
<PropertyGroup>
<CoreSetupRootUrl>$(CoreSetupBlobRootUrl)Runtime/</CoreSetupRootUrl>
<AspNetCoreSharedFxRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/Runtime/</AspNetCoreSharedFxRootUrl>
<WinFormsAndWpfSharedFxRootUrl>$(CoreSetupRootUrl)</WinFormsAndWpfSharedFxRootUrl>
<WinFormsAndWpfSharedFxRootUrl>$(CoreSetupBlobRootUrl)WindowsDesktop/</WinFormsAndWpfSharedFxRootUrl>
<CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppPackageVersion)</CoreSetupDownloadDirectory>
<CombinedSharedHostAndFrameworkArchive>$(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension)</CombinedSharedHostAndFrameworkArchive>
</PropertyGroup>
@ -174,7 +174,7 @@
<BundledInstallerComponent Include="DownloadedWindowsDesktopTargetingPackInstallerFile"
Condition="'$(InstallerExtension)' == '.msi' And '$(SkipBuildingInstallers)' != 'true' And !$(Architecture.StartsWith('arm'))">
<BaseUrl>$(CoreSetupRootUrl)$(WindowsDesktopTargetingPackVersion)</BaseUrl>
<BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopTargetingPackVersion)</BaseUrl>
<DownloadFileName>$(DownloadedWindowsDesktopTargetingPackInstallerFileName)</DownloadFileName>
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
</BundledInstallerComponent>