diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index f5bc0156f8..458e3087b2 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -266,6 +266,7 @@ CSettings cso CSRW CStyle +cswinrt CSY CTest currentculture diff --git a/Directory.Packages.props b/Directory.Packages.props index 97d46edbfe..0967532dc3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -32,15 +32,19 @@ - + - + + - + diff --git a/NOTICE.md b/NOTICE.md index b7f8df1dfd..d4328bbfc4 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1325,13 +1325,13 @@ EXHIBIT A -Mozilla Public License. - Microsoft.Extensions.Logging 8.0.0 - Microsoft.Extensions.Logging.Abstractions 8.0.0 - Microsoft.Toolkit.Uwp.Notifications 7.1.2 -- Microsoft.Web.WebView2 1.0.2365.46 +- Microsoft.Web.WebView2 1.0.2739.15 - Microsoft.Win32.SystemEvents 8.0.0 - Microsoft.Windows.Compatibility 8.0.7 - Microsoft.Windows.CsWin32 0.2.46-beta -- Microsoft.Windows.CsWinRT 2.0.8 +- Microsoft.Windows.CsWinRT 2.1.1 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428 -- Microsoft.WindowsAppSDK 1.5.240428000 +- Microsoft.WindowsAppSDK 1.6.240829007 - 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 a9cd70ffa3..610219427c 100644 --- a/src/Common.Dotnet.CsWinRT.props +++ b/src/Common.Dotnet.CsWinRT.props @@ -2,6 +2,7 @@ + 10.0.20348.38 net8.0-windows10.0.20348.0 10.0.19041.0 10.0.19041.0 @@ -33,4 +34,11 @@ + + + + +    + + \ No newline at end of file diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.cs index eda04a5d53..3a5cb8c602 100644 --- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.cs +++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.cs @@ -9,7 +9,7 @@ namespace AdvancedPaste.Controls { [TemplatePart(Name = LoadingGrid, Type = typeof(Grid))] [TemplatePart(Name = LoadingBrush, Type = typeof(AnimatedBorderBrush))] - public class AnimatedContentControl : ContentControl + public partial class AnimatedContentControl : ContentControl { internal const string LoadingGrid = "PART_LoadingGrid"; internal const string LoadingBrush = "PART_LoadingBrush"; diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs index 5226bf320d..0577c019f7 100644 --- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs +++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs @@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Data; namespace AdvancedPaste.Converters; -public sealed class CountToDoubleConverter : IValueConverter +public sealed partial class CountToDoubleConverter : IValueConverter { public double ValueIfZero { get; set; } diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs index 41b3968e03..67889d3af9 100644 --- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs +++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs @@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Data; namespace AdvancedPaste.Converters; -public sealed class CountToVisibilityConverter : IValueConverter +public sealed partial class CountToVisibilityConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToBoolConverter.cs b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToBoolConverter.cs index 95aae3e874..41a6b31fd7 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToBoolConverter.cs +++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToBoolConverter.cs @@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Data; namespace EnvironmentVariablesUILib.Converters; -public class EnvironmentStateToBoolConverter : IValueConverter +public partial class EnvironmentStateToBoolConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToMessageConverter.cs b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToMessageConverter.cs index 5f1103fe21..d505a29d78 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToMessageConverter.cs +++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToMessageConverter.cs @@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Data; namespace EnvironmentVariablesUILib.Converters; -public class EnvironmentStateToMessageConverter : IValueConverter +public partial class EnvironmentStateToMessageConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToTitleConverter.cs b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToTitleConverter.cs index dbe2843919..be2f03175e 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToTitleConverter.cs +++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToTitleConverter.cs @@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Data; namespace EnvironmentVariablesUILib.Converters; -public class EnvironmentStateToTitleConverter : IValueConverter +public partial class EnvironmentStateToTitleConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToVisibilityConverter.cs b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToVisibilityConverter.cs index 4c2d2b42da..5fb1313ad2 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToVisibilityConverter.cs +++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToVisibilityConverter.cs @@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Data; namespace EnvironmentVariablesUILib.Converters; -public class EnvironmentStateToVisibilityConverter : IValueConverter +public partial class EnvironmentStateToVisibilityConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/VariableTypeToGlyphConverter.cs b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/VariableTypeToGlyphConverter.cs index 41cf4124cb..216a914bea 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/VariableTypeToGlyphConverter.cs +++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/VariableTypeToGlyphConverter.cs @@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Data; namespace EnvironmentVariablesUILib.Converters; -public class VariableTypeToGlyphConverter : IValueConverter +public partial class VariableTypeToGlyphConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileCountConverter.cs b/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileCountConverter.cs index 43bf8c9a59..423c4f04b0 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileCountConverter.cs +++ b/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileCountConverter.cs @@ -4,11 +4,10 @@ using System; using Microsoft.UI.Xaml.Data; -using PowerToys.FileLocksmithLib.Interop; namespace PowerToys.FileLocksmithUI.Converters { - public sealed class FileCountConverter : IValueConverter + public sealed partial class FileCountConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs b/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs index fcde399f4a..a81a03fb52 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs +++ b/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs @@ -5,11 +5,10 @@ using System; using System.IO; using Microsoft.UI.Xaml.Data; -using PowerToys.FileLocksmithLib.Interop; namespace PowerToys.FileLocksmithUI.Converters { - public sealed class FileListToDescriptionConverter : IValueConverter + public sealed partial class FileListToDescriptionConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs b/src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs index c5b03a7d2b..deec381fcb 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs +++ b/src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs @@ -7,11 +7,10 @@ using System.Drawing; using System.IO; using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Media.Imaging; -using Windows.Storage; namespace PowerToys.FileLocksmithUI.Converters { - public sealed class PidToIconConverter : IValueConverter + public sealed partial class PidToIconConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Converters/UserToSystemWarningVisibilityConverter.cs b/src/modules/FileLocksmith/FileLocksmithUI/Converters/UserToSystemWarningVisibilityConverter.cs index 85b988dbe3..10e071563a 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/Converters/UserToSystemWarningVisibilityConverter.cs +++ b/src/modules/FileLocksmith/FileLocksmithUI/Converters/UserToSystemWarningVisibilityConverter.cs @@ -3,14 +3,12 @@ // See the LICENSE file in the project root for more information. using System; -using System.Globalization; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Data; -using PowerToys.FileLocksmithLib.Interop; namespace PowerToys.FileLocksmithUI.Converters { - public sealed class UserToSystemWarningVisibilityConverter : IValueConverter + public sealed partial class UserToSystemWarningVisibilityConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj index 1189b7c08c..96ffb5f91a 100644 --- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj +++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj @@ -1,6 +1,6 @@  - + @@ -141,7 +141,8 @@ - + + @@ -152,7 +153,8 @@ - - + + + \ No newline at end of file diff --git a/src/modules/MeasureTool/MeasureToolCore/packages.config b/src/modules/MeasureTool/MeasureToolCore/packages.config index 2b320c8c16..7043c92ee0 100644 --- a/src/modules/MeasureTool/MeasureToolCore/packages.config +++ b/src/modules/MeasureTool/MeasureToolCore/packages.config @@ -1,7 +1,8 @@  + - + \ No newline at end of file diff --git a/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs b/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs index 3c22974395..1212dd8194 100644 --- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs +++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs @@ -56,6 +56,11 @@ namespace MeasureToolUI this.SetIsMaximizable(false); IsTitleBarVisible = false; + // Remove the caption style from the window style. Windows App SDK 1.6 added it, which made the title bar and borders appear for Measure Tool. This code removes it. + var windowStyle = GetWindowLong(hwnd, GWL_STYLE); + windowStyle = windowStyle & (~WS_CAPTION); + _ = SetWindowLong(hwnd, GWL_STYLE, windowStyle); + _coreLogic = core; Closed += MainWindow_Closed; DisplayArea displayArea = DisplayArea.GetFromWindowId(windowId, DisplayAreaFallback.Nearest); diff --git a/src/modules/MeasureTool/MeasureToolUI/NativeMethods.cs b/src/modules/MeasureTool/MeasureToolUI/NativeMethods.cs index 877adf54e1..92c061a6cc 100644 --- a/src/modules/MeasureTool/MeasureToolUI/NativeMethods.cs +++ b/src/modules/MeasureTool/MeasureToolUI/NativeMethods.cs @@ -15,4 +15,13 @@ internal static class NativeMethods internal const uint SWP_NOMOVE = 0x0002; internal const uint SWP_NOACTIVATE = 0x0010; internal const uint SWP_SHOWWINDOW = 0x0040; + + [DllImport("user32.dll", SetLastError = true)] + internal static extern int GetWindowLong(IntPtr hWnd, int nIndex); + + [DllImport("user32.dll")] + internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong); + + internal const int GWL_STYLE = -16; + internal const int WS_CAPTION = 0x00C00000; } diff --git a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj index 28a265401a..149ec0201a 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj @@ -162,7 +162,7 @@ - + @@ -179,7 +179,7 @@ - + diff --git a/src/modules/keyboardmanager/KeyboardManagerEditor/packages.config b/src/modules/keyboardmanager/KeyboardManagerEditor/packages.config index 58a96b0a2e..05802ce755 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditor/packages.config +++ b/src/modules/keyboardmanager/KeyboardManagerEditor/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj index 22fd5467a3..a36cd6b1bd 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj @@ -101,7 +101,7 @@ - + @@ -114,7 +114,7 @@ - + diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/packages.config b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/packages.config index 4808f0f3af..7ce9b7c3f3 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/packages.config +++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/modules/peek/Peek.Common/Converters/BytesToStringConverter.cs b/src/modules/peek/Peek.Common/Converters/BytesToStringConverter.cs index fa40547daf..8f6f64144f 100644 --- a/src/modules/peek/Peek.Common/Converters/BytesToStringConverter.cs +++ b/src/modules/peek/Peek.Common/Converters/BytesToStringConverter.cs @@ -8,7 +8,7 @@ using Peek.Common.Helpers; namespace Peek.Common.Converters { - public class BytesToStringConverter : IValueConverter + public partial class BytesToStringConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/modules/peek/Peek.FilePreviewer/Previewers/Archives/Models/ArchiveItemTemplateSelector.cs b/src/modules/peek/Peek.FilePreviewer/Previewers/Archives/Models/ArchiveItemTemplateSelector.cs index 38bd9766c0..56a637b84c 100644 --- a/src/modules/peek/Peek.FilePreviewer/Previewers/Archives/Models/ArchiveItemTemplateSelector.cs +++ b/src/modules/peek/Peek.FilePreviewer/Previewers/Archives/Models/ArchiveItemTemplateSelector.cs @@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Controls; namespace Peek.FilePreviewer.Previewers.Archives.Models { - public class ArchiveItemTemplateSelector : DataTemplateSelector + public partial class ArchiveItemTemplateSelector : DataTemplateSelector { public DataTemplate? DirectoryTemplate { get; set; } diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj index aabed1cff8..fc9bd9b1f6 100644 --- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj @@ -1,6 +1,6 @@  - + @@ -205,7 +205,8 @@ - + + @@ -218,8 +219,9 @@ - - + + + diff --git a/src/modules/powerrename/PowerRenameUILib/packages.config b/src/modules/powerrename/PowerRenameUILib/packages.config index 329104b361..360805a64d 100644 --- a/src/modules/powerrename/PowerRenameUILib/packages.config +++ b/src/modules/powerrename/PowerRenameUILib/packages.config @@ -2,8 +2,9 @@ + - + \ No newline at end of file diff --git a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj index a9eca4f5f0..e5779985fe 100644 --- a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj @@ -18,6 +18,7 @@ + diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj index 5f56ba8a71..e47dad2799 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj @@ -24,6 +24,7 @@ + diff --git a/src/settings-ui/Settings.UI/Converters/AwakeModeToIntConverter.cs b/src/settings-ui/Settings.UI/Converters/AwakeModeToIntConverter.cs index 9746c62fc2..1bbae1f8c2 100644 --- a/src/settings-ui/Settings.UI/Converters/AwakeModeToIntConverter.cs +++ b/src/settings-ui/Settings.UI/Converters/AwakeModeToIntConverter.cs @@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Data; namespace Microsoft.PowerToys.Settings.UI.Converters { - public sealed class AwakeModeToIntConverter : IValueConverter + public sealed partial class AwakeModeToIntConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/settings-ui/Settings.UI/Converters/ColorFormatConverter.cs b/src/settings-ui/Settings.UI/Converters/ColorFormatConverter.cs index 7f8559f66a..8b81200d64 100644 --- a/src/settings-ui/Settings.UI/Converters/ColorFormatConverter.cs +++ b/src/settings-ui/Settings.UI/Converters/ColorFormatConverter.cs @@ -4,12 +4,11 @@ using System; using ManagedCommon; -using Microsoft.PowerToys.Settings.UI.Library.Helpers; using Microsoft.UI.Xaml.Data; namespace Microsoft.PowerToys.Settings.UI.Converters { - public sealed class ColorFormatConverter : IValueConverter + public sealed partial class ColorFormatConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/settings-ui/Settings.UI/Converters/ImageResizerFitToIntConverter.cs b/src/settings-ui/Settings.UI/Converters/ImageResizerFitToIntConverter.cs index 675ad8a13f..8a68025197 100644 --- a/src/settings-ui/Settings.UI/Converters/ImageResizerFitToIntConverter.cs +++ b/src/settings-ui/Settings.UI/Converters/ImageResizerFitToIntConverter.cs @@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Data; namespace Microsoft.PowerToys.Settings.UI.Converters; -public sealed class ImageResizerFitToIntConverter : IValueConverter +public sealed partial class ImageResizerFitToIntConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/settings-ui/Settings.UI/Converters/ImageResizerFitToStringConverter.cs b/src/settings-ui/Settings.UI/Converters/ImageResizerFitToStringConverter.cs index b3ead132cd..d9a740db95 100644 --- a/src/settings-ui/Settings.UI/Converters/ImageResizerFitToStringConverter.cs +++ b/src/settings-ui/Settings.UI/Converters/ImageResizerFitToStringConverter.cs @@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Data; namespace Microsoft.PowerToys.Settings.UI.Converters { - public sealed class ImageResizerFitToStringConverter : IValueConverter + public sealed partial class ImageResizerFitToStringConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToIntConverter.cs b/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToIntConverter.cs index 682b03dafc..0132b86241 100644 --- a/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToIntConverter.cs +++ b/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToIntConverter.cs @@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Data; namespace Microsoft.PowerToys.Settings.UI.Converters; -public sealed class ImageResizerUnitToIntConverter : IValueConverter +public sealed partial class ImageResizerUnitToIntConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToStringConverter.cs b/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToStringConverter.cs index bdba70c0b1..6dc89e65fb 100644 --- a/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToStringConverter.cs +++ b/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToStringConverter.cs @@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Data; namespace Microsoft.PowerToys.Settings.UI.Converters { - public sealed class ImageResizerUnitToStringConverter : IValueConverter + public sealed partial class ImageResizerUnitToStringConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/settings-ui/Settings.UI/Converters/IndexBitFieldToVisibilityConverter.cs b/src/settings-ui/Settings.UI/Converters/IndexBitFieldToVisibilityConverter.cs index 9d6950af83..3295294550 100644 --- a/src/settings-ui/Settings.UI/Converters/IndexBitFieldToVisibilityConverter.cs +++ b/src/settings-ui/Settings.UI/Converters/IndexBitFieldToVisibilityConverter.cs @@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Data; namespace Microsoft.PowerToys.Settings.UI.Converters { - public sealed class IndexBitFieldToVisibilityConverter : IValueConverter + public sealed partial class IndexBitFieldToVisibilityConverter : IValueConverter { // Receives a hexadecimal bit mask as a parameter. Will check the value against that bitmask. public object Convert(object value, Type targetType, object parameter, string language) diff --git a/src/settings-ui/Settings.UI/Converters/KeyVisualTemplateSelector.cs b/src/settings-ui/Settings.UI/Converters/KeyVisualTemplateSelector.cs index 3593a3c100..43e993912a 100644 --- a/src/settings-ui/Settings.UI/Converters/KeyVisualTemplateSelector.cs +++ b/src/settings-ui/Settings.UI/Converters/KeyVisualTemplateSelector.cs @@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Controls; namespace Microsoft.PowerToys.Settings.UI.Converters { - internal sealed class KeyVisualTemplateSelector : DataTemplateSelector + internal sealed partial class KeyVisualTemplateSelector : DataTemplateSelector { public DataTemplate KeyVisualTemplate { get; set; } diff --git a/src/settings-ui/Settings.UI/Converters/ModuleItemTemplateSelector.cs b/src/settings-ui/Settings.UI/Converters/ModuleItemTemplateSelector.cs index b34331a0e7..1374c16482 100644 --- a/src/settings-ui/Settings.UI/Converters/ModuleItemTemplateSelector.cs +++ b/src/settings-ui/Settings.UI/Converters/ModuleItemTemplateSelector.cs @@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Controls; namespace Microsoft.PowerToys.Settings.UI.Converters { - public class ModuleItemTemplateSelector : DataTemplateSelector + public partial class ModuleItemTemplateSelector : DataTemplateSelector { public DataTemplate TextTemplate { get; set; } diff --git a/src/settings-ui/Settings.UI/Converters/RunOptionTemplateSelector.cs b/src/settings-ui/Settings.UI/Converters/RunOptionTemplateSelector.cs index 575562da5d..0e742e855a 100644 --- a/src/settings-ui/Settings.UI/Converters/RunOptionTemplateSelector.cs +++ b/src/settings-ui/Settings.UI/Converters/RunOptionTemplateSelector.cs @@ -10,7 +10,7 @@ using Microsoft.UI.Xaml.Controls; namespace Microsoft.PowerToys.Settings.UI.Converters { - public sealed class RunOptionTemplateSelector : DataTemplateSelector + public sealed partial class RunOptionTemplateSelector : DataTemplateSelector { public DataTemplate CheckBoxTemplate { get; set; } diff --git a/src/settings-ui/Settings.UI/Converters/StringToInfoBarSeverityConverter.cs b/src/settings-ui/Settings.UI/Converters/StringToInfoBarSeverityConverter.cs index 6b3f6ed3eb..548b68889b 100644 --- a/src/settings-ui/Settings.UI/Converters/StringToInfoBarSeverityConverter.cs +++ b/src/settings-ui/Settings.UI/Converters/StringToInfoBarSeverityConverter.cs @@ -3,13 +3,11 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.UI; -using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Data; namespace Microsoft.PowerToys.Settings.UI.Converters { - public sealed class StringToInfoBarSeverityConverter : IValueConverter + public sealed partial class StringToInfoBarSeverityConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/settings-ui/Settings.UI/Converters/UpdateStateToBoolConverter.cs b/src/settings-ui/Settings.UI/Converters/UpdateStateToBoolConverter.cs index 610736752e..ecc19dbd7c 100644 --- a/src/settings-ui/Settings.UI/Converters/UpdateStateToBoolConverter.cs +++ b/src/settings-ui/Settings.UI/Converters/UpdateStateToBoolConverter.cs @@ -7,7 +7,7 @@ using Microsoft.UI.Xaml.Data; namespace Microsoft.PowerToys.Settings.UI.Converters { - public sealed class UpdateStateToBoolConverter : IValueConverter + public sealed partial class UpdateStateToBoolConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs index 84b1a3a075..9345f442f2 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs @@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls; namespace Microsoft.PowerToys.Settings.UI.Controls { - public class CheckBoxWithDescriptionControl : CheckBox + public partial class CheckBoxWithDescriptionControl : CheckBox { private CheckBoxWithDescriptionControl _checkBoxSubTextControl; diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs index f7f7050f36..c013a87f40 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs @@ -10,7 +10,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls { [TemplateVisualState(Name = "Normal", GroupName = "CommonStates")] [TemplateVisualState(Name = "Disabled", GroupName = "CommonStates")] - public class IsEnabledTextBlock : Control + public partial class IsEnabledTextBlock : Control { public IsEnabledTextBlock() { diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs index 8b36831984..9d323c636d 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs @@ -14,7 +14,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls [TemplateVisualState(Name = "Disabled", GroupName = "CommonStates")] [TemplateVisualState(Name = "Default", GroupName = "StateStates")] [TemplateVisualState(Name = "Error", GroupName = "StateStates")] - public sealed class KeyVisual : Control + public sealed partial class KeyVisual : Control { private const string KeyPresenter = "KeyPresenter"; private KeyVisual _keyVisual; diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroupAutomationPeer.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroupAutomationPeer.cs index 56f85b1bde..32df364c75 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroupAutomationPeer.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroupAutomationPeer.cs @@ -6,7 +6,7 @@ using Microsoft.UI.Xaml.Automation.Peers; namespace Microsoft.PowerToys.Settings.UI.Controls { - public class SettingsGroupAutomationPeer : FrameworkElementAutomationPeer + public partial class SettingsGroupAutomationPeer : FrameworkElementAutomationPeer { public SettingsGroupAutomationPeer(SettingsGroup owner) : base(owner)