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

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

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

- Microsoft.WindowsDesktop.App - 5.0.0-preview.1.20104.6
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.1.20104.6
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.1.20104.6

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.1.20104.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

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

- Microsoft.WindowsDesktop.App - 5.0.0-preview.1.20104.7
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.1.20104.7
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.1.20104.7

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.1.20104.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.1.20104.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

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

- Microsoft.WindowsDesktop.App - 5.0.0-preview.1.20104.8
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.1.20104.8
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.1.20104.8

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.1.20104.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.1.20104.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
This commit is contained in:
dotnet-maestro[bot] 2020-02-05 07:28:38 +00:00 • committed by GitHub
parent 6c25993629
commit fe1098364d
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-preview.1.20104.5">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-preview.1.20104.8">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>4970626c21f882bd97d5623ae2dcd306fa485608</Sha>
<Sha>2a98c849340007b422bb1f8d530a0742b9491319</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.1.20104.5">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.1.20104.8">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>4970626c21f882bd97d5623ae2dcd306fa485608</Sha>
<Sha>2a98c849340007b422bb1f8d530a0742b9491319</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-preview.1.20104.5">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-preview.1.20104.8">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>4970626c21f882bd97d5623ae2dcd306fa485608</Sha>
<Sha>2a98c849340007b422bb1f8d530a0742b9491319</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-alpha.1.20103.10">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -88,13 +88,13 @@
<Sha>faf758fade6e4333b366c433f543b997e9394f83</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-alpha.1.20104.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-preview.1.20104.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>f50a5d7c4a72dfdadb3e6495ccafc81706a8c066</Sha>
<Sha>0e543f7b4a3313d807e6cce34717f9031c0aaf25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-alpha.1.20104.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-preview.1.20104.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>c85a3048a995bea47eb2ff4181f357e3220ff3fd</Sha>
<Sha>135eca0c51ca71d3498b979da486025c141dad71</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

@ -21,11 +21,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-alpha.1.20104.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-preview.1.20104.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-alpha.1.20104.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-preview.1.20104.8</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
@ -75,9 +75,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-preview.1.20104.5</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-preview.1.20104.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-preview.1.20104.5</MicrosoftWindowsDesktopAppRefPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-preview.1.20104.8</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-preview.1.20104.8</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-preview.1.20104.8</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->