Skip to content

Commit d982e56

Browse files
[main] Update dependencies from dotnet/windowsdesktop (#47840)
[main] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 10.0.0-preview.4.25170.5 to 10.0.0-preview.4.25174.5 (parent: Microsoft.WindowsDesktop.App.Ref) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 10.0.0-preview.4.25169.1 to 10.0.0-preview.4.25174.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates: from 10.0.0-preview.4.25170.5 to 10.0.0-preview.4.25174.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Merge branch 'main' into darc-main-5f245b26-a046-4682-8c69-442fe2ef13d2 - Delete src/SourceBuild/patches/windowsdesktop/0001-Remove-duplicate-msi.patch
1 parent 4b3fda2 commit d982e56

File tree

3 files changed

+20
-46
lines changed

3 files changed

+20
-46
lines changed

eng/Version.Details.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -278,26 +278,26 @@
278278
<Uri>https://github.com/dotnet/runtime</Uri>
279279
<Sha>659321ff5db13026f52aec70cf2a6692bd4be454</Sha>
280280
</Dependency>
281-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.4.25170.1">
281+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.4.25175.2">
282282
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
283-
<Sha>a5bc16422d329808a5dec9fdd17bcaeb549d57d4</Sha>
283+
<Sha>9b9b36d39805e6425972b4bc55947baa1ff76c8f</Sha>
284284
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
285285
</Dependency>
286-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25170.1">
286+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25175.2">
287287
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
288-
<Sha>a5bc16422d329808a5dec9fdd17bcaeb549d57d4</Sha>
288+
<Sha>9b9b36d39805e6425972b4bc55947baa1ff76c8f</Sha>
289289
</Dependency>
290-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.4.25170.1">
290+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.4.25175.2">
291291
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
292-
<Sha>a5bc16422d329808a5dec9fdd17bcaeb549d57d4</Sha>
292+
<Sha>9b9b36d39805e6425972b4bc55947baa1ff76c8f</Sha>
293293
</Dependency>
294-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.4.25170.1">
294+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.4.25175.2">
295295
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
296-
<Sha>a5bc16422d329808a5dec9fdd17bcaeb549d57d4</Sha>
296+
<Sha>9b9b36d39805e6425972b4bc55947baa1ff76c8f</Sha>
297297
</Dependency>
298-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.4.25170.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
298+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.4.25174.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
299299
<Uri>https://github.com/dotnet/wpf</Uri>
300-
<Sha>b6914d78eeb0dc62b8639ce577286c24c04fe901</Sha>
300+
<Sha>cfb39319579e90d22393205f0f4ee9fb20168a1f</Sha>
301301
</Dependency>
302302
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.4.25174.5">
303303
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -445,13 +445,13 @@
445445
<SourceBuild RepoName="razor" ManagedOnly="true" />
446446
</Dependency>
447447
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
448-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.4.25169.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
448+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.4.25174.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
449449
<Uri>https://github.com/dotnet/winforms</Uri>
450-
<Sha>e48889fa9696cd41d515ecb9191f8b78d39d66f2</Sha>
450+
<Sha>a0bf23a40dc5c81452c3b12180306e91c1bb35b4</Sha>
451451
</Dependency>
452-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.4.25170.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
452+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.4.25174.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
453453
<Uri>https://github.com/dotnet/wpf</Uri>
454-
<Sha>b6914d78eeb0dc62b8639ce577286c24c04fe901</Sha>
454+
<Sha>cfb39319579e90d22393205f0f4ee9fb20168a1f</Sha>
455455
</Dependency>
456456
<Dependency Name="Microsoft.Web.Xdt" Version="10.0.0-preview.25067.1">
457457
<Uri>https://github.com/dotnet/xdt</Uri>

eng/Versions.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</PropertyGroup>
9393
<PropertyGroup>
9494
<!-- Dependency from https://github.com/dotnet/winforms -->
95-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.4.25169.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
95+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.4.25174.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
9696
</PropertyGroup>
9797
<PropertyGroup>
9898
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -149,9 +149,9 @@
149149
</PropertyGroup>
150150
<PropertyGroup>
151151
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
152-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.4.25170.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
153-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.4.25170.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
154-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.4.25170.1</MicrosoftWindowsDesktopAppRefPackageVersion>
152+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.4.25175.2</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
153+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.4.25175.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
154+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.4.25175.2</MicrosoftWindowsDesktopAppRefPackageVersion>
155155
</PropertyGroup>
156156
<PropertyGroup>
157157
<!-- 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-preview.4.25170.5</MicrosoftNETSdkWindowsDesktopPackageVersion>
262-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.4.25170.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
261+
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.4.25174.5</MicrosoftNETSdkWindowsDesktopPackageVersion>
262+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.4.25174.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
263263
</PropertyGroup>
264264
<PropertyGroup Label="Infrastructure and test only dependencies">
265265
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>

src/SourceBuild/patches/windowsdesktop/0001-Remove-duplicate-msi.patch

-26
This file was deleted.

0 commit comments

Comments
 (0)