Skip to content

Commit b5a9089

Browse files
dotnet-maestro[bot]mthalmanViktorHofer
authored
[main] Update dependencies from dotnet/windowsdesktop (#44679)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Thalman <[email protected]> Co-authored-by: Viktor Hofer <[email protected]>
1 parent e21098f commit b5a9089

File tree

3 files changed

+20
-171
lines changed

3 files changed

+20
-171
lines changed

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -260,26 +260,26 @@
260260
<Uri>https://github.com/dotnet/runtime</Uri>
261261
<Sha>c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1</Sha>
262262
</Dependency>
263-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.24555.1">
263+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.24556.1">
264264
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
265-
<Sha>138cc3ba1a40bd175c576a6b85abc1b2e352545e</Sha>
265+
<Sha>19ba68fc870eee3aef71a146456ec905c1109ebb</Sha>
266266
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
267267
</Dependency>
268-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24555.1">
268+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24556.1">
269269
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
270-
<Sha>138cc3ba1a40bd175c576a6b85abc1b2e352545e</Sha>
270+
<Sha>19ba68fc870eee3aef71a146456ec905c1109ebb</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.24555.1">
272+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.24556.1">
273273
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
274-
<Sha>138cc3ba1a40bd175c576a6b85abc1b2e352545e</Sha>
274+
<Sha>19ba68fc870eee3aef71a146456ec905c1109ebb</Sha>
275275
</Dependency>
276-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24555.1">
276+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24556.1">
277277
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
278-
<Sha>138cc3ba1a40bd175c576a6b85abc1b2e352545e</Sha>
278+
<Sha>19ba68fc870eee3aef71a146456ec905c1109ebb</Sha>
279279
</Dependency>
280-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.24553.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
280+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.24555.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
281281
<Uri>https://github.com/dotnet/wpf</Uri>
282-
<Sha>68baa81fd05a248be5286d238bc85e67fc15b0c9</Sha>
282+
<Sha>3a1f91800de8d1303032a513b6dbe8bcd6f5a64f</Sha>
283283
</Dependency>
284284
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24555.17">
285285
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -396,13 +396,13 @@
396396
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
397397
</Dependency>
398398
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
399-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-alpha.1.24553.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
399+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-alpha.1.24555.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
400400
<Uri>https://github.com/dotnet/winforms</Uri>
401-
<Sha>c9aa1c92b9927cfa7ef959d8b735b192cfc50ccf</Sha>
401+
<Sha>65f897bc43dd631fac10cecf0571e3d5db782e4f</Sha>
402402
</Dependency>
403-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-alpha.1.24553.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
403+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-alpha.1.24555.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
404404
<Uri>https://github.com/dotnet/wpf</Uri>
405-
<Sha>68baa81fd05a248be5286d238bc85e67fc15b0c9</Sha>
405+
<Sha>3a1f91800de8d1303032a513b6dbe8bcd6f5a64f</Sha>
406406
</Dependency>
407407
<Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24522.2">
408408
<Uri>https://github.com/dotnet/xdt</Uri>

‎eng/Versions.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
</PropertyGroup>
100100
<PropertyGroup>
101101
<!-- Dependency from https://github.com/dotnet/winforms -->
102-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24553.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
102+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24555.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
103103
</PropertyGroup>
104104
<PropertyGroup>
105105
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -157,9 +157,9 @@
157157
</PropertyGroup>
158158
<PropertyGroup>
159159
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
160-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24555.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
161-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24555.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
162-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24555.1</MicrosoftWindowsDesktopAppRefPackageVersion>
160+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24556.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
161+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24556.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
162+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24556.1</MicrosoftWindowsDesktopAppRefPackageVersion>
163163
</PropertyGroup>
164164
<PropertyGroup>
165165
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -258,8 +258,8 @@
258258
</PropertyGroup>
259259
<PropertyGroup>
260260
<!-- Dependencies from https://github.com/dotnet/wpf -->
261-
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24553.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
262-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24553.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
261+
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24555.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
262+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24555.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
263263
</PropertyGroup>
264264
<PropertyGroup Label="Template versions">
265265
<!-- 10.0 Template versions -->

‎src/SourceBuild/patches/wpf/0001-Keep-apphostpack-version-in-sync-with-targeting-and-.patch‎

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)