From 84b86f134202e79bf903dc408c09e160dbc8f515 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 02:12:49 +0000 Subject: [PATCH] =?UTF-8?q?[wpf]=20Source=20update=20900946a=20=E2=86=92?= =?UTF-8?q?=200567cc2=20Diff:=20https://github.com/dotnet/wpf/compare/9009?= =?UTF-8?q?46a8e06533fd7ea8909d91b0c879a7c1f9be..0567cc262408546036a3f57b1?= =?UTF-8?q?d60d42eb083e5df?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: https://github.com/dotnet/wpf/commit/900946a8e06533fd7ea8909d91b0c879a7c1f9be To: https://github.com/dotnet/wpf/commit/0567cc262408546036a3f57b1d60d42eb083e5df [[ commit created by automation ]] --- src/source-manifest.json | 52 +++++----- src/wpf/eng/Version.Details.xml | 94 +++++++++---------- src/wpf/eng/Versions.props | 42 ++++----- src/wpf/global.json | 4 +- .../Resources/xlf/Strings.ja.xlf | 2 +- .../Resources/Theme/Dark.xaml | 1 + .../Resources/Theme/HC.xaml | 1 + .../Resources/Theme/Light.xaml | 1 + .../Styles/DataGrid.xaml | 1 + .../Styles/DatePicker.xaml | 19 ++-- .../Themes/Fluent.Dark.xaml | 11 ++- .../Themes/Fluent.HC.xaml | 11 ++- .../Themes/Fluent.Light.xaml | 11 ++- .../Themes/Fluent.xaml | 10 +- 14 files changed, 133 insertions(+), 127 deletions(-) diff --git a/src/source-manifest.json b/src/source-manifest.json index d3d733969c8..f9011e37238 100644 --- a/src/source-manifest.json +++ b/src/source-manifest.json @@ -7,10 +7,10 @@ "commitSha": "4e526204e83e615efe8eb5743be7fbccfa4e492a" }, { - "barId": 275017, + "barId": 275303, "path": "aspnetcore", "remoteUri": "https://github.com/dotnet/aspnetcore", - "commitSha": "f905bebf6206d90192c66e84993963f2f8a506c4" + "commitSha": "9d4270cd93259b2ad6740bd8bb8315615ce93c94" }, { "barId": 273742, @@ -19,10 +19,10 @@ "commitSha": "95da703c5b2c85bf4c81b92c1ea1994c7de4970f" }, { - "barId": 274651, + "barId": 275338, "path": "command-line-api", "remoteUri": "https://github.com/dotnet/command-line-api", - "commitSha": "12473cd29fac1b9070c71ed8f5a43cada6872905" + "commitSha": "dbc3781d3398b69cd9ffe24f60a7b77110bdadbf" }, { "barId": 274234, @@ -31,16 +31,16 @@ "commitSha": "227da60247996ce95c272cdb5941163c669224e8" }, { - "barId": 275020, + "barId": 275333, "path": "diagnostics", "remoteUri": "https://github.com/dotnet/diagnostics", - "commitSha": "c3c57bbd7ce6950087b2e99be7a1a1170cf94923" + "commitSha": "15863918a40fc31d0498ca5f1b8a5f7f7ada113a" }, { - "barId": 274910, + "barId": 275325, "path": "efcore", "remoteUri": "https://github.com/dotnet/efcore", - "commitSha": "fa310bbb8fb21987d6b0916faa01beacc104a3cf" + "commitSha": "bc5def338228c7ec5ab5d46f6e9042439270f438" }, { "barId": 274251, @@ -55,10 +55,10 @@ "commitSha": "4afdc9ffe3543c8fbd2b0b1271624a965bf7f48e" }, { - "barId": 274806, + "barId": 275247, "path": "msbuild", "remoteUri": "https://github.com/dotnet/msbuild", - "commitSha": "f51a5b98ca1efd516dcfdedf23153dfa03a1014d" + "commitSha": "8e5dc5aa32d9dc2e95f52651640dcb28815402ae" }, { "barId": 271771, @@ -67,16 +67,16 @@ "commitSha": "772ee13d2bafaa1414d90dbfbd77e0941115ef19" }, { - "barId": 274804, + "barId": 275165, "path": "razor", "remoteUri": "https://github.com/dotnet/razor", - "commitSha": "ce330d020d1686e80f5ed4aec2e66f12c4f505b5" + "commitSha": "88d10f21004784390b5e220607bd4fa6ebfe1301" }, { - "barId": 274992, + "barId": 275167, "path": "roslyn", "remoteUri": "https://github.com/dotnet/roslyn", - "commitSha": "d3571ef089ef13c74ea786dce8ef615916a097cd" + "commitSha": "c1794aa58db74f27cd6bc7afc1b1d72b713f393b" }, { "barId": 273951, @@ -85,10 +85,10 @@ "commitSha": "714a51c57430dab50b67e5b468016288f5f7b0bd" }, { - "barId": 275054, + "barId": 275332, "path": "runtime", "remoteUri": "https://github.com/dotnet/runtime", - "commitSha": "9c0555e89d91149226cfade4a395e02b8d9401ff" + "commitSha": "6d7ba3656fa078fb17e68b4e31dc9fd9ff9868da" }, { "barId": 273704, @@ -103,10 +103,10 @@ "commitSha": "1414d33c86e760d6635a838a45da0308ff3d53c9" }, { - "barId": 275117, + "barId": 275454, "path": "source-build-reference-packages", "remoteUri": "https://github.com/dotnet/source-build-reference-packages", - "commitSha": "9f13ec67aeca9a84458549b440c1b0e33df71b44" + "commitSha": "e66cb9556591cff76527ba15386357bc2f463c7c" }, { "barId": 274866, @@ -121,16 +121,16 @@ "commitSha": "66c6797a1e9a9346d5f6de3f9edaecad6e4350d0" }, { - "barId": 274065, + "barId": 275177, "path": "templating", "remoteUri": "https://github.com/dotnet/templating", - "commitSha": "57150459685ad38272234d96c17036c2cd2f3b96" + "commitSha": "43d52c423e7ed37cf59a01629f9bace5c6bf6f96" }, { - "barId": 272429, + "barId": 275283, "path": "vstest", "remoteUri": "https://github.com/microsoft/vstest", - "commitSha": "cdcfb7f5c163d7b7a555b129522c3b868f73e92c" + "commitSha": "8b102963a8cce7809a6956fe0a6df5cb93b2447a" }, { "barId": 273947, @@ -139,16 +139,16 @@ "commitSha": "7890fbb7f086ae12b11ca85499b18f460c9090dd" }, { - "barId": 274987, + "barId": 275281, "path": "winforms", "remoteUri": "https://github.com/dotnet/winforms", - "commitSha": "d5b62a713f569a578805301a2bc77e7dfe60b36d" + "commitSha": "6dd129e422c9b14dc835e669688247386bef2f95" }, { - "barId": 274919, + "barId": 275380, "path": "wpf", "remoteUri": "https://github.com/dotnet/wpf", - "commitSha": "46685670c98a9e003ca98df637f68092d3b2cb65" + "commitSha": "0567cc262408546036a3f57b1d60d42eb083e5df" }, { "barId": 274010, diff --git a/src/wpf/eng/Version.Details.xml b/src/wpf/eng/Version.Details.xml index 8b10c203b59..583716f628c 100644 --- a/src/wpf/eng/Version.Details.xml +++ b/src/wpf/eng/Version.Details.xml @@ -1,104 +1,104 @@ - + - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + 78061f4bcc414fa2054be6237b1fd3813d8edf6b diff --git a/src/wpf/eng/Versions.props b/src/wpf/eng/Versions.props index 4899b503af3..165eb582b5d 100644 --- a/src/wpf/eng/Versions.props +++ b/src/wpf/eng/Versions.props @@ -19,33 +19,33 @@ dotnet/winforms is handling versions for the analyzers. --> $(MajorVersion).$(MinorVersion).0.0 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 + 10.0.0-beta.25365.101 + 10.0.0-beta.25365.101 + 10.0.0-beta.25365.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 4.6.0-preview4.19176.11 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 + 10.0.0-preview.7.25365.101 @@ -59,7 +59,7 @@ 9.0.0-beta.24053.1 - 10.0.0-beta.25360.101 + 10.0.0-beta.25365.101 diff --git a/src/wpf/global.json b/src/wpf/global.json index 9f82df38341..d17d95e8957 100644 --- a/src/wpf/global.json +++ b/src/wpf/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25360.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25360.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25365.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25365.101", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { diff --git a/src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ja.xlf b/src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ja.xlf index 08915578b59..d2cc8991279 100644 --- a/src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ja.xlf +++ b/src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ja.xlf @@ -4805,7 +4805,7 @@ Do you want to replace it? Top - - + 上 diff --git a/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Dark.xaml b/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Dark.xaml index 9456e48eff1..b3e08b806ca 100644 --- a/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Dark.xaml +++ b/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Dark.xaml @@ -532,6 +532,7 @@ + diff --git a/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC.xaml b/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC.xaml index 316b43b5248..1bbc712e822 100644 --- a/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC.xaml +++ b/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC.xaml @@ -351,6 +351,7 @@ + diff --git a/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Light.xaml b/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Light.xaml index 5a8fe89c121..1952082bb4d 100644 --- a/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Light.xaml +++ b/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Light.xaml @@ -548,6 +548,7 @@ + diff --git a/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DataGrid.xaml b/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DataGrid.xaml index edcc31d29d3..22aec44127d 100644 --- a/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DataGrid.xaml +++ b/src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DataGrid.xaml @@ -404,6 +404,7 @@