Skip to content

Commit 3fb7dd4

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[main] Update dependencies from dotnet/windowsdesktop (#47992)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent e6ec23d commit 3fb7dd4

File tree

3 files changed

+20
-43
lines changed

3 files changed

+20
-43
lines changed

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -278,26 +278,26 @@
278278
<Uri>https://github.com/dotnet/runtime</Uri>
279279
<Sha>65f01395f6af3131b9480e91671c8c96062bca11</Sha>
280280
</Dependency>
281-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.4.25177.2">
281+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.4.25179.1">
282282
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
283-
<Sha>bed6a81b30d9dabbb5aa6301c9e9152b671aed2a</Sha>
283+
<Sha>8c1790a883361a09db2145842a5b0780bfe702bf</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.25177.2">
286+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25179.1">
287287
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
288-
<Sha>bed6a81b30d9dabbb5aa6301c9e9152b671aed2a</Sha>
288+
<Sha>8c1790a883361a09db2145842a5b0780bfe702bf</Sha>
289289
</Dependency>
290-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.4.25177.2">
290+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.4.25179.1">
291291
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
292-
<Sha>bed6a81b30d9dabbb5aa6301c9e9152b671aed2a</Sha>
292+
<Sha>8c1790a883361a09db2145842a5b0780bfe702bf</Sha>
293293
</Dependency>
294-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.4.25177.2">
294+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.4.25179.1">
295295
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
296-
<Sha>bed6a81b30d9dabbb5aa6301c9e9152b671aed2a</Sha>
296+
<Sha>8c1790a883361a09db2145842a5b0780bfe702bf</Sha>
297297
</Dependency>
298-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.4.25177.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
298+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.4.25178.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
299299
<Uri>https://github.com/dotnet/wpf</Uri>
300-
<Sha>cfb8ddc81be25838a0d0c11142e04adbb4fc8903</Sha>
300+
<Sha>2a8258a72936092b24082c3e19f88d4b3e7e1e02</Sha>
301301
</Dependency>
302302
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.4.25178.6">
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.25174.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
448+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.4.25177.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
449449
<Uri>https://github.com/dotnet/winforms</Uri>
450-
<Sha>5e9dab651de1d8b4e8b379beac70319904ee1538</Sha>
450+
<Sha>5d908dd29c55b43598b14ece5a8e5429b965c058</Sha>
451451
</Dependency>
452-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.4.25177.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
452+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.4.25178.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
453453
<Uri>https://github.com/dotnet/wpf</Uri>
454-
<Sha>cfb8ddc81be25838a0d0c11142e04adbb4fc8903</Sha>
454+
<Sha>2a8258a72936092b24082c3e19f88d4b3e7e1e02</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‎

Lines changed: 6 additions & 6 deletions
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.25174.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
95+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.4.25177.2</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.25177.2</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
153-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.4.25177.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
154-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.4.25177.2</MicrosoftWindowsDesktopAppRefPackageVersion>
152+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.4.25179.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
153+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.4.25179.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
154+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.4.25179.1</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.25177.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
262-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.4.25177.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
261+
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.4.25178.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
262+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.4.25178.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
263263
</PropertyGroup>
264264
<PropertyGroup Label="Infrastructure and test only dependencies">
265265
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>

‎src/SourceBuild/patches/winforms/0001-Condition-out-the-native-tests-in-VMR.patch‎

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

0 commit comments

Comments
 (0)