From ca1b0acbc98bdbe3b2756c332e00a94d5245b024 Mon Sep 17 00:00:00 2001 From: gokcekantarci <115616017+gokcekantarci@users.noreply.github.com> Date: Fri, 11 Oct 2024 13:51:02 +0300 Subject: [PATCH 1/5] [Deps]Upgrade WpfUI to 3.0.5 --- Directory.Packages.props | 2 +- NOTICE.md | 2 +- .../colorPicker/ColorPickerUI/Views/ColorEditorView.xaml | 2 ++ src/modules/launcher/PowerLauncher/MainWindow.xaml | 3 ++- src/modules/launcher/PowerLauncher/ResultList.xaml | 2 ++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 767ffa86ee..d4b27080d5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -82,7 +82,7 @@ - + diff --git a/NOTICE.md b/NOTICE.md index bdd5b0cbfa..ddc6de142e 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1364,4 +1364,4 @@ EXHIBIT A -Mozilla Public License. - UnitsNet 5.56.0 - UTF.Unknown 2.5.1 - WinUIEx 2.2.0 -- WPF-UI 3.0.0 +- WPF-UI 3.0.5 diff --git a/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml b/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml index 269805aec9..d63f83a40b 100644 --- a/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml +++ b/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml @@ -46,6 +46,8 @@ VerticalAlignment="Top" VerticalContentAlignment="Top" AutomationProperties.Name="{x:Static p:Resources.Color_History}" + Background="Transparent" + BorderBrush="Transparent" ItemsSource="{Binding ColorsHistory}" KeyboardNavigation.DirectionalNavigation="Contained" MouseWheel="HistoryColors_OnMouseWheelScroll" diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml b/src/modules/launcher/PowerLauncher/MainWindow.xaml index 764dee2bba..30acc5c3c0 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml @@ -72,9 +72,10 @@ x:Name="pluginsHintsList" Grid.Row="1" Margin="16,0,0,0" - Padding="0,0,32,0" ItemContainerStyle="{StaticResource PluginsListViewItemStyle}" ItemsSource="{Binding Plugins}" + Background="Transparent" + BorderBrush="Transparent" PreviewMouseLeftButtonUp="PluginsHintsList_PreviewMouseLeftButtonUp" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Auto" diff --git a/src/modules/launcher/PowerLauncher/ResultList.xaml b/src/modules/launcher/PowerLauncher/ResultList.xaml index 7eda85a709..7e387e9807 100644 --- a/src/modules/launcher/PowerLauncher/ResultList.xaml +++ b/src/modules/launcher/PowerLauncher/ResultList.xaml @@ -32,6 +32,8 @@ Date: Fri, 11 Oct 2024 09:35:13 -0400 Subject: [PATCH 2/5] [Deps] WinAppSDK 1.6.1 and CsWinRT 2.1.5 update (#35381) * [Deps] Update CsWinRT to 2.1.5 * [Deps] Update WinAppSDK to 1.6.1 * [Props] Updated WindowsSdkPackageVersion to 22621.48 in Common.Dotnet.CsWinRT.props * Updated NOTICE.md * [Peek] Resolve ambiguity with Color struct --- Directory.Packages.props | 4 ++-- NOTICE.md | 4 ++-- src/Common.Dotnet.CsWinRT.props | 2 +- .../MeasureToolCore/PowerToys.MeasureToolCore.vcxproj | 8 ++++---- src/modules/MeasureTool/MeasureToolCore/packages.config | 2 +- .../Peek.FilePreviewer/Controls/BrowserControl.xaml.cs | 2 +- .../powerrename/PowerRenameUILib/PowerRenameUI.vcxproj | 8 ++++---- src/modules/powerrename/PowerRenameUILib/packages.config | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index d4b27080d5..e0797a6270 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -42,9 +42,9 @@ TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed. This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail. --> - + - + diff --git a/NOTICE.md b/NOTICE.md index ddc6de142e..a8059397e5 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1329,9 +1329,9 @@ EXHIBIT A -Mozilla Public License. - Microsoft.Win32.SystemEvents 8.0.0 - Microsoft.Windows.Compatibility 8.0.10 - Microsoft.Windows.CsWin32 0.2.46-beta -- Microsoft.Windows.CsWinRT 2.1.1 +- Microsoft.Windows.CsWinRT 2.1.5 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428 -- Microsoft.WindowsAppSDK 1.6.240829007 +- Microsoft.WindowsAppSDK 1.6.240923002 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9 - Microsoft.Xaml.Behaviors.Wpf 1.1.39 - ModernWpfUI 0.9.4 diff --git a/src/Common.Dotnet.CsWinRT.props b/src/Common.Dotnet.CsWinRT.props index 514997e71b..1669cba196 100644 --- a/src/Common.Dotnet.CsWinRT.props +++ b/src/Common.Dotnet.CsWinRT.props @@ -2,7 +2,7 @@ - 10.0.22621.38 + 10.0.22621.48 net8.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 diff --git a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj index 444657646e..b05546d9aa 100644 --- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj +++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj @@ -1,6 +1,6 @@  - + @@ -137,8 +137,8 @@ - + @@ -149,8 +149,8 @@ - - + + \ No newline at end of file diff --git a/src/modules/MeasureTool/MeasureToolCore/packages.config b/src/modules/MeasureTool/MeasureToolCore/packages.config index 7043c92ee0..ed165ac47c 100644 --- a/src/modules/MeasureTool/MeasureToolCore/packages.config +++ b/src/modules/MeasureTool/MeasureToolCore/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/src/modules/peek/Peek.FilePreviewer/Controls/BrowserControl.xaml.cs b/src/modules/peek/Peek.FilePreviewer/Controls/BrowserControl.xaml.cs index 1f1f6f9fbe..eda90df8f9 100644 --- a/src/modules/peek/Peek.FilePreviewer/Controls/BrowserControl.xaml.cs +++ b/src/modules/peek/Peek.FilePreviewer/Controls/BrowserControl.xaml.cs @@ -164,7 +164,7 @@ namespace Peek.FilePreviewer.Controls if (!_originalBackgroundColor.HasValue) { // HACK: We used to store PreviewBrowser.DefaultBackgroundColor here, but WebView started returning transparent when running without a debugger attached. We want html files to be seen as in the browser, which has white as a default background color. - _originalBackgroundColor = Colors.White; + _originalBackgroundColor = Microsoft.UI.Colors.White; } // Setting the background color to transparent when initially loading the WebView2 component. diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj index fc9bd9b1f6..192a1528bd 100644 --- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj @@ -1,6 +1,6 @@  - + @@ -205,8 +205,8 @@ - + @@ -219,9 +219,9 @@ - - + + diff --git a/src/modules/powerrename/PowerRenameUILib/packages.config b/src/modules/powerrename/PowerRenameUILib/packages.config index 360805a64d..1ff9b46877 100644 --- a/src/modules/powerrename/PowerRenameUILib/packages.config +++ b/src/modules/powerrename/PowerRenameUILib/packages.config @@ -6,5 +6,5 @@ - + \ No newline at end of file From 3a228cc46e0d6ee0001351876e2622133b86d260 Mon Sep 17 00:00:00 2001 From: gokcekantarci <115616017+gokcekantarci@users.noreply.github.com> Date: Fri, 11 Oct 2024 17:51:22 +0300 Subject: [PATCH 3/5] [PTRun]Fix CultureNotFoundException Handling (#35256) --- .../PowerLauncher/ViewModel/MainViewModel.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs b/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs index 809c660cd1..5d6c55b46d 100644 --- a/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs +++ b/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs @@ -1197,9 +1197,17 @@ namespace PowerLauncher.ViewModel public static FlowDirection GetLanguageFlowDirection() { - bool isCurrentLanguageRightToLeft = System.Windows.Input.InputLanguageManager.Current.CurrentInputLanguage.TextInfo.IsRightToLeft; + try + { + bool isCurrentLanguageRightToLeft = System.Windows.Input.InputLanguageManager.Current.CurrentInputLanguage.TextInfo.IsRightToLeft; - return isCurrentLanguageRightToLeft ? FlowDirection.RightToLeft : FlowDirection.LeftToRight; + return isCurrentLanguageRightToLeft ? FlowDirection.RightToLeft : FlowDirection.LeftToRight; + } + catch (CultureNotFoundException ex) + { + Log.Exception($"CultureNotFoundException: {ex.Message}", ex, MethodBase.GetCurrentMethod().DeclaringType); + return FlowDirection.LeftToRight; // default FlowDirection.LeftToRight + } } protected virtual void Dispose(bool disposing) From 1d352c686aa9bbbfa6fdfc8b8f322d6a4613a9a2 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Fri, 11 Oct 2024 11:40:36 -0700 Subject: [PATCH 4/5] removing dup entry in spelling (#35379) Update expect.txt --- .github/actions/spell-check/expect.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 8ff275bc95..83689c8071 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -32,7 +32,6 @@ AFFINETRANSFORM AFX AGGREGATABLE AHybrid -AKV akv ALarger ALLAPPS From 89ec5be5ba717e44981d2f788b70b0ff37974388 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Fri, 11 Oct 2024 11:56:55 -0700 Subject: [PATCH 5/5] Removing Markdown exclude (#35380) Update ci.yml --- .pipelines/v2/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.pipelines/v2/ci.yml b/.pipelines/v2/ci.yml index 5e7bf26676..a68de324ee 100644 --- a/.pipelines/v2/ci.yml +++ b/.pipelines/v2/ci.yml @@ -4,22 +4,22 @@ trigger: include: - main - stable - paths: - exclude: - - doc/* - - temp/* - - tools/* - - '**.md' +# paths: +# exclude: +# - doc/* +# - temp/* +# - tools/* +# - '**.md' pr: branches: include: - main - stable - paths: - exclude: - - '**.md' - - doc +# paths: +# exclude: +# - '**.md' +# - doc name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)