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

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

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

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

Dependency coherency updates

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

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

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

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.2.20154.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.2.20154.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
This commit is contained in:
dotnet-maestro[bot] 2020-03-04 18:06:12 +00:00 committed by GitHub
parent 8792a64ee4
commit c05b17d87d
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.2.20154.2">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-preview.2.20154.4">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>f2b1ec980b8b1684bc9effa357543723d6f90646</Sha>
<Sha>ae1b40024be8eca5e05949bf6d36a4ce68c057bf</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.2.20154.2">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.2.20154.4">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>f2b1ec980b8b1684bc9effa357543723d6f90646</Sha>
<Sha>ae1b40024be8eca5e05949bf6d36a4ce68c057bf</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-preview.2.20154.2">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-preview.2.20154.4">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>f2b1ec980b8b1684bc9effa357543723d6f90646</Sha>
<Sha>ae1b40024be8eca5e05949bf6d36a4ce68c057bf</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.2.20154.1">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -84,13 +84,13 @@
<Sha>e596309d1fb1f4944f3f7706f3dc83343ddd14a4</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-preview.2.20153.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-preview.2.20154.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>d09f35325acda70d77b7ee090e4395dafa0f8226</Sha>
<Sha>a6624b38ba4d4609f69cfcb98add0edb058bfe9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-preview.2.20153.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-preview.2.20154.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>258edb218b8827709c7de940930d5e436680f1c2</Sha>
<Sha>51cae5cb209260fa1e8ceb0687f8d0111774bd8e</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-preview.2.20153.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-preview.2.20154.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-preview.2.20153.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-preview.2.20154.2</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.2.20154.2</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-preview.2.20154.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-preview.2.20154.2</MicrosoftWindowsDesktopAppRefPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-preview.2.20154.4</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-preview.2.20154.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-preview.2.20154.4</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->