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

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

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

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

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

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

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.2.20151.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
This commit is contained in:
dotnet-maestro[bot] 2020-03-01 16:56:33 +00:00 • committed by GitHub
parent 1db4a219a6
commit 65f0cffcdf
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.20129.3">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-preview.2.20151.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>e802a97e935d417ef08644ec302fe8032257f778</Sha>
<Sha>25107012217e494a6b08c3e40afabdcc2f054034</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.2.20129.3">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.2.20151.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>e802a97e935d417ef08644ec302fe8032257f778</Sha>
<Sha>25107012217e494a6b08c3e40afabdcc2f054034</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-preview.2.20129.3">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-preview.2.20151.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>e802a97e935d417ef08644ec302fe8032257f778</Sha>
<Sha>25107012217e494a6b08c3e40afabdcc2f054034</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.2.20129.8">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -88,9 +88,9 @@
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>f1a411f4d7786bf9898df1af926c6e445ad38ecb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-preview.2.20129.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-preview.2.20151.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>9ec8badae73c9eedfa054efba33534583355a93c</Sha>
<Sha>301d90228e3c41e35c2268b5fc7778dd73719f57</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.20129.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-preview.2.20151.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.20129.3</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-preview.2.20129.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-preview.2.20129.3</MicrosoftWindowsDesktopAppRefPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-preview.2.20151.2</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-preview.2.20151.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-preview.2.20151.2</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->