From 58aa274b216325fd93dc9e8d14e524b98d4a5820 Mon Sep 17 00:00:00 2001 From: CleanCodeDeveloper <16760760+CleanCodeDeveloper@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:35:52 +0100 Subject: [PATCH] [Launcher Plugins] Move shared keys into central props file (#17214) * [Launcher Plugins] Move shared keys into central props file * fixes * TreatWarningsAsErrors is set to true now. This caused a few errors to pop up --- ...s.Run.Plugin.UnitConverter.UnitTest.csproj | 6 +- ....PowerToys.Run.Plugin.UnitConverter.csproj | 15 ----- ...werToys.Run.Plugin.VSCodeWorkspaces.csproj | 22 ++----- ...nity.PowerToys.Run.Plugin.WebSearch.csproj | 20 +----- .../Microsoft.Plugin.Folder.csproj | 25 +------- .../Microsoft.Plugin.Indexer.csproj | 23 ++----- .../Microsoft.Plugin.Program.UnitTests.csproj | 13 +--- .../Microsoft.Plugin.Program.csproj | 25 +------- .../Microsoft.Plugin.Shell.csproj | 31 +++------ .../Microsoft.Plugin.Uri.csproj | 40 +++--------- ...osoft.Plugin.WindowWalker.UnitTests.csproj | 5 +- .../Microsoft.Plugin.WindowWalker.csproj | 49 ++++----------- ...oft.PowerToys.Run.Plugin.Calculator.csproj | 34 +++------- ...rToys.Run.Plugin.Registry.UnitTests.csproj | 17 +---- ...osoft.PowerToys.Run.Plugin.Registry.csproj | 21 +------ ...rosoft.PowerToys.Run.Plugin.Service.csproj | 23 ++----- ...werToys.Run.Plugin.System.UnitTests.csproj | 3 +- ...crosoft.PowerToys.Run.Plugin.System.csproj | 63 +++++++------------ ...rToys.Run.Plugin.TimeDate.UnitTests.csproj | 5 +- ...osoft.PowerToys.Run.Plugin.TimeDate.csproj | 37 +++-------- ...osoft.PowerToys.Run.Plugin.TimeZone.csproj | 23 +------ .../Helper/ResultHelper.cs | 11 ++-- ...owerToys.Run.Plugin.WindowsSettings.csproj | 25 ++------ ...owerToys.Run.Plugin.WindowsTerminal.csproj | 12 +--- 24 files changed, 116 insertions(+), 432 deletions(-) diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest.csproj index 10ad664a17..a3c5bdea8a 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest.csproj @@ -4,12 +4,8 @@ net6.0-windows false - - x64 - - - x64 + x64 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 71a20e9b5c..28429e08fa 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 @@ -12,9 +12,6 @@ false false x64 - en-US - true - Recommended @@ -22,13 +19,7 @@ ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\UnitConverter\ DEBUG;TRACE full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 false - true @@ -36,12 +27,6 @@ TRACE true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - true 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 8f87adac14..5a8afd7ff9 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 @@ -12,36 +12,22 @@ false false x64 - true - Recommended - en-US - + x64 + true - ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\VSCodeWorkspaces\ + ..\..\..\..\..\x64\$(Configuration)\modules\launcher\Plugins\VSCodeWorkspaces\ DEBUG;TRACE full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 false - true - ..\..\..\..\..\x64\Release\modules\launcher\Plugins\VSCodeWorkspaces\ + ..\..\..\..\..\x64\$(Configuration)\modules\launcher\Plugins\VSCodeWorkspaces\ TRACE true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - true 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 a58c37c4df..a9df55d60f 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 @@ -12,36 +12,22 @@ false false x64 - en-US - true - Recommended + x64 true - ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\WebSearch\ + ..\..\..\..\..\x64\$(Configuration)\modules\launcher\Plugins\WebSearch\ DEBUG;TRACE full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 false - true - ..\..\..\..\..\x64\Release\modules\launcher\Plugins\WebSearch\ + ..\..\..\..\..\x64\$(Configuration)\modules\launcher\Plugins\WebSearch\ TRACE true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - true 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 bb40621a34..50b5e19cb2 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,6 +1,6 @@  - - + + net6.0-windows {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} @@ -12,9 +12,7 @@ false false x64 - en-US - true - Recommended + x64 @@ -22,13 +20,7 @@ ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Folder\ DEBUG;TRACE full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 false - true @@ -36,19 +28,8 @@ TRACE true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - - - - - - PreserveNewest 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 328ff9f5e7..d9ee71b5b5 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,6 +1,6 @@  - - + + net6.0-windows {F8B870EB-D5F5-45BA-9CF7-A5C459818820} @@ -12,23 +12,15 @@ false false x64 - en-US - true - Recommended + x64 - + true ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Indexer\ DEBUG;TRACE - full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 false - true + full @@ -36,11 +28,6 @@ TRACE true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj index e6e593fe88..52bbf03265 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj @@ -4,22 +4,11 @@ net6.0-windows10.0.18362.0 false - x64 - + x64 AppxManifests\developmentApp\AppxManifest.xml - - x64 - true - - - - true - - - all 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 46f74b7505..283d03585f 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 @@ -13,23 +13,15 @@ false false x64 - en-US - true - Recommended + x64 true ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Program\ DEBUG;TRACE - full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 false - true + full @@ -37,21 +29,8 @@ TRACE true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - true - - - - - - - PreserveNewest 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 346fa4aea1..51fd0e468e 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,6 +1,6 @@  - - + + net6.0-windows {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} @@ -12,20 +12,15 @@ false false x64 - en-US + x64 true ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Shell\ DEBUG;TRACE - full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 false + full @@ -33,18 +28,6 @@ TRACE true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - - - true - - - - true @@ -58,13 +41,13 @@ false - + PreserveNewest - + @@ -73,7 +56,7 @@ - + PreserveNewest 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 4a32efbe58..be25589ff7 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,6 +1,6 @@ - - - + + + net6.0-windows {03276a39-d4e9-417c-8ffd-200b0ee5e871} @@ -12,23 +12,15 @@ false false x64 - en-US - true - Recommended + x64 true ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Uri\ DEBUG;TRACE - full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 false - true + full @@ -36,20 +28,8 @@ TRACE true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - true - - - - - - GlobalSuppressions.cs @@ -67,13 +47,13 @@ false - + PreserveNewest - + @@ -86,7 +66,7 @@ - + True @@ -94,14 +74,14 @@ Resources.resx - + PublicResXFileCodeGenerator Resources.Designer.cs - + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker.UnitTests/Microsoft.Plugin.WindowWalker.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker.UnitTests/Microsoft.Plugin.WindowWalker.UnitTests.csproj index da27e548e9..b0ac6e704d 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker.UnitTests/Microsoft.Plugin.WindowWalker.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker.UnitTests/Microsoft.Plugin.WindowWalker.UnitTests.csproj @@ -3,11 +3,8 @@ net6.0-windows false - x64 + x64 Microsoft.Plugin.WindowWalker.UnitTests - true - true - Recommended 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 e526f648be..f10ab9cb7c 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,6 +1,6 @@  - - + + net6.0-windows {74F1B9ED-F59C-4FE7-B473-7B453E30837E} @@ -12,22 +12,15 @@ false false x64 - en-US - true - Recommended + x64 true ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\WindowWalker\ DEBUG;TRACE - full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 false + full @@ -35,32 +28,14 @@ TRACE true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - - - true - - true - - - - - - - - PreserveNewest - + false @@ -69,7 +44,7 @@ false - + @@ -113,12 +88,12 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - + + PreserveNewest + + + PreserveNewest + \ No newline at end of file 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 7ebb02e5dc..ffcfd995bf 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,6 +1,6 @@  - - + + net6.0-windows {59BD9891-3837-438A-958D-ADC7F91F6F7E} @@ -12,9 +12,7 @@ false false x64 - en-US - true - Recommended + x64 @@ -22,13 +20,7 @@ ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Calculator\ DEBUG;TRACE full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 false - true @@ -36,26 +28,14 @@ TRACE true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - - - - - - - PreserveNewest - + false @@ -64,17 +44,17 @@ false - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry.UnitTest/Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry.UnitTest/Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj index d7206212ad..51023439cd 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry.UnitTest/Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry.UnitTest/Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj @@ -3,35 +3,24 @@ net6.0-windows x64 - en-US - 8.0 enable false + x64 - + true DEBUG;TRACE full - x64 - prompt - MinimumRecommendedRules.ruleset - 4 false - true TRACE true pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - 4 - 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 d8c9092afa..bfe83bd2ba 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 @@ -8,11 +8,8 @@ false false x64 - en-US - 8.0 enable - true - Recommended + x64 @@ -20,12 +17,7 @@ ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Registry\ DEBUG;TRACE full - x64 - prompt - MinimumRecommendedRules.ruleset - 4 false - true @@ -33,19 +25,8 @@ TRACE true pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - 4 - true - - - - - - GlobalSuppressions.cs 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 05527e9d93..8640053f7d 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 @@ -10,21 +10,15 @@ false false x64 - en-US + x64 - + true ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Service\ DEBUG;TRACE full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 false - true @@ -32,11 +26,6 @@ TRACE true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 @@ -68,12 +57,12 @@ - + - + True @@ -81,14 +70,14 @@ Resources.resx - + ResXFileCodeGenerator Resources.Designer.cs - + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj index ea6ca0ba7f..3dc84bc365 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj @@ -4,9 +4,8 @@ net6.0-windows false - x64 + x64 Microsoft.PowerToys.Run.Plugin.System.UnitTests - 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 bf815b8322..ca1c64627f 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 @@ -12,7 +12,7 @@ false false x64 - en-US + x64 @@ -20,11 +20,6 @@ ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\System\ DEBUG;TRACE full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 false @@ -33,18 +28,6 @@ TRACE true pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - - - true - - - - true @@ -80,56 +63,56 @@ - + PreserveNewest - + PreserveNewest PreserveNewest - + PreserveNewest PreserveNewest - + PreserveNewest PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests.csproj index 1930fb1d31..2d9027c9d9 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests.csproj @@ -3,11 +3,8 @@ net6.0-windows false - x64 + x64 Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests - true - true - Recommended 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 0cd4d83e73..48d5b6aea0 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 @@ -12,9 +12,7 @@ false false x64 - en-US - true - Recommended + x64 @@ -22,11 +20,6 @@ ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\TimeDate\ DEBUG;TRACE full - x64 - 8.0 - prompt - MinimumRecommendedRules.ruleset - 4 false @@ -35,18 +28,6 @@ TRACE true pdbonly - x64 - 8.0 - prompt - MinimumRecommendedRules.ruleset - 4 - - - true - - - - true @@ -105,7 +86,7 @@ PreserveNewest - + PreserveNewest @@ -117,12 +98,12 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - + + PreserveNewest + + + PreserveNewest + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Microsoft.PowerToys.Run.Plugin.TimeZone.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Microsoft.PowerToys.Run.Plugin.TimeZone.csproj index d5a1b90666..9f2047ab0f 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Microsoft.PowerToys.Run.Plugin.TimeZone.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Microsoft.PowerToys.Run.Plugin.TimeZone.csproj @@ -1,16 +1,15 @@ - + - net6.0-windows + net6.0-windows Microsoft.PowerToys.Run.Plugin.TimeZone Microsoft.PowerToys.Run.Plugin.TimeZone $(Version).0 false false x64 - en-US - 8.0 enable + x64 @@ -18,12 +17,7 @@ ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\TimeZone\ DEBUG;TRACE full - x64 - prompt - MinimumRecommendedRules.ruleset - 4 false - true @@ -31,19 +25,8 @@ TRACE true pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - 4 - true - - - - - - GlobalSuppressions.cs diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/ResultHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/ResultHelper.cs index 73023e1431..ead193f7ad 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/ResultHelper.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/ResultHelper.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Globalization; using System.Linq; using System.Text; using Microsoft.PowerToys.Run.Plugin.WindowsSettings.Properties; @@ -61,27 +62,27 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper { var toolTipText = new StringBuilder(); - toolTipText.AppendLine($"{Resources.Application}: {entry.Type}"); + toolTipText.AppendLine(CultureInfo.CurrentCulture, $"{Resources.Application}: {entry.Type}"); if (entry.Areas != null && entry.Areas.Any()) { - toolTipText.AppendLine($"{Resources.Area}: {entry.JoinedAreaPath}"); + toolTipText.AppendLine(CultureInfo.CurrentCulture, $"{Resources.Area}: {entry.JoinedAreaPath}"); } if (entry.AltNames != null && entry.AltNames.Any()) { var altList = entry.AltNames.Aggregate((current, next) => $"{current}, {next}"); - toolTipText.AppendLine($"{Resources.AlternativeName}: {altList}"); + toolTipText.AppendLine(CultureInfo.CurrentCulture, $"{Resources.AlternativeName}: {altList}"); } - toolTipText.Append($"{Resources.Command}: {entry.Command}"); + toolTipText.Append(CultureInfo.CurrentCulture, $"{Resources.Command}: {entry.Command}"); if (!string.IsNullOrEmpty(entry.Note)) { toolTipText.AppendLine(string.Empty); toolTipText.AppendLine(string.Empty); - toolTipText.Append($"{Resources.Note}: {entry.Note}"); + toolTipText.Append(CultureInfo.CurrentCulture, $"{Resources.Note}: {entry.Note}"); } result.ToolTipData = new ToolTipData(entry.Name, toolTipText.ToString()); 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 0f4d6d844f..6957f9d12b 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,6 +1,6 @@  - - + + net6.0-windows {5043CECE-E6A7-4867-9CBE-02D27D83747A} @@ -11,12 +11,9 @@ false false x64 - prompt true - en-US enable - true - Recommended + x64 @@ -25,11 +22,6 @@ false full true - 8.0 - x64 - MinimumRecommendedRules.ruleset - 4 - true @@ -37,11 +29,6 @@ TRACE true pdbonly - 8.0 - x64 - MinimumRecommendedRules.ruleset - 4 - true @@ -56,13 +43,13 @@ false - + PreserveNewest - + GlobalSuppressions.cs @@ -71,7 +58,7 @@ StyleCop.json - + Never 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 3ee34f5480..901ff845af 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 @@ -10,7 +10,7 @@ false false x64 - en-US + x64 @@ -19,11 +19,6 @@ false full true - 8.0 - x64 - MinimumRecommendedRules.ruleset - 4 - true @@ -31,11 +26,6 @@ TRACE true pdbonly - 8.0 - x64 - MinimumRecommendedRules.ruleset - 4 - true