From 5b0f3f64d45cb66e05df5087b2fc9ef98ad44e03 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Thu, 12 Sep 2024 09:30:44 -0700 Subject: [PATCH] Community Toolkit upgrade to 8.1.240821 (after .84 is verified stable) (#34419) * getting stuff to compile again * correcting install publish folder * fixing notice * Update NOTICE.md Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com> * getting it so it compiles again --------- Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com> --- .vsconfig | 2 +- Cpp.Build.props | 11 +++++------ Directory.Packages.props | 16 ++++++++-------- NOTICE.md | 16 ++++++++-------- src/Common.Dotnet.CsWinRT.props | 4 ++-- .../CropAndLock/CropAndLock/CropAndLock.vcxproj | 2 +- .../FileLocksmithLibInterop.vcxproj | 2 +- .../InstallationPublishProfile.pubxml | 2 +- .../PowerToys.MeasureToolCore.vcxproj | 4 ---- .../WorkspacesLib/WorkspacesLib.vcxproj | 14 +++++++++++++- .../WorkspacesLib/WorkspacesLib.vcxproj.filters | 3 +++ .../Workspaces/WorkspacesLib/packages.config | 4 ++++ .../AlwaysOnTop/WindowCornersUtil.cpp | 15 --------------- .../fancyzones/FancyZonesLib/WindowUtils.cpp | 16 ---------------- .../KeyboardManagerEngineLibrary.vcxproj | 1 + .../InstallationPublishProfile.pubxml | 2 +- .../InstallationPublishProfile.pubxml | 2 +- .../InstallationPublishProfile.pubxml | 2 +- .../InstallationPublishProfile.pubxml | 2 +- .../InstallationPublishProfile.pubxml | 2 +- .../InstallationPublishProfile.pubxml | 2 +- 21 files changed, 54 insertions(+), 70 deletions(-) create mode 100644 src/modules/Workspaces/WorkspacesLib/packages.config diff --git a/.vsconfig b/.vsconfig index 5d2ef57453..bc5f1200fc 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 4f920f036f..06c22b45bf 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 0967532dc3..9ec1d03bd9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/NOTICE.md b/NOTICE.md index d4328bbfc4..ca957e45ec 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 610219427c..514997e71b 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 e9a10fb07b..0f6c2bb1d1 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 8d33e3f543..c4489cdad8 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 800c6473ca..dc3af21cea 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 96ffb5f91a..444657646e 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 275933b861..4ef6d283ec 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 4f78294c49..f30fd53623 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 0000000000..09bfc449e2 --- /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 e64ed0fd75..441c01a6dc 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 76d83569e5..230eb10be4 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 21cf6729f2..ede1eb2eef 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 74eeb2f948..0f90e724bf 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 74eeb2f948..0f90e724bf 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 74eeb2f948..0f90e724bf 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 74eeb2f948..0f90e724bf 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 74eeb2f948..0f90e724bf 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/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 800c6473ca..dc3af21cea 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