Update dependencies from https://github.com/dotnet/windowsdesktop build 20200331.12 (#7010)
- Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20181.12 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20181.12 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20181.12 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20180.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20181.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
parent
3ee962859a
commit
64c735dc55
2 changed files with 15 additions and 15 deletions
|
@ -1,17 +1,17 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Dependencies>
|
<Dependencies>
|
||||||
<ProductDependencies>
|
<ProductDependencies>
|
||||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-preview.4.20180.8">
|
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-preview.3.20181.12">
|
||||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||||
<Sha>782ad0dc9914821cc2ad1b9c8de6630a044d3576</Sha>
|
<Sha>a6c334f0aa0df17ae04847041049c9cc9a7cf3b1</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.4.20180.8">
|
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.3.20181.12">
|
||||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||||
<Sha>782ad0dc9914821cc2ad1b9c8de6630a044d3576</Sha>
|
<Sha>a6c334f0aa0df17ae04847041049c9cc9a7cf3b1</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-preview.4.20180.8">
|
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-preview.3.20181.12">
|
||||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||||
<Sha>782ad0dc9914821cc2ad1b9c8de6630a044d3576</Sha>
|
<Sha>a6c334f0aa0df17ae04847041049c9cc9a7cf3b1</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.3.20169.1">
|
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.3.20169.1">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||||
|
@ -84,13 +84,13 @@
|
||||||
<Sha>c7272154b12830d822c7414b5ed4c765b3c0c415</Sha>
|
<Sha>c7272154b12830d822c7414b5ed4c765b3c0c415</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
<!-- 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.4.20180.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-preview.3.20180.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||||
<Sha>cf98008886b999206fd4de4666b1e4b904577f4f</Sha>
|
<Sha>8138bd0e8bd045589aa735ee1501acec40923eb6</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-preview.4.20180.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-preview.3.20181.13" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||||
<Sha>1283ba2a8dff8235ef239619542af858d5c119c6</Sha>
|
<Sha>2a7a3bc14e0a7d7165c19b7d9e4615e556b023f6</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<!-- This is so that WCF packages are included in the final drop for official releases. -->
|
<!-- 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 -->
|
<!-- Replace with better solution, see https://github.com/dotnet/arcade/issues/4162 -->
|
||||||
|
|
|
@ -17,11 +17,11 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-preview.4.20180.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-preview.3.20180.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-preview.4.20180.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-preview.3.20181.13</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||||
|
@ -69,9 +69,9 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||||
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-preview.4.20180.8</MicrosoftWindowsDesktopAppPackageVersion>
|
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-preview.3.20181.12</MicrosoftWindowsDesktopAppPackageVersion>
|
||||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-preview.4.20180.8</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-preview.3.20181.12</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||||
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-preview.4.20180.8</MicrosoftWindowsDesktopAppRefPackageVersion>
|
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-preview.3.20181.12</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||||
|
|
Loading…
Reference in a new issue