diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml index f41817bbf60..4a914c64657 100644 --- a/.github/policies/resourceManagement.yml +++ b/.github/policies/resourceManagement.yml @@ -236,11 +236,22 @@ configuration: - if: - payloadType: Issue_Comment - commentContains: - pattern: 'I would [like|love] [to help|helping|to contribute|contributing|to implement|implementing|to fix|fixing]' + pattern: "I(( would|'d) (like|love|be happy)| want) (to help|helping|to contribute|contributing|to implement|implementing|to fix|fixing)" isRegex: True then: - addReply: reply: Hi! Your last comment indicates to our system, that you might want to contribute to this feature/fix this bug. Thank you! Please make us aware on our ["Would you like to contribute to PowerToys?" thread](https://github.com/microsoft/PowerToys/issues/28769), as we don't see all the comments.

_I'm a bot (beep!) so please excuse any mistakes I may make_ + description: + - if: + - payloadType: Issues + - isAction: + action: Opened + - bodyContains: + pattern: 'Area\(s\) with issue\?\s*\nWorkspaces' + isRegex: True + then: + - addLabel: + label: Product-Workspaces description: onFailure: onSuccess: diff --git a/.vsconfig b/.vsconfig index 5d2ef574531..bc5f1200fc1 100644 --- a/.vsconfig +++ b/.vsconfig @@ -7,7 +7,7 @@ "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.Universal", "Microsoft.VisualStudio.Component.Windows10SDK.19041", - "Microsoft.VisualStudio.Component.Windows10SDK.20348", + "Microsoft.VisualStudio.Component.Windows10SDK.22621", "Microsoft.VisualStudio.ComponentGroup.UWP.VC", "Microsoft.VisualStudio.Component.UWP.VC.ARM64", "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre", diff --git a/Cpp.Build.props b/Cpp.Build.props index 4f920f036f8..06c22b45bf8 100644 --- a/Cpp.Build.props +++ b/Cpp.Build.props @@ -94,17 +94,16 @@ - - - 10.0.20348.0 - 10.0.20348.0 + + + 10.0.22621.0 + 10.0.22621.0 10.0.19041.0 - v143 + v143 Unicode true Spectre diff --git a/Directory.Packages.props b/Directory.Packages.props index 0967532dc32..9ec1d03bd9b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/NOTICE.md b/NOTICE.md index d4328bbfc40..ca957e45ecd 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1299,14 +1299,14 @@ EXHIBIT A -Mozilla Public License. - Appium.WebDriver 4.4.5 - Azure.AI.OpenAI 1.0.0-beta.12 - CommunityToolkit.Mvvm 8.2.2 -- CommunityToolkit.WinUI.Animations 8.0.240109 -- CommunityToolkit.WinUI.Collections 8.0.240109 -- CommunityToolkit.WinUI.Controls.Primitives 8.0.240109 -- CommunityToolkit.WinUI.Controls.Segmented 8.0.240109 -- CommunityToolkit.WinUI.Controls.SettingsControls 8.0.240109 -- CommunityToolkit.WinUI.Controls.Sizers 8.0.240109 -- CommunityToolkit.WinUI.Converters 8.0.240109 -- CommunityToolkit.WinUI.Extensions 8.0.240109 +- CommunityToolkit.WinUI.Animations 8.1.240821 +- CommunityToolkit.WinUI.Collections 8.1.240821 +- CommunityToolkit.WinUI.Controls.Primitives 8.1.240821 +- CommunityToolkit.WinUI.Controls.Segmented 8.1.240821 +- CommunityToolkit.WinUI.Controls.SettingsControls 8.1.240821 +- CommunityToolkit.WinUI.Controls.Sizers 8.1.240821 +- CommunityToolkit.WinUI.Converters 8.1.240821 +- CommunityToolkit.WinUI.Extensions 8.1.240821 - CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2 - CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2 - ControlzEx 6.0.0 diff --git a/src/Common.Dotnet.CsWinRT.props b/src/Common.Dotnet.CsWinRT.props index 610219427c0..514997e71bf 100644 --- a/src/Common.Dotnet.CsWinRT.props +++ b/src/Common.Dotnet.CsWinRT.props @@ -2,8 +2,8 @@ - 10.0.20348.38 - net8.0-windows10.0.20348.0 + 10.0.22621.38 + net8.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 win-x64;win-arm64 diff --git a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj index e9a10fb07b0..0f6c2bb1d1e 100644 --- a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj +++ b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj @@ -10,7 +10,7 @@ {f5e1146e-b7b3-4e11-85fd-270a500bd78c} Win32Proj CropAndLock - 10.0.20348.0 + 10.0.22621.0 10.0.19041.0 diff --git a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj b/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj index 8d33e3f543f..c4489cdad88 100644 --- a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj +++ b/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj @@ -25,7 +25,7 @@ {c604b37e-9d0e-4484-8778-e8b31b0e1b3a} PowerToys.FileLocksmithLib.Interop PowerToys.FileLocksmithLib.Interop - net8.0-windows10.0.20348.0 + net8.0-windows10.0.22621.0 ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\ PowerToys.FileLocksmithLib.Interop diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 800c6473ca7..dc3af21ceae 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net8.0-windows10.0.20348.0 + net8.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps diff --git a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj index 96ffb5f91a3..444657646e3 100644 --- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj +++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj @@ -21,10 +21,6 @@ false Windows Store 10.0 - true - - 10.0.20348.0 - 10.0.19041.0 true true true diff --git a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj index 275933b861a..4ef6d283ecd 100644 --- a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj +++ b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj @@ -1,5 +1,6 @@ - + + 16.0 {b31fcc55-b5a4-4ea7-b414-2dceae6af332} @@ -49,8 +50,19 @@ {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters index 4f78294c492..f30fd536239 100644 --- a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters +++ b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters @@ -38,4 +38,7 @@ Source Files + + + \ No newline at end of file diff --git a/src/modules/Workspaces/WorkspacesLib/packages.config b/src/modules/Workspaces/WorkspacesLib/packages.config new file mode 100644 index 00000000000..09bfc449e21 --- /dev/null +++ b/src/modules/Workspaces/WorkspacesLib/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/alwaysontop/AlwaysOnTop/WindowCornersUtil.cpp b/src/modules/alwaysontop/AlwaysOnTop/WindowCornersUtil.cpp index e64ed0fd753..441c01a6dce 100644 --- a/src/modules/alwaysontop/AlwaysOnTop/WindowCornersUtil.cpp +++ b/src/modules/alwaysontop/AlwaysOnTop/WindowCornersUtil.cpp @@ -5,21 +5,6 @@ #include -// Placeholder enums since dwmapi.h doesn't have these until SDK 22000. -// TODO: Remove once SDK targets 22000 or above. -enum DWMWINDOWATTRIBUTE_CUSTOM -{ - DWMWA_WINDOW_CORNER_PREFERENCE = 33 -}; - -enum DWM_WINDOW_CORNER_PREFERENCE -{ - DWMWCP_DEFAULT = 0, - DWMWCP_DONOTROUND = 1, - DWMWCP_ROUND = 2, - DWMWCP_ROUNDSMALL = 3 -}; - int WindowCornerUtils::CornerPreference(HWND window) noexcept { int cornerPreference = -1; diff --git a/src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp b/src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp index 76d83569e5d..230eb10be4b 100644 --- a/src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp +++ b/src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp @@ -22,22 +22,6 @@ namespace NonLocalizable const wchar_t SystemAppsFolder[] = L"SYSTEMAPPS"; } -// Placeholder enums since dwmapi.h doesn't have these until SDK 22000. -// TODO: Remove once SDK targets 22000 or above. -enum DWMWINDOWATTRIBUTE_CUSTOM -{ - DWMWA_WINDOW_CORNER_PREFERENCE = 33 - -}; - -enum DWM_WINDOW_CORNER_PREFERENCE -{ - DWMWCP_DEFAULT = 0, - DWMWCP_DONOTROUND = 1, - DWMWCP_ROUND = 2, - DWMWCP_ROUNDSMALL = 3 -}; - namespace { BOOL CALLBACK saveDisplayToVector(HMONITOR monitor, HDC /*hdc*/, LPRECT /*rect*/, LPARAM data) diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj index 21cf6729f20..ede1eb2eef5 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj @@ -67,6 +67,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + \ No newline at end of file diff --git a/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 74eeb2f9485..0f90e724bff 100644 --- a/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net8.0-windows10.0.20348.0 + net8.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration) diff --git a/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 74eeb2f9485..0f90e724bff 100644 --- a/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net8.0-windows10.0.20348.0 + net8.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration) diff --git a/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 74eeb2f9485..0f90e724bff 100644 --- a/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net8.0-windows10.0.20348.0 + net8.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration) diff --git a/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 74eeb2f9485..0f90e724bff 100644 --- a/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net8.0-windows10.0.20348.0 + net8.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration) diff --git a/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 74eeb2f9485..0f90e724bff 100644 --- a/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net8.0-windows10.0.20348.0 + net8.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration) diff --git a/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs b/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs index 4bb0b1a7f97..c895866c1eb 100644 --- a/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs +++ b/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs @@ -10,8 +10,9 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers { public static class NativeMethods { - private const int GWL_STYLE = -16; private const int WS_POPUP = 1 << 31; // 0x80000000 + internal const int GWL_STYLE = -16; + internal const int WS_CAPTION = 0x00C00000; internal const int SPI_GETDESKWALLPAPER = 0x0073; internal const int SW_SHOWNORMAL = 1; internal const int SW_SHOWMAXIMIZED = 3; diff --git a/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 800c6473ca7..dc3af21ceae 100644 --- a/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net8.0-windows10.0.20348.0 + net8.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps diff --git a/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml index 7f9b221bcf6..d6a6f6f2f81 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml @@ -4,8 +4,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:flyout="using:Microsoft.PowerToys.Settings.UI.Flyout" - xmlns:i="using:Microsoft.Xaml.Interactivity" - xmlns:ic="using:Microsoft.Xaml.Interactions.Core" xmlns:local="using:Microsoft.PowerToys.Settings.UI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:winuiex="using:WinUIEx" @@ -29,17 +27,6 @@ LightTintOpacity="0" /> - - - - - - - - diff --git a/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml.cs index 1835f474a1d..27a20540c9b 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml.cs @@ -28,6 +28,13 @@ public sealed partial class FlyoutWindow : WindowEx public FlyoutWindow(POINT? initialPosition) { this.InitializeComponent(); + + // Remove the caption style from the window style. Windows App SDK 1.6 added it, which made the title bar and borders appear for the Flyout. This code removes it. + var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this); + var windowStyle = NativeMethods.GetWindowLong(hwnd, NativeMethods.GWL_STYLE); + windowStyle &= ~NativeMethods.WS_CAPTION; + _ = NativeMethods.SetWindowLong(hwnd, NativeMethods.GWL_STYLE, windowStyle); + this.Activated += FlyoutWindow_Activated; FlyoutAppearPosition = initialPosition; ViewModel = new FlyoutViewModel(); diff --git a/src/settings-ui/Settings.UI/ViewModels/Flyout/FlyoutViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/Flyout/FlyoutViewModel.cs index 4b77b1dce64..a8cb2474aa9 100644 --- a/src/settings-ui/Settings.UI/ViewModels/Flyout/FlyoutViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/Flyout/FlyoutViewModel.cs @@ -3,11 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using System.ComponentModel; -using System.Runtime.CompilerServices; using System.Timers; -using Common.UI; -using Microsoft.PowerToys.Settings.UI.Library.Utilities; namespace Microsoft.PowerToys.Settings.UI.ViewModels.Flyout { @@ -18,21 +14,6 @@ public class FlyoutViewModel : IDisposable public bool CanHide { get; set; } - private bool _windows10; - - public bool Windows10 - { - get => _windows10; - set - { - if (_windows10 != value) - { - _windows10 = value; - OnPropertyChanged(); - } - } - } - public FlyoutViewModel() { CanHide = true; @@ -40,7 +21,6 @@ public FlyoutViewModel() _hideTimer.Elapsed += HideTimer_Elapsed; _hideTimer.Interval = 1000; _hideTimer.Enabled = false; - _windows10 = !OSVersionHelper.IsWindows11(); } private void HideTimer_Elapsed(object sender, ElapsedEventArgs e) @@ -56,13 +36,6 @@ internal void DisableHiding() _hideTimer.Start(); } - public event PropertyChangedEventHandler PropertyChanged; - - private void OnPropertyChanged([CallerMemberName] string propertyName = null) - { - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); - } - public void Dispose() { Dispose(true);