From da33d22c85b275a3792085bc381cc9771b60af64 Mon Sep 17 00:00:00 2001 From: dziadkiewicz <1444154+dziadkiewicz@users.noreply.github.com> Date: Wed, 20 Jan 2021 11:38:52 +0100 Subject: [PATCH] [Run][Plugin] Rename Calculator plugin to follow the required schema (#9026) --- .../ci/templates/build-powertoys-steps.yml | 2 +- .pipelines/pipeline.user.windows.yml | 26 +- PowerToys.sln | 4 +- .../modules/launcher/plugins/calculator.md | 10 +- installer/PowerToysSetup/Product.wxs | 48 ++-- .../BracketHelperTests.cs | 2 +- .../ExtendedCalculatorParserTests.cs | 2 +- ...oys.Run.Plugin.Calculator.UnitTest.csproj} | 4 +- .../BracketHelper.cs | 2 +- .../CalculateEngine.cs | 2 +- .../CalculateHelper.cs | 2 +- .../CalculateResult.cs | 3 +- .../Images/calculator.dark.png | Bin .../Images/calculator.light.png | Bin .../LocProject.json | 4 +- .../Main.cs | 2 +- ...ft.PowerToys.Run.Plugin.Calculator.csproj} | 226 +++++++++--------- .../NumberTranslator.cs | 2 +- .../Properties/Resources.Designer.cs | 29 +-- .../Properties/Resources.resx | 0 .../ResultHelper.cs | 2 +- .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../Properties/Resources.resx.lcl | 0 .../plugin.json | 4 +- 39 files changed, 186 insertions(+), 190 deletions(-) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator.UnitTest => Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest}/BracketHelperTests.cs (95%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator.UnitTest => Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest}/ExtendedCalculatorParserTests.cs (99%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator.UnitTest/Microsoft.Plugin.Calculator.UnitTest.csproj => Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.csproj} (83%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/BracketHelper.cs (97%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/CalculateEngine.cs (97%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/CalculateHelper.cs (97%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/CalculateResult.cs (93%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/Images/calculator.dark.png (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/Images/calculator.light.png (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/LocProject.json (72%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/Main.cs (98%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator/Microsoft.Plugin.Calculator.csproj => Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj} (92%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/NumberTranslator.cs (98%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/Properties/Resources.Designer.cs (93%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/Properties/Resources.resx (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/ResultHelper.cs (97%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/cs/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/de/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/es/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/fr/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/hu/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/it/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/ja/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/ko/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/nl/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/pl/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/pt-BR/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/pt-PT/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/ru/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/sv/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/tr/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/zh-Hans/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/loc/zh-Hant/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl (100%) rename src/modules/launcher/Plugins/{Microsoft.Plugin.Calculator => Microsoft.PowerToys.Run.Plugin.Calculator}/plugin.json (82%) diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml index cfba97e580..3abec3b0a0 100644 --- a/.pipelines/ci/templates/build-powertoys-steps.yml +++ b/.pipelines/ci/templates/build-powertoys-steps.yml @@ -104,7 +104,7 @@ steps: testAssemblyVer2: | **\Microsoft.Plugin.Folder.UnitTest.dll **\Microsoft.Plugin.Program.UnitTests.dll - **\Microsoft.Plugin.Calculator.UnitTest.dll + **\Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.dll **\Microsoft.Plugin.Uri.UnitTests.dll **\Wox.Test.dll **\Microsoft.PowerToys.Settings.UI.UnitTests.dll diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml index f63f395faf..883ec2d7f3 100644 --- a/.pipelines/pipeline.user.windows.yml +++ b/.pipelines/pipeline.user.windows.yml @@ -27,7 +27,7 @@ restore: commands: - !!defaultcommand name: 'Restore Power Toys Telemetry' - command: '.pipelines\restore-telemetry.cmd' + command: '.pipelines\restore-telemetry.cmd' - !!defaultcommand name: 'Restore Power Toys' command: '.pipelines\restore.cmd' @@ -103,10 +103,10 @@ build: - 'modules\launcher\ManagedCommon.dll' - 'modules\launcher\Microsoft.PowerToys.Common.UI.dll' - 'modules\launcher\Microsoft.Launcher.dll' - - 'modules\launcher\Plugins\Microsoft.Plugin.Calculator\Microsoft.Plugin.Calculator.dll' - - 'modules\launcher\Plugins\Microsoft.Plugin.Calculator\Wox.Infrastructure.dll' - - 'modules\launcher\Plugins\Microsoft.Plugin.Calculator\Wox.Plugin.dll' - - 'modules\launcher\Plugins\Microsoft.Plugin.Calculator\Telemetry.dll' + - 'modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.dll' + - 'modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.Calculator\Wox.Infrastructure.dll' + - 'modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.Calculator\Wox.Plugin.dll' + - 'modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.Calculator\Telemetry.dll' - 'modules\launcher\Plugins\Microsoft.Plugin.Folder\Microsoft.Plugin.Folder.dll' - 'modules\launcher\Plugins\Microsoft.Plugin.Folder\Wox.Infrastructure.dll' - 'modules\launcher\Plugins\Microsoft.Plugin.Folder\Wox.Plugin.dll' @@ -207,23 +207,23 @@ build: # signing_options: # profile: '400' -static_analysis_options: - binskim_options: +static_analysis_options: + binskim_options: files_to_scan: - from: 'installer/packages' exclude: - 'WiX.*/**/*.dll' - 'Wix.*/**/*.exe' - moderncop_options: + moderncop_options: files_to_scan: - - from: 'src' - exclude: + - from: 'src' + exclude: - '**/just.config.js' - '**/webpack.config.js' - '**/webpack.serve.config.js' - - '**/dist/bundle.js' + - '**/dist/bundle.js' policheck_options: files_to_scan: - - exclude: + - exclude: - '**/*.lcl' - + diff --git a/PowerToys.sln b/PowerToys.sln index 08c27c1d8f..cca19d731f 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -127,7 +127,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Test", "src\modules\lau EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{4AFC9975-2456-4C70-94A4-84073C1CED93}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Calculator", "src\modules\launcher\Plugins\Microsoft.Plugin.Calculator\Microsoft.Plugin.Calculator.csproj", "{59BD9891-3837-438A-958D-ADC7F91F6F7E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.Calculator", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.csproj", "{59BD9891-3837-438A-958D-ADC7F91F6F7E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.WindowWalker", "src\modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\Microsoft.Plugin.WindowWalker.csproj", "{74F1B9ED-F59C-4FE7-B473-7B453E30837E}" EndProject @@ -233,7 +233,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Uri.UnitTe EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Settings.UI.UnitTests", "src\settings-ui\Microsoft.PowerToys.Settings.UI.UnitTests\Microsoft.PowerToys.Settings.UI.UnitTests.csproj", "{0F85E674-34AE-443D-954C-8321EB8B93B1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Calculator.UnitTest", "src\modules\launcher\Plugins\Microsoft.Plugin.Calculator.UnitTest\Microsoft.Plugin.Calculator.UnitTest.csproj", "{632BBE62-5421-49EA-835A-7FFA4F499BD6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest\Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.csproj", "{632BBE62-5421-49EA-835A-7FFA4F499BD6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Folder.UnitTests", "src\modules\launcher\Plugins\Microsoft.Plugin.Folder.UnitTests\Microsoft.Plugin.Folder.UnitTests.csproj", "{4FA206A5-F69F-4193-BF8F-F6EEB496734C}" EndProject diff --git a/doc/devdocs/modules/launcher/plugins/calculator.md b/doc/devdocs/modules/launcher/plugins/calculator.md index 8d5c44fa2b..45089ef84b 100644 --- a/doc/devdocs/modules/launcher/plugins/calculator.md +++ b/doc/devdocs/modules/launcher/plugins/calculator.md @@ -3,18 +3,18 @@ The Calculator plugin as the name suggests is used to perform calculations on th ![Image of Calculator plugin](/doc/images/launcher/plugins/calculator.png) -### [`CalculateHelper`](src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateHelper.cs) -- The [`CalculateHelper.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateHelper.cs) class checks to see if the user entered query is a valid input to the calculator and only if the input is valid does it perform the operation. +### [`CalculateHelper`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateHelper.cs) +- The [`CalculateHelper.cs`](src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateHelper.cs) class checks to see if the user entered query is a valid input to the calculator and only if the input is valid does it perform the operation. - It does so by matching the user query to a valid regex. -### [`CalculateEngine`](src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateEngine.cs) -- The main computation is done in the [`CalculateEngine.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateEngine.cs) file using the `Mages` library. +### [`CalculateEngine`](src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs) +- The main computation is done in the [`CalculateEngine.cs`](src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs) file using the `Mages` library. ```csharp var result = CalculateEngine.Interpret(query.Search, CultureInfo.CurrentUICulture); ``` -### [`CalculateResult`](src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateResult.cs) +### [`CalculateResult`](src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateResult.cs) - The class which encapsulates the result of the computation. - It comprises of the `Result` and `RoundedResult` properties. diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index 9cb606c067..e53ef30e00 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -72,7 +72,7 @@ - + @@ -96,9 +96,9 @@ Installed and (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL") - + - + - + - + @@ -382,11 +382,11 @@ - + - + @@ -468,7 +468,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -855,7 +855,7 @@ - + @@ -884,13 +884,13 @@ - + - + @@ -900,23 +900,23 @@ - + - + - - + + - - + + @@ -930,7 +930,7 @@ - + @@ -942,7 +942,7 @@ - + @@ -978,7 +978,7 @@ - + @@ -988,7 +988,7 @@ - + @@ -999,7 +999,7 @@ - + @@ -1020,7 +1020,7 @@ - + diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator.UnitTest/BracketHelperTests.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/BracketHelperTests.cs similarity index 95% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator.UnitTest/BracketHelperTests.cs rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/BracketHelperTests.cs index 6b20897ff6..7338444f85 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator.UnitTest/BracketHelperTests.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/BracketHelperTests.cs @@ -4,7 +4,7 @@ using NUnit.Framework; -namespace Microsoft.Plugin.Calculator.UnitTests +namespace Microsoft.PowerToys.Run.Plugin.Calculator.UnitTests { [TestFixture] public class BracketHelperTests diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator.UnitTest/ExtendedCalculatorParserTests.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/ExtendedCalculatorParserTests.cs similarity index 99% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator.UnitTest/ExtendedCalculatorParserTests.cs rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/ExtendedCalculatorParserTests.cs index bc3783f592..cbb2740a7b 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator.UnitTest/ExtendedCalculatorParserTests.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/ExtendedCalculatorParserTests.cs @@ -6,7 +6,7 @@ using System; using System.Globalization; using NUnit.Framework; -namespace Microsoft.Plugin.Calculator.UnitTests +namespace Microsoft.PowerToys.Run.Plugin.Calculator.UnitTests { [TestFixture] public class ExtendedCalculatorParserTests diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator.UnitTest/Microsoft.Plugin.Calculator.UnitTest.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.csproj similarity index 83% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator.UnitTest/Microsoft.Plugin.Calculator.UnitTest.csproj rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.csproj index d5f1c06b75..508f7a13f4 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator.UnitTest/Microsoft.Plugin.Calculator.UnitTest.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.csproj @@ -5,7 +5,7 @@ false x64 - Microsoft.Plugin.Calculator.UnitTests + Microsoft.PowerToys.Run.Plugin.Calculator.UnitTests true @@ -15,7 +15,7 @@ - + diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/BracketHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/BracketHelper.cs similarity index 97% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/BracketHelper.cs rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/BracketHelper.cs index caa0e119f3..2a55a74477 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/BracketHelper.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/BracketHelper.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Microsoft.Plugin.Calculator +namespace Microsoft.PowerToys.Run.Plugin.Calculator { public static class BracketHelper { diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateEngine.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs similarity index 97% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateEngine.cs rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs index 537b25c048..08a17743d0 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateEngine.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Globalization; using Mages.Core; -namespace Microsoft.Plugin.Calculator +namespace Microsoft.PowerToys.Run.Plugin.Calculator { public class CalculateEngine { diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateHelper.cs similarity index 97% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateHelper.cs rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateHelper.cs index 281312bd07..5a2c91a6ea 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateHelper.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateHelper.cs @@ -5,7 +5,7 @@ using System; using System.Text.RegularExpressions; -namespace Microsoft.Plugin.Calculator +namespace Microsoft.PowerToys.Run.Plugin.Calculator { public static class CalculateHelper { diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateResult.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateResult.cs similarity index 93% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateResult.cs rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateResult.cs index 9b7be1977c..e756d94e9c 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateResult.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateResult.cs @@ -3,9 +3,8 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; -namespace Microsoft.Plugin.Calculator +namespace Microsoft.PowerToys.Run.Plugin.Calculator { public struct CalculateResult : IEquatable { diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Images/calculator.dark.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Images/calculator.dark.png similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Images/calculator.dark.png rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Images/calculator.dark.png diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Images/calculator.light.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Images/calculator.light.png similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Images/calculator.light.png rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Images/calculator.light.png diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/LocProject.json b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/LocProject.json similarity index 72% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/LocProject.json rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/LocProject.json index ba16778e98..773b9ddc2f 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/LocProject.json +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/LocProject.json @@ -4,9 +4,9 @@ "LanguageSet": "Azure_Languages", "LocItems": [ { - "SourceFile": "src\\modules\\launcher\\Plugins\\Microsoft.Plugin.Calculator\\Properties\\Resources.resx", + "SourceFile": "src\\modules\\launcher\\Plugins\\Microsoft.PowerToys.Run.Plugin.Calculator\\Properties\\Resources.resx", "CopyOption": "LangIDOnName", - "OutputPath": "src\\modules\\launcher\\Plugins\\Microsoft.Plugin.Calculator\\Properties" + "OutputPath": "src\\modules\\launcher\\Plugins\\Microsoft.PowerToys.Run.Plugin.Calculator\\Properties" } ] } diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Main.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Main.cs similarity index 98% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Main.cs rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Main.cs index 54f3f49598..456b00bb68 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Main.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Main.cs @@ -9,7 +9,7 @@ using ManagedCommon; using Wox.Plugin; using Wox.Plugin.Logger; -namespace Microsoft.Plugin.Calculator +namespace Microsoft.PowerToys.Run.Plugin.Calculator { public class Main : IPlugin, IPluginI18n, IDisposable { diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Microsoft.Plugin.Calculator.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj similarity index 92% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Microsoft.Plugin.Calculator.csproj rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj index 4d08b436b3..525b2c3ba7 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Microsoft.Plugin.Calculator.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj @@ -1,114 +1,114 @@ - - - - - netcoreapp3.1 - {59BD9891-3837-438A-958D-ADC7F91F6F7E} - Properties - Microsoft.Plugin.Calculator - Microsoft.Plugin.Calculator - $(Version).0 - true - false - false - x64 - en-US - - - - true - ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Calculator\ - DEBUG;TRACE - full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - false - true - - - - ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Calculator\ - TRACE - true - pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - - - - - - - - - - - - PreserveNewest - - - - - - false - - - false - - - - - - - NU1701 - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - PreserveNewest - - - PreserveNewest - - - - - GlobalSuppressions.cs - - - StyleCop.json - - - - - 1.1.118 - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - True - True - Resources.resx - - - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - + + + + + netcoreapp3.1 + {59BD9891-3837-438A-958D-ADC7F91F6F7E} + Properties + Microsoft.PowerToys.Run.Plugin.Calculator + Microsoft.PowerToys.Run.Plugin.Calculator + $(Version).0 + true + false + false + x64 + en-US + + + + true + ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Calculator\ + DEBUG;TRACE + full + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + 4 + false + true + + + + ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Calculator\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + 4 + + + + + + + + + + + + PreserveNewest + + + + + + false + + + false + + + + + + + NU1701 + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + PreserveNewest + + + PreserveNewest + + + + + GlobalSuppressions.cs + + + StyleCop.json + + + + + 1.1.118 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + True + True + Resources.resx + + + + + PublicResXFileCodeGenerator + Resources.Designer.cs + + \ No newline at end of file diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/NumberTranslator.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/NumberTranslator.cs similarity index 98% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/NumberTranslator.cs rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/NumberTranslator.cs index fb569f7058..96f1194c20 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/NumberTranslator.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/NumberTranslator.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Text; using System.Text.RegularExpressions; -namespace Microsoft.Plugin.Calculator +namespace Microsoft.PowerToys.Run.Plugin.Calculator { /// /// Tries to convert all numbers in a text from one culture format to another. diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.Designer.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Properties/Resources.Designer.cs similarity index 93% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.Designer.cs rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Properties/Resources.Designer.cs index 98752f0b5d..e8def7b221 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.Designer.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Properties/Resources.Designer.cs @@ -8,10 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.Plugin.Calculator.Properties { - using System; - - +namespace Microsoft.PowerToys.Run.Plugin.Calculator.Properties { /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -23,15 +20,15 @@ namespace Microsoft.Plugin.Calculator.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -39,13 +36,13 @@ namespace Microsoft.Plugin.Calculator.Properties { public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Plugin.Calculator.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.PowerToys.Run.Plugin.Calculator.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,7 +56,7 @@ namespace Microsoft.Plugin.Calculator.Properties { resourceCulture = value; } } - + /// /// Looks up a localized string similar to Copy failed, please try later. /// @@ -68,7 +65,7 @@ namespace Microsoft.Plugin.Calculator.Properties { return ResourceManager.GetString("wox_plugin_calculator_copy_failed", resourceCulture); } } - + /// /// Looks up a localized string similar to Copy this number to the clipboard. /// @@ -77,7 +74,7 @@ namespace Microsoft.Plugin.Calculator.Properties { return ResourceManager.GetString("wox_plugin_calculator_copy_number_to_clipboard", resourceCulture); } } - + /// /// Looks up a localized string similar to Expression wrong or incomplete (Did you forget some parentheses?). /// @@ -86,7 +83,7 @@ namespace Microsoft.Plugin.Calculator.Properties { return ResourceManager.GetString("wox_plugin_calculator_expression_not_complete", resourceCulture); } } - + /// /// Looks up a localized string similar to Not a number (NaN). /// @@ -95,7 +92,7 @@ namespace Microsoft.Plugin.Calculator.Properties { return ResourceManager.GetString("wox_plugin_calculator_not_a_number", resourceCulture); } } - + /// /// Looks up a localized string similar to Allows you to do mathematical calculations. (Try 5*3-2 in PowerToys Run). /// @@ -104,7 +101,7 @@ namespace Microsoft.Plugin.Calculator.Properties { return ResourceManager.GetString("wox_plugin_calculator_plugin_description", resourceCulture); } } - + /// /// Looks up a localized string similar to Calculator. /// diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Properties/Resources.resx similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Properties/Resources.resx diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/ResultHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/ResultHelper.cs similarity index 97% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/ResultHelper.cs rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/ResultHelper.cs index 6f5ec1489b..dc023fb72d 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/ResultHelper.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/ResultHelper.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Windows; using Wox.Plugin; -namespace Microsoft.Plugin.Calculator +namespace Microsoft.PowerToys.Run.Plugin.Calculator { public static class ResultHelper { diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/cs/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/cs/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/cs/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/cs/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/de/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/de/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/de/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/de/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/es/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/es/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/es/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/es/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/fr/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/fr/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/fr/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/fr/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/hu/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/hu/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/hu/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/hu/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/it/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/it/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/it/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/it/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/ja/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/ja/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/ja/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/ja/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/ko/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/ko/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/ko/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/ko/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/nl/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/nl/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/nl/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/nl/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/pl/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/pl/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/pl/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/pl/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/pt-BR/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/pt-BR/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/pt-BR/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/pt-BR/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/pt-PT/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/pt-PT/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/pt-PT/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/pt-PT/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/ru/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/ru/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/ru/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/ru/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/sv/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/sv/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/sv/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/sv/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/tr/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/tr/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/tr/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/tr/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/zh-Hans/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/zh-Hans/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/zh-Hans/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/zh-Hans/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/zh-Hant/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/zh-Hant/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl similarity index 100% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/loc/zh-Hant/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/loc/zh-Hant/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Properties/Resources.resx.lcl diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/plugin.json similarity index 82% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/plugin.json index 2bfa6343b5..f4966293e5 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/plugin.json @@ -7,6 +7,6 @@ "Version":"1.0.0", "Language":"csharp", "Website":"https://aka.ms/powertoys", - "ExecuteFileName":"Microsoft.Plugin.Calculator.dll", + "ExecuteFileName":"Microsoft.PowerToys.Run.Plugin.Calculator.dll", "IcoPath":"Images\\calculator.dark.png" -} \ No newline at end of file +}