Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/windowsdesktop #46261

Merged
merged 16 commits into from
Jan 31, 2025
Merged

[main] Update dependencies from dotnet/windowsdesktop #46261

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c175775
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 24, 2025
1594b7b
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 24, 2025
fadb442
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 25, 2025
8f4bea4
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 27, 2025
d89629e
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 27, 2025
1c77742
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 27, 2025
ff1db8d
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 28, 2025
6dbf1dc
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 28, 2025
4a6248e
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 28, 2025
1179c6b
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 29, 2025
5ed5a91
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 30, 2025
5db4c57
Merge branch 'main' into darc-main-d5043466-408c-41ae-b16e-87d69f8262cb
MichaelSimons Jan 30, 2025
28f876e
Update renamed path in VMR patch
MichaelSimons Jan 30, 2025
2fa867b
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 30, 2025
d4a7b13
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 30, 2025
ef9570c
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,26 +258,26 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a9d67ec265ed4078265d70d155d06316acadf6fe</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.25073.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.2.25080.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>fddf6febb908b373a10351befbdfddce0a49d9f4</Sha>
<Sha>c7ff7055e1dab9c348fb7a850e04d7191c3871cb</Sha>
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.25073.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.2.25080.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>fddf6febb908b373a10351befbdfddce0a49d9f4</Sha>
<Sha>c7ff7055e1dab9c348fb7a850e04d7191c3871cb</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.25073.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.2.25080.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>fddf6febb908b373a10351befbdfddce0a49d9f4</Sha>
<Sha>c7ff7055e1dab9c348fb7a850e04d7191c3871cb</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.25073.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.2.25080.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>fddf6febb908b373a10351befbdfddce0a49d9f4</Sha>
<Sha>c7ff7055e1dab9c348fb7a850e04d7191c3871cb</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.25073.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.2.25080.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>793610e3a5f45bcf23fa347e03f2b36780dc1a94</Sha>
<Sha>fcab981f78e179665090275998e0998b8d8c7b16</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.25073.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand Down Expand Up @@ -405,13 +405,13 @@
<Sha>febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b</Sha>
</Dependency>
<!-- 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="10.0.0-alpha.1.25072.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.2.25079.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>9a8b5a2a86123e583e234a0fa12fc34d716a7c88</Sha>
<Sha>2f013e0c297a4bcc14410307cc7aebe73207ad2c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-alpha.1.25073.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.2.25080.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>793610e3a5f45bcf23fa347e03f2b36780dc1a94</Sha>
<Sha>fcab981f78e179665090275998e0998b8d8c7b16</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="10.0.0-preview.25067.1">
<Uri>https://github.com/dotnet/xdt</Uri>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.25072.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.2.25079.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
Expand Down Expand Up @@ -139,9 +139,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.25073.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.25073.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.25073.1</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.2.25080.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.2.25080.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.2.25080.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
Expand Down Expand Up @@ -250,8 +250,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.25073.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.25073.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.2.25080.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.2.25080.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Template versions">
<!-- 10.0 Template versions -->
Expand Down
6 changes: 3 additions & 3 deletions src/SourceBuild/patches/winforms/0001-React-to-compiler-analyzer-warning-error.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Backport: https://github.com/dotnet/winforms/pull/12837
.../Private/Windows/Core/Nrbf/SerializationRecordExtensions.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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
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
index 7f9ba95a7..6537c9da0 100644
--- 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
--- 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
@@ -349,7 +349,7 @@ internal static class SerializationRecordExtensions
|| !classInfo.HasMember("_size")
|| classInfo.GetRawValue("_size") is not int size
Expand Down
Loading