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

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

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

- Microsoft.WindowsDesktop.App - 5.0.0-alpha.1.20052.2
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-alpha.1.20052.2
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-alpha.1.20052.2

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-alpha1.20051.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha.1.20051.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

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

- Microsoft.WindowsDesktop.App - 5.0.0-alpha.1.20052.3
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-alpha.1.20052.3
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-alpha.1.20052.3

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-alpha1.20051.15 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha.1.20052.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
This commit is contained in:
dotnet-maestro[bot] 2020-01-02 12:56:07 +00:00 • committed by GitHub
parent 4718574af7
commit c658d237d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-alpha.1.20051.7">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-alpha.1.20052.3">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>0f4ed42e5d34c173791fa38660a7e03c795f68b0</Sha>
<Sha>a208a19506c85015b3414771f12e2895bf92d35f</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-alpha.1.20051.7">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-alpha.1.20052.3">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>0f4ed42e5d34c173791fa38660a7e03c795f68b0</Sha>
<Sha>a208a19506c85015b3414771f12e2895bf92d35f</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-alpha.1.20051.7">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-alpha.1.20052.3">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>0f4ed42e5d34c173791fa38660a7e03c795f68b0</Sha>
<Sha>a208a19506c85015b3414771f12e2895bf92d35f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-alpha.1.19564.1">
<Uri>https://github.com/dotnet/core-setup</Uri>
@ -88,13 +88,13 @@
<Sha>1a80278f88dbab0f7b3a531333eb5f9683b5703e</Sha>
</Dependency>
<!-- 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.20051.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-alpha1.20051.15" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>4691ddaecb8f6de0b3acdfc2beb2f2d014b5198a</Sha>
<Sha>fc97b5f1034666241284e23cbb39b95dc64d0615</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-alpha.1.20051.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-alpha.1.20052.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>562bbdbde2a296c7ef7f17dd3b5bcfdf761d112f</Sha>
<Sha>09fceef7558ecf6860042bddf5450402d925fd56</Sha>
</Dependency>
<!-- This is so that WCF packages are included in the final drop for official releases. -->
<!-- Replace with better solution, see https://github.com/dotnet/arcade/issues/4162 -->

10
eng/Versions.props
View file

@ -17,11 +17,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-alpha1.20051.9</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-alpha1.20051.15</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-alpha.1.20051.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-alpha.1.20052.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
@ -71,9 +71,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-alpha.1.20051.7</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-alpha.1.20051.7</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-alpha.1.20051.7</MicrosoftWindowsDesktopAppRefPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-alpha.1.20052.3</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-alpha.1.20052.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-alpha.1.20052.3</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->