Skip to content

Commit 8cb549d

Browse files
dotnet-maestro[bot]mmitcheMichaelSimons
authored
[release/10.0.1xx-preview1] Update dependencies from dotnet/windowsdesktop (#46365)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Mitchell <[email protected]> Co-authored-by: Michael Simons <[email protected]>
1 parent 62f1e07 commit 8cb549d

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -258,26 +258,26 @@
258258
<Uri>https://github.com/dotnet/runtime</Uri>
259259
<Sha>1da2ea4983bb5cc3d17a3806eebc435df4cd27dd</Sha>
260260
</Dependency>
261-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.25073.1">
261+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.1.25078.6">
262262
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
263-
<Sha>fddf6febb908b373a10351befbdfddce0a49d9f4</Sha>
263+
<Sha>a3a186ac31d84cc8157aa9b00b92039d1d5deedb</Sha>
264264
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
265265
</Dependency>
266-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.25073.1">
266+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.1.25078.6">
267267
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
268-
<Sha>fddf6febb908b373a10351befbdfddce0a49d9f4</Sha>
268+
<Sha>a3a186ac31d84cc8157aa9b00b92039d1d5deedb</Sha>
269269
</Dependency>
270-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.25073.1">
270+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.1.25078.6">
271271
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
272-
<Sha>fddf6febb908b373a10351befbdfddce0a49d9f4</Sha>
272+
<Sha>a3a186ac31d84cc8157aa9b00b92039d1d5deedb</Sha>
273273
</Dependency>
274-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.25073.1">
274+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.1.25078.6">
275275
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
276-
<Sha>fddf6febb908b373a10351befbdfddce0a49d9f4</Sha>
276+
<Sha>a3a186ac31d84cc8157aa9b00b92039d1d5deedb</Sha>
277277
</Dependency>
278-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.25073.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
278+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.1.25078.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
279279
<Uri>https://github.com/dotnet/wpf</Uri>
280-
<Sha>793610e3a5f45bcf23fa347e03f2b36780dc1a94</Sha>
280+
<Sha>c0d3c0bd6e8dad97b45780a48daf564be0ceb4c7</Sha>
281281
</Dependency>
282282
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.1.25079.4">
283283
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -405,13 +405,13 @@
405405
<Sha>3b0d8ebf433269137c0fb345446f5381440668f7</Sha>
406406
</Dependency>
407407
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
408-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-alpha.1.25072.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
408+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.1.25078.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
409409
<Uri>https://github.com/dotnet/winforms</Uri>
410-
<Sha>9a8b5a2a86123e583e234a0fa12fc34d716a7c88</Sha>
410+
<Sha>b86c3795fcde2ebc68ff7769ee7db3c5ac79f12f</Sha>
411411
</Dependency>
412-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-alpha.1.25073.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
412+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.1.25078.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
413413
<Uri>https://github.com/dotnet/wpf</Uri>
414-
<Sha>793610e3a5f45bcf23fa347e03f2b36780dc1a94</Sha>
414+
<Sha>c0d3c0bd6e8dad97b45780a48daf564be0ceb4c7</Sha>
415415
</Dependency>
416416
<Dependency Name="Microsoft.Web.Xdt" Version="10.0.0-preview.25067.1">
417417
<Uri>https://github.com/dotnet/xdt</Uri>

‎eng/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</PropertyGroup>
8585
<PropertyGroup>
8686
<!-- Dependency from https://github.com/dotnet/winforms -->
87-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.25072.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
87+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.1.25078.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
8888
</PropertyGroup>
8989
<PropertyGroup>
9090
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -140,9 +140,9 @@
140140
</PropertyGroup>
141141
<PropertyGroup>
142142
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
143-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.25073.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
144-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.25073.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
145-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.25073.1</MicrosoftWindowsDesktopAppRefPackageVersion>
143+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.1.25078.6</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
144+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.1.25078.6</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
145+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.1.25078.6</MicrosoftWindowsDesktopAppRefPackageVersion>
146146
</PropertyGroup>
147147
<PropertyGroup>
148148
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -251,8 +251,8 @@
251251
</PropertyGroup>
252252
<PropertyGroup>
253253
<!-- Dependencies from https://github.com/dotnet/wpf -->
254-
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.25073.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
255-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.25073.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
254+
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.1.25078.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
255+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.1.25078.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
256256
</PropertyGroup>
257257
<PropertyGroup Label="Template versions">
258258
<!-- 10.0 Template versions -->

‎src/SourceBuild/patches/winforms/0001-React-to-compiler-analyzer-warning-error.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Backport: https://github.com/dotnet/winforms/pull/12837
99
.../Private/Windows/Core/Nrbf/SerializationRecordExtensions.cs | 2 +-
1010
1 file changed, 1 insertion(+), 1 deletion(-)
1111

12-
diff --git a/src/System.Private.Windows.Core/src/System/Private/Windows/Core/Nrbf/SerializationRecordExtensions.cs b/src/System.Private.Windows.Core/src/System/Private/Windows/Core/Nrbf/SerializationRecordExtensions.cs
12+
diff --git a/src/System.Private.Windows.Core/src/System/Private/Windows/Nrbf/SerializationRecordExtensions.cs b/src/System.Private.Windows.Core/src/System/Private/Windows/Nrbf/SerializationRecordExtensions.cs
1313
index 7f9ba95a7..6537c9da0 100644
14-
--- a/src/System.Private.Windows.Core/src/System/Private/Windows/Core/Nrbf/SerializationRecordExtensions.cs
15-
+++ b/src/System.Private.Windows.Core/src/System/Private/Windows/Core/Nrbf/SerializationRecordExtensions.cs
14+
--- a/src/System.Private.Windows.Core/src/System/Private/Windows/Nrbf/SerializationRecordExtensions.cs
15+
+++ b/src/System.Private.Windows.Core/src/System/Private/Windows/Nrbf/SerializationRecordExtensions.cs
1616
@@ -349,7 +349,7 @@ internal static class SerializationRecordExtensions
1717
|| !classInfo.HasMember("_size")
1818
|| classInfo.GetRawValue("_size") is not int size

0 commit comments

Comments
 (0)