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

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

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

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

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

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

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.2.20153.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
This commit is contained in:
dotnet-maestro[bot] 2020-03-03 17:16:46 +00:00 • committed by GitHub
parent b7a3df76d7
commit 2937766fc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
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.20152.5">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-preview.2.20153.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>b1a5f6198f80f36daf13e5a54a23e9c2c799dba8</Sha>
<Sha>531a266e1e3958276c132a44b1536add5a71407c</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.2.20152.5">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.2.20153.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>b1a5f6198f80f36daf13e5a54a23e9c2c799dba8</Sha>
<Sha>531a266e1e3958276c132a44b1536add5a71407c</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-preview.2.20152.5">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-preview.2.20153.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>b1a5f6198f80f36daf13e5a54a23e9c2c799dba8</Sha>
<Sha>531a266e1e3958276c132a44b1536add5a71407c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.2.20152.11">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -88,9 +88,9 @@
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>f3fabd7d33f5de68f915ef83334ea087d49612b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-preview.2.20152.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-preview.2.20153.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>c9d96d181b17c71bd7976af8793451bd13a8f66b</Sha>
<Sha>3b755e6131320378ca988c49bebabb6bbf82611d</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 -->

8
eng/Versions.props
View file

@ -25,7 +25,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-preview.2.20152.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-preview.2.20153.1</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.20152.5</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-preview.2.20152.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-preview.2.20152.5</MicrosoftWindowsDesktopAppRefPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-preview.2.20153.2</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-preview.2.20153.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-preview.2.20153.2</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->