From 12098cb17f6cd5ff4ef3b7a4a4e45c8b73e1e9df Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Mon, 5 Aug 2024 06:32:05 -0700 Subject: [PATCH 1/2] Moving Version to Directory.Build.props (#34055) ## Summary of the Pull Request In prep for WinAppSdk, trying to consolidate items. Version.prop is one of the first items. ## PR Checklist - [ ] **Closes:** #xxx - [ ] **Communication:** I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end user facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx ## Detailed Description of the Pull Request / Additional comments ## Validation Steps Performed --------- Co-authored-by: Jaime Bernardo --- Directory.Build.props | 12 ++++++------ PowerToys.sln | 1 + doc/devdocs/modules/launcher/new-plugin-checklist.md | 1 - installer/PowerToysSetup/Core.wxs | 10 +++++----- .../PowerToysSetup/PowerToysBootstrapper.wixproj | 6 +++--- installer/PowerToysSetup/PowerToysInstaller.wixproj | 3 ++- .../PowerToysSetupCustomActions/CustomAction.cpp | 4 ++-- src/common/AllExperiments/AllExperiments.csproj | 2 +- src/common/Common.UI/Common.UI.csproj | 2 +- .../FilePreviewCommon/FilePreviewCommon.csproj | 5 ----- .../GPOWrapperProjection/GPOWrapperProjection.csproj | 2 +- src/common/ManagedCommon/ManagedCommon.csproj | 5 ----- .../Telemetry/ManagedTelemetry.csproj | 7 +------ src/common/interop/PowerToys.Interop.vcxproj | 2 +- .../interop-tests/Microsoft.Interop.Tests.csproj | 2 +- src/common/version/version.vcxproj | 2 +- .../DSCGeneration.cs | 2 +- .../PowerToys.Settings.DSC.Schema.Generator.csproj | 2 +- .../AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj | 2 +- .../EnvironmentVariables/EnvironmentVariables.csproj | 2 +- .../EnvironmentVariablesUILib.csproj | 2 -- .../FileLocksmithUI/FileLocksmithUI.csproj | 2 +- src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj | 2 +- src/modules/Hosts/Hosts/Hosts.csproj | 2 +- src/modules/Hosts/HostsUILib/HostsUILib.csproj | 3 --- .../MeasureTool/MeasureToolUI/MeasureToolUI.csproj | 2 +- .../MouseJumpUI.UnitTests.csproj | 4 ++-- .../MouseUtils/MouseJumpUI/MouseJumpUI.csproj | 4 ++-- .../App/Helper/MouseWithoutBordersHelper.csproj | 4 ++-- .../App/MouseWithoutBorders.csproj | 4 ++-- .../App/Service/MouseWithoutBordersService.csproj | 4 ++-- src/modules/PowerOCR/PowerOCR/PowerOCR.csproj | 2 +- src/modules/awake/Awake/Awake.csproj | 4 ++-- .../colorPicker/ColorPickerUI/ColorPickerUI.csproj | 2 +- .../UnitTest-ColorPickerUI.csproj | 4 ++-- .../FancyZonesEditorCommon.csproj | 5 ----- .../UITests-FancyZones/UITests-FancyZones.csproj | 4 ++-- .../UITests-FancyZonesEditor.csproj | 4 ++-- .../editor/FancyZonesEditor/FancyZonesEditor.csproj | 4 ++-- .../imageresizer/tests/ImageResizerUITest.csproj | 4 ++-- src/modules/imageresizer/ui/ImageResizerUI.csproj | 2 +- ...mmunity.PowerToys.Run.Plugin.UnitConverter.csproj | 4 ++-- ...nity.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj | 4 ++-- ...munity.PowerToys.Run.Plugin.ValueGenerator.csproj | 4 ++-- .../Community.PowerToys.Run.Plugin.WebSearch.csproj | 4 ++-- .../Microsoft.Plugin.Folder.csproj | 4 ++-- .../Microsoft.Plugin.Indexer.csproj | 4 ++-- .../Microsoft.Plugin.Program.csproj | 4 ++-- .../Microsoft.Plugin.Shell.csproj | 4 ++-- .../Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj | 4 ++-- .../Microsoft.Plugin.WindowWalker.csproj | 4 ++-- .../Microsoft.PowerToys.Run.Plugin.Calculator.csproj | 4 ++-- .../Microsoft.PowerToys.Run.Plugin.History.csproj | 4 ++-- .../Microsoft.PowerToys.Run.Plugin.OneNote.csproj | 4 ++-- .../Microsoft.PowerToys.Run.Plugin.PowerToys.csproj | 4 ++-- .../Microsoft.PowerToys.Run.Plugin.Registry.csproj | 4 ++-- .../Microsoft.PowerToys.Run.Plugin.Service.csproj | 4 ++-- .../Microsoft.PowerToys.Run.Plugin.System.csproj | 4 ++-- .../Microsoft.PowerToys.Run.Plugin.TimeDate.csproj | 4 ++-- ...osoft.PowerToys.Run.Plugin.WindowsSettings.csproj | 4 ++-- ...osoft.PowerToys.Run.Plugin.WindowsTerminal.csproj | 4 ++-- .../PowerLauncher.Telemetry.csproj | 6 +----- .../launcher/PowerLauncher/PowerLauncher.csproj | 4 +--- .../Wox.Infrastructure/Wox.Infrastructure.csproj | 4 ++-- src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj | 4 ++-- src/modules/launcher/Wox.Test/Wox.Test.csproj | 4 ++-- src/modules/peek/Peek.Common/Peek.Common.csproj | 2 +- .../Peek.FilePreviewer/Peek.FilePreviewer.csproj | 2 +- src/modules/peek/Peek.UI/Peek.UI.csproj | 2 +- .../PowerAccent.Core/PowerAccent.Core.csproj | 2 +- .../poweraccent/PowerAccent.UI/PowerAccent.UI.csproj | 2 +- .../GcodePreviewHandler/GcodePreviewHandler.csproj | 2 +- .../GcodeThumbnailProvider.csproj | 2 +- .../MarkdownPreviewHandler.csproj | 2 +- .../MonacoPreviewHandler/MonacoPreviewHandler.csproj | 2 +- .../PdfPreviewHandler/PdfPreviewHandler.csproj | 2 +- .../PdfThumbnailProvider/PdfThumbnailProvider.csproj | 2 +- .../QoiPreviewHandler/QoiPreviewHandler.csproj | 2 +- .../QoiThumbnailProvider/QoiThumbnailProvider.csproj | 2 +- .../StlThumbnailProvider/StlThumbnailProvider.csproj | 2 +- .../SvgPreviewHandler/SvgPreviewHandler.csproj | 2 +- .../SvgThumbnailProvider/SvgThumbnailProvider.csproj | 2 +- .../UnitTests-GcodePreviewHandler.csproj | 2 +- .../UnitTests-GcodeThumbnailProvider.csproj | 2 +- .../UnitTests-MarkdownPreviewHandler.csproj | 2 +- .../UnitTests-PdfPreviewHandler.csproj | 2 +- .../UnitTests-PdfThumbnailProvider.csproj | 2 +- .../UnitTests-PreviewHandlerCommon.csproj | 2 +- .../UnitTests-QoiPreviewHandler.csproj | 2 +- .../UnitTests-QoiThumbnailProvider.csproj | 2 +- .../UnitTests-StlThumbnailProvider.csproj | 2 +- .../UnitTests-SvgPreviewHandler.csproj | 2 +- .../UnitTests-SvgThumbnailProvider.csproj | 2 +- .../previewpane/common/PreviewHandlerCommon.csproj | 2 +- .../RegistryPreview/RegistryPreview.csproj | 2 +- .../RegistryPreviewUILib/RegistryPreviewUILib.csproj | 2 -- .../Settings.UI.Library/Settings.UI.Library.csproj | 6 ------ .../Settings.UI.UnitTests.csproj | 4 ++-- .../Settings.UI/PowerToys.Settings.csproj | 2 +- 99 files changed, 139 insertions(+), 177 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 5cee923ad111..c43d90cad84a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,11 +1,13 @@ - + Copyright (C) Microsoft Corporation. All rights reserved. - Microsoft Corp. Copyright (C) Microsoft Corporation. All rights reserved. PowerToys + Microsoft Corp. Microsoft Corporation + Microsoft Corporation + PowerToys en-US x64;ARM64 PowerToys @@ -17,11 +19,9 @@ - https://github.com/microsoft/PowerToys + $(Version).0 + https://github.com/microsoft/PowerToys GitHub - - - true diff --git a/PowerToys.sln b/PowerToys.sln index 7da94ee5eb2d..21fac39d3f4f 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -176,6 +176,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.targets = Directory.Build.targets Directory.Packages.props = Directory.Packages.props Solution.props = Solution.props + src\Version.props = src\Version.props EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Settings.UI.Library", "src\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj", "{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}" diff --git a/doc/devdocs/modules/launcher/new-plugin-checklist.md b/doc/devdocs/modules/launcher/new-plugin-checklist.md index 1d76e85b7596..7287e4305e6c 100644 --- a/doc/devdocs/modules/launcher/new-plugin-checklist.md +++ b/doc/devdocs/modules/launcher/new-plugin-checklist.md @@ -4,7 +4,6 @@ - [ ] Microsoft plugin project name pattern: `Microsoft.PowerToys.Run.Plugin.{PluginName}` - [ ] Community plugin project name pattern: `Community.PowerToys.Run.Plugin.{PluginName}` - [ ] The plugin target framework should be `net8.0-windows` -- [ ] The project file should import `Version.props` and specify `$(Version).0` - [ ] If the plugin uses any 3rd party dependencies the project file should import `DynamicPlugin.props` - [ ] The plugin has to contain a `plugin.json` file of the following format in its root folder: diff --git a/installer/PowerToysSetup/Core.wxs b/installer/PowerToysSetup/Core.wxs index 81a655b3e1c0..eb39fdc9db02 100644 --- a/installer/PowerToysSetup/Core.wxs +++ b/installer/PowerToysSetup/Core.wxs @@ -51,8 +51,8 @@ - - + + @@ -63,11 +63,11 @@ - + - - + + diff --git a/installer/PowerToysSetup/PowerToysBootstrapper.wixproj b/installer/PowerToysSetup/PowerToysBootstrapper.wixproj index 71742c2c79c9..15a2000ca54e 100644 --- a/installer/PowerToysSetup/PowerToysBootstrapper.wixproj +++ b/installer/PowerToysSetup/PowerToysBootstrapper.wixproj @@ -3,9 +3,9 @@ DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - - + + + Version=$(Version) PowerToysBootstrapper diff --git a/installer/PowerToysSetup/PowerToysInstaller.wixproj b/installer/PowerToysSetup/PowerToysInstaller.wixproj index 1a4aa1f67bf9..6e83f2ef37ae 100644 --- a/installer/PowerToysSetup/PowerToysInstaller.wixproj +++ b/installer/PowerToysSetup/PowerToysInstaller.wixproj @@ -1,8 +1,9 @@ + - + Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC - Microsoft Corporation Implements the UI control for the PowerToys Environment Variables Utility MIT diff --git a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj index 77c2b3bdd73f..5576db2042e0 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj +++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj @@ -1,5 +1,5 @@  - + PowerToys.FileLocksmith diff --git a/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj b/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj index 75fa3557fc3e..0d4f5168da07 100644 --- a/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj +++ b/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 diff --git a/src/modules/Hosts/Hosts/Hosts.csproj b/src/modules/Hosts/Hosts/Hosts.csproj index 40fe3bd0de34..be30c256a4bd 100644 --- a/src/modules/Hosts/Hosts/Hosts.csproj +++ b/src/modules/Hosts/Hosts/Hosts.csproj @@ -1,5 +1,5 @@  - + WinExe diff --git a/src/modules/Hosts/HostsUILib/HostsUILib.csproj b/src/modules/Hosts/HostsUILib/HostsUILib.csproj index d4b309ca1e99..1d3dada42bef 100644 --- a/src/modules/Hosts/HostsUILib/HostsUILib.csproj +++ b/src/modules/Hosts/HostsUILib/HostsUILib.csproj @@ -1,6 +1,4 @@  - - Library net8.0-windows10.0.20348 @@ -19,7 +17,6 @@ - Microsoft Corporation Implements the UI control for the PowerToys Hosts File Editor Utility MIT diff --git a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj index 83a953ad7060..0d1c30a8b0c3 100644 --- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj +++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj @@ -1,5 +1,5 @@  - + PowerToys.MeasureTool diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj b/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj index aa18bb6ab52a..b7b14c372d38 100644 --- a/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj +++ b/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 @@ -10,7 +10,7 @@ false enable Library - $(Version).0 + diff --git a/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj b/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj index d2ec254c04a5..a01406bce93f 100644 --- a/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj +++ b/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj @@ -1,9 +1,9 @@  - + PowerToys.MouseJumpUI PowerToys MouseJumpUI - $(Version).0 + ..\..\..\..\$(Platform)\$(Configuration) false false diff --git a/src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj b/src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj index 11b35d02b10f..ffbc23ee06f4 100644 --- a/src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj +++ b/src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 10.0.19041.0 @@ -14,7 +14,7 @@ ..\..\..\..\..\$(Platform)\$(Configuration) true true - $(Version).0 + diff --git a/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj b/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj index af242f40a899..23524a607f22 100644 --- a/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj +++ b/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 10.0.19041.0 @@ -14,7 +14,7 @@ ..\..\..\..\$(Platform)\$(Configuration) true true - $(Version).0 + diff --git a/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj b/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj index 58ebacb6a4d0..66e7ca343ddc 100644 --- a/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj +++ b/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 10.0.19041.0 @@ -15,7 +15,7 @@ ..\..\..\..\..\$(Platform)\$(Configuration) true true - $(Version).0 + diff --git a/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj b/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj index 10887afce761..76966675699a 100644 --- a/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj +++ b/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj @@ -1,5 +1,5 @@  - + PowerToys.PowerOCR diff --git a/src/modules/awake/Awake/Awake.csproj b/src/modules/awake/Awake/Awake.csproj index 604841f4f6bb..568d7bc7be05 100644 --- a/src/modules/awake/Awake/Awake.csproj +++ b/src/modules/awake/Awake/Awake.csproj @@ -1,5 +1,5 @@  - + WinExe net8.0-windows10.0.20348.0 @@ -14,7 +14,7 @@ true PowerToys.Awake - $(Version).0 + Assets\Awake\Awake.ico https://awake.den.dev https://github.com/microsoft/powertoys diff --git a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj index b2da16922271..5ff28ae77492 100644 --- a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj +++ b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj @@ -1,5 +1,5 @@  - + PowerToys.ColorPickerUI PowerToys ColorPicker diff --git a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj index 20dca45f0243..9341ba9040ea 100644 --- a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj +++ b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 @@ -10,7 +10,7 @@ false enable Library - $(Version).0 + diff --git a/src/modules/fancyzones/FancyZonesEditorCommon/FancyZonesEditorCommon.csproj b/src/modules/fancyzones/FancyZonesEditorCommon/FancyZonesEditorCommon.csproj index cb9256398545..0f56e14a12c7 100644 --- a/src/modules/fancyzones/FancyZonesEditorCommon/FancyZonesEditorCommon.csproj +++ b/src/modules/fancyzones/FancyZonesEditorCommon/FancyZonesEditorCommon.csproj @@ -1,12 +1,7 @@  - - net8.0-windows10.0.20348.0 win-x64;win-arm64 - $(Version).0 - Microsoft Corporation - PowerToys PowerToys FancyZonesEditorCommon PowerToys.FancyZonesEditorCommon diff --git a/src/modules/fancyzones/UITests-FancyZones/UITests-FancyZones.csproj b/src/modules/fancyzones/UITests-FancyZones/UITests-FancyZones.csproj index 767a635a2cfa..3ceb57bc9de8 100644 --- a/src/modules/fancyzones/UITests-FancyZones/UITests-FancyZones.csproj +++ b/src/modules/fancyzones/UITests-FancyZones/UITests-FancyZones.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 @@ -10,7 +10,7 @@ false enable Library - $(Version).0 + false diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj b/src/modules/fancyzones/UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj index 67ba0d8c98ec..bff8f5b88640 100644 --- a/src/modules/fancyzones/UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj +++ b/src/modules/fancyzones/UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 @@ -10,7 +10,7 @@ false enable Library - $(Version).0 + false diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj index 98b9c0874c53..2309b4c81e21 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj +++ b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj @@ -1,10 +1,10 @@  - + PowerToys.FancyZonesEditor PowerToys FancyZones Editor PowerToys FancyZones Editor - $(Version).0 + WinExe true true diff --git a/src/modules/imageresizer/tests/ImageResizerUITest.csproj b/src/modules/imageresizer/tests/ImageResizerUITest.csproj index 5f46cdf39d82..2e7487b0b086 100644 --- a/src/modules/imageresizer/tests/ImageResizerUITest.csproj +++ b/src/modules/imageresizer/tests/ImageResizerUITest.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 @@ -10,7 +10,7 @@ Properties ImageResizer ImageResizer.Test - $(Version).0 + $(SolutionDir)$(Platform)\$(Configuration)\tests\$(AssemblyName)\ diff --git a/src/modules/imageresizer/ui/ImageResizerUI.csproj b/src/modules/imageresizer/ui/ImageResizerUI.csproj index 8c1af9237617..c68ff6b1faeb 100644 --- a/src/modules/imageresizer/ui/ImageResizerUI.csproj +++ b/src/modules/imageresizer/ui/ImageResizerUI.csproj @@ -1,5 +1,5 @@  - + PowerToys.ImageResizer diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj index 99c7afcafc98..6cc95e6f4745 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj @@ -1,5 +1,5 @@  - + net8.0-windows @@ -7,7 +7,7 @@ Properties Community.PowerToys.Run.Plugin.UnitConverter Community.PowerToys.Run.Plugin.UnitConverter - $(Version).0 + true false false diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj index 1f686fab7eea..e39a91b07211 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj @@ -1,5 +1,5 @@  - + net8.0-windows @@ -7,7 +7,7 @@ Properties Community.PowerToys.Run.Plugin.VSCodeWorkspaces Community.PowerToys.Run.Plugin.VSCodeWorkspaces - $(Version).0 + true false false diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj index 80fb46deea9a..fda1abda75ec 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj @@ -1,11 +1,11 @@  - + net8.0-windows {D095BE44-1F2E-463E-A494-121892A75EA2} true - $(Version).0 + Community.PowerToys.Run.Plugin.ValueGenerator Community.PowerToys.Run.Plugin.ValueGenerator false diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj index fb6c164ad4f7..701cabbe3560 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj @@ -1,5 +1,5 @@  - + net8.0-windows @@ -7,7 +7,7 @@ Properties Community.PowerToys.Run.Plugin.WebSearch Community.PowerToys.Run.Plugin.WebSearch - $(Version).0 + true false false diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj index 9f003281f342..1b905bd088a2 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj @@ -1,5 +1,5 @@  - + net8.0-windows @@ -7,7 +7,7 @@ Properties Microsoft.Plugin.Folder Microsoft.Plugin.Folder - $(Version).0 + true false false diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj index 43e1920f4682..23fbf5239c19 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj @@ -1,5 +1,5 @@  - + net8.0-windows @@ -7,7 +7,7 @@ Properties Microsoft.Plugin.Indexer Microsoft.Plugin.Indexer - $(Version).0 + true false false diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj index 4507376b0610..6de692895a5f 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 @@ -9,7 +9,7 @@ Properties Microsoft.Plugin.Program Microsoft.Plugin.Program - $(Version).0 + true true false diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj index 7e16361c9cdf..030aaf9fea1c 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj @@ -1,5 +1,5 @@  - + net8.0-windows @@ -7,7 +7,7 @@ Properties Microsoft.Plugin.Shell Microsoft.Plugin.Shell - $(Version).0 + true false false diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj index dc10119fe005..56161d9eea0b 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj @@ -1,5 +1,5 @@  - + net8.0-windows @@ -7,7 +7,7 @@ Properties Microsoft.Plugin.Uri Microsoft.Plugin.Uri - $(Version).0 + true false false diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj index 5077812e5cd2..585c8991710e 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj @@ -1,5 +1,5 @@  - + net8.0-windows @@ -7,7 +7,7 @@ Properties Microsoft.Plugin.WindowWalker Microsoft.Plugin.WindowWalker - $(Version).0 + true false false diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj index cb639ef60ecc..d513ee0d7baf 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj @@ -1,5 +1,5 @@  - + net8.0-windows @@ -7,7 +7,7 @@ Properties Microsoft.PowerToys.Run.Plugin.Calculator Microsoft.PowerToys.Run.Plugin.Calculator - $(Version).0 + true false false diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj index d1d5af59189f..9b0128edb1a3 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 @@ -9,7 +9,7 @@ Properties Microsoft.PowerToys.Run.Plugin.History Microsoft.PowerToys.Run.Plugin.History - $(Version).0 + true false false diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj index 9a882257ff12..053734f08c23 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj @@ -1,11 +1,11 @@  - + net8.0-windows Microsoft.PowerToys.Run.Plugin.OneNote Microsoft.PowerToys.Run.Plugin.OneNote enable - $(Version).0 + false false true diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj index 4b500715e54f..684420d67238 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj @@ -1,6 +1,6 @@  - + net8.0-windows10.0.20348.0 @@ -8,7 +8,7 @@ 10.0.19041.0 Microsoft.PowerToys.Run.Plugin.PowerToys Microsoft.PowerToys.Run.Plugin.PowerToys - $(Version).0 + false false true diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj index b59ea0d6f79c..a4773450c59d 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj @@ -1,10 +1,10 @@  - + net8.0-windows Microsoft.PowerToys.Run.Plugin.Registry Microsoft.PowerToys.Run.Plugin.Registry - $(Version).0 + false false enable diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj index 7b9bde7411ee..8143e31c388e 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj @@ -1,12 +1,12 @@ - + net8.0-windows Microsoft.PowerToys.Run.Plugin.Service Microsoft.PowerToys.Run.Plugin.Service - $(Version).0 + false false true diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj index 56843e6d8155..cbd48fa4a887 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj @@ -1,5 +1,5 @@  - + Library @@ -7,7 +7,7 @@ Properties Microsoft.PowerToys.Run.Plugin.System Microsoft.PowerToys.Run.Plugin.System - $(Version).0 + true false false diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj index a6b86ea8d986..e44a8b68f5bf 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj @@ -1,5 +1,5 @@  - + Library @@ -7,7 +7,7 @@ Properties Microsoft.PowerToys.Run.Plugin.TimeDate Microsoft.PowerToys.Run.Plugin.TimeDate - $(Version).0 + true false false diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj index bf0bde34155b..9aad8dc12118 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj @@ -1,5 +1,5 @@  - + net8.0-windows @@ -7,7 +7,7 @@ Properties Microsoft.PowerToys.Run.Plugin.WindowsSettings Microsoft.PowerToys.Run.Plugin.WindowsSettings - $(Version).0 + false false true diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj index 7bd545a21ee3..b37b27e7c1c7 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj @@ -1,6 +1,6 @@  - + net8.0-windows10.0.20348.0 @@ -8,7 +8,7 @@ 10.0.19041.0 Microsoft.PowerToys.Run.Plugin.WindowsTerminal Microsoft.PowerToys.Run.Plugin.WindowsTerminal - $(Version).0 + false false true diff --git a/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj b/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj index 6abe925f1061..d403fdd1113a 100644 --- a/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj +++ b/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj @@ -1,11 +1,7 @@  - + net8.0-windows - - - $(Version).0 - Microsoft Corporation PowerToys PowerLauncher Telemetry PowerToys.PowerLauncher.Telemetry diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index b3c3db3371c2..cb64842e3025 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -1,5 +1,5 @@  - + PowerToys.Run WinExe @@ -15,8 +15,6 @@ false false uap10.0.19041 - $(Version).0 - Microsoft Corporation PowerToys PowerLauncher PowerToys.PowerLauncher ..\..\..\..\$(Platform)\$(Configuration) diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj index ec105cc0b79d..4defd7acb499 100644 --- a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj +++ b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj @@ -1,5 +1,5 @@  - + net8.0-windows @@ -9,7 +9,7 @@ Properties Wox.Infrastructure Wox.Infrastructure - $(Version).0 + false false ..\..\..\..\$(Platform)\$(Configuration)\WoxInfrastructure diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj index 77afe1c19522..02dcf7169a4a 100644 --- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj +++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj @@ -1,5 +1,5 @@  - + net8.0-windows @@ -9,7 +9,7 @@ Properties Wox.Plugin Wox.Plugin - $(Version).0 + false false true diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index 1fc71efe8525..e0702852e689 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 @@ -10,7 +10,7 @@ Properties Wox.Test Wox.Test - $(Version).0 + ..\..\..\..\$(Platform)\$(Configuration)\tests\WoxTest diff --git a/src/modules/peek/Peek.Common/Peek.Common.csproj b/src/modules/peek/Peek.Common/Peek.Common.csproj index cd2ccb540c9b..f6a18306d62a 100644 --- a/src/modules/peek/Peek.Common/Peek.Common.csproj +++ b/src/modules/peek/Peek.Common/Peek.Common.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 10.0.19041.0 diff --git a/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj b/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj index 495a21289f45..a304d2442fb7 100644 --- a/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj +++ b/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 10.0.19041.0 diff --git a/src/modules/peek/Peek.UI/Peek.UI.csproj b/src/modules/peek/Peek.UI/Peek.UI.csproj index a096df09f7d1..ba0792341ae1 100644 --- a/src/modules/peek/Peek.UI/Peek.UI.csproj +++ b/src/modules/peek/Peek.UI/Peek.UI.csproj @@ -1,5 +1,5 @@ - + PowerToys.Peek.UI PowerToys.Peek.UI diff --git a/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj b/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj index 2d7a2f5c7b25..a483bd5d06e3 100644 --- a/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj +++ b/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj @@ -1,5 +1,5 @@  - + net8.0-windows10.0.20348.0 10.0.19041.0 diff --git a/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj b/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj index 4fefdd9dd8ad..313a8809270b 100644 --- a/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj +++ b/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj @@ -1,5 +1,5 @@  - + WinExe net8.0-windows10.0.20348.0 diff --git a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj index 1f58af39db1f..ed6058eb8fd8 100644 --- a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj +++ b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj @@ -31,7 +31,7 @@ 10.0.19041.0 - + diff --git a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj index 034e87d70e95..8972f5a1b45e 100644 --- a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj +++ b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj @@ -27,7 +27,7 @@ win-arm64 - + diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj index 850f08918bb1..a604cdaa9dc6 100644 --- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj @@ -32,7 +32,7 @@ PowerToys.MarkdownPreviewHandler - + diff --git a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj index bb4da33302cc..6101e91dcbfe 100644 --- a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj +++ b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj @@ -22,7 +22,7 @@ win-arm64 - + Microsoft.PowerToys.PreviewHandler.Monaco diff --git a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj index 33f144465817..8f04d5dafe06 100644 --- a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj +++ b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj @@ -32,7 +32,7 @@ PowerToys.PdfPreviewHandler - + diff --git a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj index 6ba3939773cb..cc91e3048bed 100644 --- a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj +++ b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj @@ -27,7 +27,7 @@ win-arm64 - + PowerToys.GPOWrapper diff --git a/src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandler.csproj b/src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandler.csproj index 66936c38d3ca..a4701234b81d 100644 --- a/src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandler.csproj +++ b/src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandler.csproj @@ -31,7 +31,7 @@ 10.0.19041.0 - + diff --git a/src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj b/src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj index 6ab6ce01b8a0..9057256363ce 100644 --- a/src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj +++ b/src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj @@ -27,7 +27,7 @@ win-arm64 - + diff --git a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj index 9c140a2ccab6..74af39c5a871 100644 --- a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj +++ b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj @@ -28,7 +28,7 @@ win-arm64 - + PowerToys.GPOWrapper diff --git a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj index 9bb25fbd6b23..e3c3c5166945 100644 --- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj +++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj @@ -33,7 +33,7 @@ PowerToys.SvgPreviewHandler - + diff --git a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj index 9bdd51457188..f6f95642f953 100644 --- a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj @@ -29,7 +29,7 @@ win-arm64 - + diff --git a/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj b/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj index 2d15c18d30e6..7a91b28c1499 100644 --- a/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj @@ -18,7 +18,7 @@ False - + diff --git a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj index d5fccab83a71..4f9b073f134c 100644 --- a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj @@ -19,7 +19,7 @@ UnitTest - + diff --git a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj index 0dd966762076..e362cc375cf7 100644 --- a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj @@ -19,7 +19,7 @@ False - + diff --git a/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj b/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj index be425bdf07cf..6600ae39bd9a 100644 --- a/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj @@ -18,7 +18,7 @@ False - + diff --git a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj index 0d88ee209aff..c0cdcfbc30ac 100644 --- a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj @@ -19,7 +19,7 @@ UnitTest - + diff --git a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj index 86f051a75978..2d4b8494e06c 100644 --- a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj @@ -17,7 +17,7 @@ UnitTest - + diff --git a/src/modules/previewpane/UnitTests-QoiPreviewHandler/UnitTests-QoiPreviewHandler.csproj b/src/modules/previewpane/UnitTests-QoiPreviewHandler/UnitTests-QoiPreviewHandler.csproj index 9c3abb5f7618..d008508112bb 100644 --- a/src/modules/previewpane/UnitTests-QoiPreviewHandler/UnitTests-QoiPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-QoiPreviewHandler/UnitTests-QoiPreviewHandler.csproj @@ -18,7 +18,7 @@ False - + diff --git a/src/modules/previewpane/UnitTests-QoiThumbnailProvider/UnitTests-QoiThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-QoiThumbnailProvider/UnitTests-QoiThumbnailProvider.csproj index 488ba4e23316..244ca2dd0a14 100644 --- a/src/modules/previewpane/UnitTests-QoiThumbnailProvider/UnitTests-QoiThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-QoiThumbnailProvider/UnitTests-QoiThumbnailProvider.csproj @@ -19,7 +19,7 @@ UnitTest - + diff --git a/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj index c15eadf31c38..7967bf9911f6 100644 --- a/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj @@ -19,7 +19,7 @@ UnitTest - + diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj index 7c5af71daabd..912835f7fa8e 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj @@ -19,7 +19,7 @@ UnitTest - + diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj index 85834695e964..ca5529fa27af 100644 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj @@ -19,7 +19,7 @@ UnitTest - + diff --git a/src/modules/previewpane/common/PreviewHandlerCommon.csproj b/src/modules/previewpane/common/PreviewHandlerCommon.csproj index bb1f8043d0dd..d50f8f6c2806 100644 --- a/src/modules/previewpane/common/PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/common/PreviewHandlerCommon.csproj @@ -18,7 +18,7 @@ PowerToys.PreviewHandlerCommon - + diff --git a/src/modules/registrypreview/RegistryPreview/RegistryPreview.csproj b/src/modules/registrypreview/RegistryPreview/RegistryPreview.csproj index 26623d6ee39e..59ca16831b37 100644 --- a/src/modules/registrypreview/RegistryPreview/RegistryPreview.csproj +++ b/src/modules/registrypreview/RegistryPreview/RegistryPreview.csproj @@ -1,5 +1,5 @@  - + WinExe net8.0-windows10.0.20348.0 diff --git a/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUILib.csproj b/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUILib.csproj index 1069ed73a26b..63479b375330 100644 --- a/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUILib.csproj +++ b/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUILib.csproj @@ -1,5 +1,4 @@  - Library net8.0-windows10.0.20348 @@ -19,7 +18,6 @@ - Microsoft Corporation Implements the UI control for the PowerToys Registry Preview Utility MIT diff --git a/src/settings-ui/Settings.UI.Library/Settings.UI.Library.csproj b/src/settings-ui/Settings.UI.Library/Settings.UI.Library.csproj index c967118010a4..92df15f1021b 100644 --- a/src/settings-ui/Settings.UI.Library/Settings.UI.Library.csproj +++ b/src/settings-ui/Settings.UI.Library/Settings.UI.Library.csproj @@ -1,14 +1,8 @@  - - - net8.0-windows win-x64;win-arm64 net8.0-windows - $(Version).0 - Microsoft Corporation - PowerToys PowerToys Settings UI Library PowerToys.Settings.UI.Lib true diff --git a/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj b/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj index 17f500d0fa6d..aba99e9be6de 100644 --- a/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj +++ b/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj @@ -1,12 +1,12 @@  - + net8.0-windows10.0.20348.0 10.0.19041.0 10.0.19041.0 false win-x64;win-arm64 - $(Version).0 + diff --git a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj index 1670acb55388..5c809676656b 100644 --- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj +++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj @@ -1,5 +1,5 @@  - + WinExe net8.0-windows10.0.20348.0 From fd706dec903e232c2a14943192e99a5c2b06cd1a Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Mon, 5 Aug 2024 14:29:11 -0700 Subject: [PATCH 2/2] Consolidation for self contained, built on #34055 (#34134) ## Summary of the Pull Request First step on self containment. Once #34055 goes in, this number of modified files should go way down. Common.Selfcontained.props is the new item and src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj would be an example of a file that had SelfContained set to true prior and now that logic was moved into a single file. ## PR Checklist - [ ] **Closes:** #xxx - [ ] **Communication:** I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end user facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx ## Detailed Description of the Pull Request / Additional comments ## Validation Steps Performed --------- Co-authored-by: Jaime Bernardo --- Directory.Build.props | 2 +- PowerToys.sln | 1 + src/Common.SelfContained.props | 15 +++++++++++++++ ...erToys.Settings.DSC.Schema.Generator.csproj | 14 ++++---------- .../AdvancedPaste/AdvancedPaste.csproj | 14 ++++---------- .../EnvironmentVariables.csproj | 15 +++++---------- .../FileLocksmithUI/FileLocksmithUI.csproj | 14 ++++---------- src/modules/Hosts/Hosts/Hosts.csproj | 14 ++++---------- .../MeasureToolUI/MeasureToolUI.csproj | 14 ++++---------- .../MouseUtils/MouseJumpUI/MouseJumpUI.csproj | 16 +++++----------- .../Helper/MouseWithoutBordersHelper.csproj | 14 ++++---------- .../App/MouseWithoutBorders.csproj | 16 +++++----------- .../Service/MouseWithoutBordersService.csproj | 15 +++++---------- src/modules/PowerOCR/PowerOCR/PowerOCR.csproj | 14 ++++---------- src/modules/awake/Awake/Awake.csproj | 15 +++++---------- .../ColorPickerUI/ColorPickerUI.csproj | 15 +++++---------- .../FancyZonesEditor/FancyZonesEditor.csproj | 15 +++++---------- .../imageresizer/ui/ImageResizerUI.csproj | 14 ++++---------- .../PowerLauncher/PowerLauncher.csproj | 15 +++++---------- src/modules/peek/Peek.UI/Peek.UI.csproj | 15 +++++---------- .../PowerAccent.Core/PowerAccent.Core.csproj | 18 +++++------------- .../PowerAccent.UI/PowerAccent.UI.csproj | 13 ++++--------- .../GcodePreviewHandler.csproj | 14 +++++--------- .../GcodeThumbnailProvider.csproj | 16 +++++----------- .../MarkdownPreviewHandler.csproj | 16 +++++----------- .../MonacoPreviewHandler.csproj | 16 +++++----------- .../PdfPreviewHandler/PdfPreviewHandler.csproj | 16 +++++----------- .../PdfThumbnailProvider.csproj | 14 ++++---------- .../QoiPreviewHandler/QoiPreviewHandler.csproj | 13 ++++--------- .../QoiThumbnailProvider.csproj | 16 +++++----------- .../StlThumbnailProvider.csproj | 14 ++++---------- .../SvgPreviewHandler/SvgPreviewHandler.csproj | 15 ++++----------- .../SvgThumbnailProvider.csproj | 16 +++++----------- .../RegistryPreview/RegistryPreview.csproj | 17 +++++------------ .../Settings.UI.Library.csproj | 13 ++++--------- .../Settings.UI/PowerToys.Settings.csproj | 15 +++++---------- 36 files changed, 168 insertions(+), 341 deletions(-) create mode 100644 src/Common.SelfContained.props diff --git a/Directory.Build.props b/Directory.Build.props index c43d90cad84a..743aba41dc63 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -85,7 +85,7 @@ false - 202407200737 + 202408050737 + + + true + + + + + win-x64 + + + win-arm64 + + \ No newline at end of file diff --git a/src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj b/src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj index 1ed2c23220a4..0b6ad0cf8588 100644 --- a/src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj +++ b/src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj @@ -1,5 +1,8 @@  - + + Exe net8.0-windows @@ -9,15 +12,6 @@ None false false - true - - - - - win-x64 - - - win-arm64 diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj index e1b687c337df..e63bea668d1b 100644 --- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj +++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj @@ -1,5 +1,8 @@  - + + WinExe @@ -17,7 +20,6 @@ true None true - true PowerToys.AdvancedPaste PowerToys AdvancedPaste AdvancedPaste @@ -28,14 +30,6 @@ DISABLE_XAML_GENERATED_MAIN,TRACE - - - win-x64 - - - win-arm64 - - PowerToys.GPOWrapper diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj index 3ba6df621a1f..72d7298bf61b 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj +++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj @@ -1,5 +1,9 @@  - + + + WinExe net8.0-windows10.0.20348.0 @@ -16,7 +20,6 @@ false false true - true DISABLE_XAML_GENERATED_MAIN,TRACE ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps PowerToys.EnvironmentVariables @@ -47,14 +50,6 @@ - - - win-x64 - - - win-arm64 - - PowerToys.GPOWrapper diff --git a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj index 5576db2042e0..2f244cc72d46 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj +++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj @@ -1,5 +1,8 @@  - + + PowerToys.FileLocksmith @@ -21,7 +24,6 @@ None true Assets/FileLocksmith/Icon.ico - true PowerToys.FileLocksmithUI.pri @@ -33,14 +35,6 @@ - - - win-x64 - - - win-arm64 - - 0436 diff --git a/src/modules/Hosts/Hosts/Hosts.csproj b/src/modules/Hosts/Hosts/Hosts.csproj index be30c256a4bd..1344490c53ae 100644 --- a/src/modules/Hosts/Hosts/Hosts.csproj +++ b/src/modules/Hosts/Hosts/Hosts.csproj @@ -1,5 +1,8 @@  - + + WinExe @@ -18,7 +21,6 @@ ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps PowerToys.Hosts DISABLE_XAML_GENERATED_MAIN,TRACE - true Assets/Hosts/Hosts.ico PowerToys.Hosts.pri @@ -55,14 +57,6 @@ - - - win-x64 - - - win-arm64 - - PowerToys.GPOWrapper diff --git a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj index 0d1c30a8b0c3..ca4861e07ebc 100644 --- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj +++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj @@ -1,5 +1,8 @@  - + + PowerToys.MeasureTool @@ -21,7 +24,6 @@ None true 10.0.19041.0 - true PowerToys.MeasureToolUI.pri @@ -33,14 +35,6 @@ - - - win-x64 - - - win-arm64 - - PowerToys.MeasureToolCore;PowerToys.GPOWrapper diff --git a/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj b/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj index a01406bce93f..085567e5c1f6 100644 --- a/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj +++ b/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj @@ -1,28 +1,22 @@  - + + + PowerToys.MouseJumpUI PowerToys MouseJumpUI - ..\..\..\..\$(Platform)\$(Configuration) false false true true MouseJumpUI.Program - true true enable - - - win-x64 - - - win-arm64 - - PerMonitorV2 diff --git a/src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj b/src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj index ffbc23ee06f4..c78280623dd9 100644 --- a/src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj +++ b/src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj @@ -1,4 +1,8 @@  + + net8.0-windows10.0.20348.0 @@ -13,16 +17,6 @@ true ..\..\..\..\..\$(Platform)\$(Configuration) true - true - - - - - - win-x64 - - - win-arm64 diff --git a/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj b/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj index 23524a607f22..9f7fa4502df2 100644 --- a/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj +++ b/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj @@ -1,5 +1,9 @@  - + + + net8.0-windows10.0.20348.0 10.0.19041.0 @@ -13,16 +17,6 @@ true ..\..\..\..\$(Platform)\$(Configuration) true - true - - - - - - win-x64 - - - win-arm64 diff --git a/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj b/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj index 66e7ca343ddc..2297ff2f0dff 100644 --- a/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj +++ b/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj @@ -1,5 +1,9 @@  - + + + net8.0-windows10.0.20348.0 10.0.19041.0 @@ -14,17 +18,8 @@ true ..\..\..\..\..\$(Platform)\$(Configuration) true - true - - - - win-x64 - - - win-arm64 - TRACE;DEBUG;SHOW_ON_WINLOGON CODE_ANALYSIS CUSTOMIZE_LOGON_SCREEN false diff --git a/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj b/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj index 76966675699a..d6dec6004bb0 100644 --- a/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj +++ b/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj @@ -1,5 +1,8 @@  - + + PowerToys.PowerOCR @@ -10,15 +13,6 @@ enable true true - true - - - - - win-x64 - - - win-arm64 diff --git a/src/modules/awake/Awake/Awake.csproj b/src/modules/awake/Awake/Awake.csproj index 568d7bc7be05..c48e9b1f7b47 100644 --- a/src/modules/awake/Awake/Awake.csproj +++ b/src/modules/awake/Awake/Awake.csproj @@ -1,5 +1,9 @@  - + + + WinExe net8.0-windows10.0.20348.0 @@ -18,18 +22,9 @@ Assets\Awake\Awake.ico https://awake.den.dev https://github.com/microsoft/powertoys - true true - - - win-x64 - - - win-arm64 - - PowerToys.GPOWrapper diff --git a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj index 5ff28ae77492..6829cf33a412 100644 --- a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj +++ b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj @@ -1,5 +1,9 @@  - + + + PowerToys.ColorPickerUI PowerToys ColorPicker @@ -9,15 +13,6 @@ true true ColorPicker.Program - true - - - - - win-x64 - - - win-arm64 diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj index 2309b4c81e21..1438d16d251b 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj +++ b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj @@ -1,5 +1,9 @@  - + + + PowerToys.FancyZonesEditor PowerToys FancyZones Editor @@ -12,15 +16,6 @@ false true ..\..\..\..\..\$(Platform)\$(Configuration) - true - - - - - win-x64 - - - win-arm64 diff --git a/src/modules/imageresizer/ui/ImageResizerUI.csproj b/src/modules/imageresizer/ui/ImageResizerUI.csproj index c68ff6b1faeb..f6eca2310ccd 100644 --- a/src/modules/imageresizer/ui/ImageResizerUI.csproj +++ b/src/modules/imageresizer/ui/ImageResizerUI.csproj @@ -1,5 +1,8 @@  - + + PowerToys.ImageResizer @@ -8,15 +11,6 @@ false true true - true - - - - - win-x64 - - - win-arm64 diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index cb64842e3025..1405485758e2 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -1,5 +1,9 @@  - + + + PowerToys.Run WinExe @@ -19,15 +23,6 @@ PowerToys.PowerLauncher ..\..\..\..\$(Platform)\$(Configuration) true - true - - - - - win-x64 - - - win-arm64 diff --git a/src/modules/peek/Peek.UI/Peek.UI.csproj b/src/modules/peek/Peek.UI/Peek.UI.csproj index ba0792341ae1..dc1632bd9c19 100644 --- a/src/modules/peek/Peek.UI/Peek.UI.csproj +++ b/src/modules/peek/Peek.UI/Peek.UI.csproj @@ -1,5 +1,9 @@ - + + + PowerToys.Peek.UI PowerToys.Peek.UI @@ -25,7 +29,6 @@ Assets\Peek\Icon.ico PowerToys.Peek.UI.pri - true @@ -35,14 +38,6 @@ - - - win-x64 - - - win-arm64 - - PowerToys.GPOWrapper diff --git a/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj b/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj index a483bd5d06e3..785ba62a4f10 100644 --- a/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj +++ b/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj @@ -1,5 +1,9 @@  - + + + net8.0-windows10.0.20348.0 10.0.19041.0 @@ -10,15 +14,6 @@ True true true - true - - - - - win-x64 - - - win-arm64 @@ -41,7 +36,4 @@ - - - diff --git a/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj b/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj index 313a8809270b..fae9fd4a0916 100644 --- a/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj +++ b/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj @@ -1,4 +1,8 @@  + + WinExe @@ -16,15 +20,6 @@ ..\..\..\..\$(Platform)\$(Configuration) false false - true - - - - - win-x64 - - - win-arm64 diff --git a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj index ed6058eb8fd8..55b5991060da 100644 --- a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj +++ b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj @@ -1,4 +1,9 @@  + + + enable true @@ -12,15 +17,6 @@ true true PowerToys.GcodePreviewHandler - true - - - - - win-x64 - - - win-arm64 diff --git a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj index 8972f5a1b45e..28098bb6c721 100644 --- a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj +++ b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj @@ -1,4 +1,9 @@  + + + enable true @@ -16,18 +21,7 @@ false false true - true - - - - - win-x64 - - win-arm64 - - - diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj index a604cdaa9dc6..1af1f04bf2e9 100644 --- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj @@ -1,4 +1,9 @@ + + + enable true @@ -15,15 +20,6 @@ net8.0-windows10.0.20348.0 10.0.19041.0 10.0.19041.0 - true - - - - - win-x64 - - - win-arm64 @@ -32,8 +28,6 @@ PowerToys.MarkdownPreviewHandler - - diff --git a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj index 6101e91dcbfe..c4be04fd106c 100644 --- a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj +++ b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj @@ -1,4 +1,9 @@ + + + enable true @@ -11,18 +16,7 @@ true true win-x64;win-arm64 - true - - - - - win-x64 - - win-arm64 - - - Microsoft.PowerToys.PreviewHandler.Monaco diff --git a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj index 8f04d5dafe06..0ae30af798c3 100644 --- a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj +++ b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj @@ -1,4 +1,9 @@  + + + enable true @@ -12,15 +17,6 @@ false true true - true - - - - - win-x64 - - - win-arm64 @@ -32,8 +28,6 @@ PowerToys.PdfPreviewHandler - - diff --git a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj index cc91e3048bed..28fd57e53dd4 100644 --- a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj +++ b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj @@ -1,4 +1,8 @@ + + enable true @@ -16,17 +20,7 @@ false false true - true - - - - win-x64 - - - win-arm64 - - diff --git a/src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandler.csproj b/src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandler.csproj index a4701234b81d..53f28a44ace6 100644 --- a/src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandler.csproj +++ b/src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandler.csproj @@ -1,4 +1,8 @@  + + enable true @@ -12,15 +16,6 @@ true true PowerToys.QoiPreviewHandler - true - - - - - win-x64 - - - win-arm64 diff --git a/src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj b/src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj index 9057256363ce..243c3a0624a6 100644 --- a/src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj +++ b/src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj @@ -1,4 +1,9 @@  + + + enable true @@ -16,19 +21,8 @@ false false true - true - - - win-x64 - - - win-arm64 - - - - PowerToys.GPOWrapper diff --git a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj index 74af39c5a871..008b206cb99e 100644 --- a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj +++ b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj @@ -1,4 +1,8 @@  + + enable true @@ -17,17 +21,7 @@ false true true - true - - - - win-x64 - - - win-arm64 - - diff --git a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj index e3c3c5166945..ab2bb088a2ad 100644 --- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj +++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj @@ -1,4 +1,8 @@ + + enable true @@ -16,15 +20,6 @@ net8.0-windows10.0.20348.0 10.0.19041.0 10.0.19041.0 - true - - - - - win-x64 - - - win-arm64 @@ -33,8 +28,6 @@ PowerToys.SvgPreviewHandler - - True diff --git a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj index f6f95642f953..2f780d53cb8d 100644 --- a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj @@ -1,4 +1,9 @@ + + + enable true @@ -18,19 +23,8 @@ false true win-x64;win-arm64 - true - - - win-x64 - - - win-arm64 - - - - PowerToys.GPOWrapper diff --git a/src/modules/registrypreview/RegistryPreview/RegistryPreview.csproj b/src/modules/registrypreview/RegistryPreview/RegistryPreview.csproj index 59ca16831b37..fd8b78d51da8 100644 --- a/src/modules/registrypreview/RegistryPreview/RegistryPreview.csproj +++ b/src/modules/registrypreview/RegistryPreview/RegistryPreview.csproj @@ -1,5 +1,9 @@  - + + + WinExe net8.0-windows10.0.20348.0 @@ -16,7 +20,6 @@ false false true - true ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps PowerToys.RegistryPreview Assets\RegistryPreview\RegistryPreview.ico @@ -34,16 +37,6 @@ - - - - - win-x64 - - - win-arm64 - - diff --git a/src/settings-ui/Settings.UI.Library/Settings.UI.Library.csproj b/src/settings-ui/Settings.UI.Library/Settings.UI.Library.csproj index 92df15f1021b..d28cfa4bac2b 100644 --- a/src/settings-ui/Settings.UI.Library/Settings.UI.Library.csproj +++ b/src/settings-ui/Settings.UI.Library/Settings.UI.Library.csproj @@ -1,19 +1,14 @@  + + net8.0-windows win-x64;win-arm64 net8.0-windows PowerToys Settings UI Library PowerToys.Settings.UI.Lib - true - - - - - win-x64 - - - win-arm64 diff --git a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj index 5c809676656b..0bfd8b7616ec 100644 --- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj +++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj @@ -1,5 +1,9 @@  - + + + WinExe net8.0-windows10.0.20348.0 @@ -17,7 +21,6 @@ true ..\..\..\$(Platform)\$(Configuration)\WinUI3Apps - true PowerToys.Settings.pri @@ -33,14 +36,6 @@ - - - win-x64 - - - win-arm64 - - True