diff --git a/src/modules/cmdpal/WindowsCommandPalette.sln b/src/modules/cmdpal/WindowsCommandPalette.sln index c5ee8c2788..dde29b2613 100644 --- a/src/modules/cmdpal/WindowsCommandPalette.sln +++ b/src/modules/cmdpal/WindowsCommandPalette.sln @@ -4,7 +4,7 @@ VisualStudioVersion = 17.11.34929.205 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.UI.Poc", "src\WindowsCommandPalette\Microsoft.CmdPal.UI.Poc.csproj", "{F71CF22B-A5C7-4328-A5B3-F4191AE57314}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample Plugins", "Sample Plugins", "{B7FF739F-7716-4FC3-B622-705486187B87}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample Extensions", "Sample Extensions", "{B7FF739F-7716-4FC3-B622-705486187B87}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "src\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj", "{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}" EndProject @@ -30,6 +30,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TemplateExtension", "extens EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MastodonExtension", "extensions\MastodonExtension\MastodonExtension.csproj", "{65E22130-6A8F-4AB7-80EC-FF75475DE821}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Built-in Extensions", "Built-in Extensions", "{272D0E9A-8FC3-49F5-8FAD-79ABAE8AB1E4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Calc", "src\Exts\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj", "{42DB35EE-1EDB-41E4-9C9F-A3520EBC5CC4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM64 = Debug|ARM64 @@ -138,6 +142,14 @@ Global {65E22130-6A8F-4AB7-80EC-FF75475DE821}.Release|ARM64.Build.0 = Release|ARM64 {65E22130-6A8F-4AB7-80EC-FF75475DE821}.Release|x64.ActiveCfg = Release|x64 {65E22130-6A8F-4AB7-80EC-FF75475DE821}.Release|x64.Build.0 = Release|x64 + {42DB35EE-1EDB-41E4-9C9F-A3520EBC5CC4}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {42DB35EE-1EDB-41E4-9C9F-A3520EBC5CC4}.Debug|ARM64.Build.0 = Debug|ARM64 + {42DB35EE-1EDB-41E4-9C9F-A3520EBC5CC4}.Debug|x64.ActiveCfg = Debug|x64 + {42DB35EE-1EDB-41E4-9C9F-A3520EBC5CC4}.Debug|x64.Build.0 = Debug|x64 + {42DB35EE-1EDB-41E4-9C9F-A3520EBC5CC4}.Release|ARM64.ActiveCfg = Release|ARM64 + {42DB35EE-1EDB-41E4-9C9F-A3520EBC5CC4}.Release|ARM64.Build.0 = Release|ARM64 + {42DB35EE-1EDB-41E4-9C9F-A3520EBC5CC4}.Release|x64.ActiveCfg = Release|x64 + {42DB35EE-1EDB-41E4-9C9F-A3520EBC5CC4}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -154,6 +166,7 @@ Global {9456257A-3292-4A8D-AF63-9830EABE7ED2} = {B7FF739F-7716-4FC3-B622-705486187B87} {EB13FDBD-7DD5-4E7E-8BEB-727B3C9331CB} = {B7FF739F-7716-4FC3-B622-705486187B87} {65E22130-6A8F-4AB7-80EC-FF75475DE821} = {B7FF739F-7716-4FC3-B622-705486187B87} + {42DB35EE-1EDB-41E4-9C9F-A3520EBC5CC4} = {272D0E9A-8FC3-49F5-8FAD-79ABAE8AB1E4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BC94BFC2-A741-4978-B6A4-9E01B7660E6B} diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Builtins/Calculator/CalculatorAction.cs b/src/modules/cmdpal/src/Exts/Microsoft.CmdPal.Ext.Calc/CalculatorAction.cs similarity index 96% rename from src/modules/cmdpal/src/WindowsCommandPalette/Builtins/Calculator/CalculatorAction.cs rename to src/modules/cmdpal/src/Exts/Microsoft.CmdPal.Ext.Calc/CalculatorAction.cs index 41170d6216..b8b680404d 100644 --- a/src/modules/cmdpal/src/WindowsCommandPalette/Builtins/Calculator/CalculatorAction.cs +++ b/src/modules/cmdpal/src/Exts/Microsoft.CmdPal.Ext.Calc/CalculatorAction.cs @@ -7,7 +7,7 @@ using Microsoft.Windows.CommandPalette.Extensions.Helpers; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace Calculator; +namespace Microsoft.CmdPal.Ext.Calc; public class CalculatorAction : InvokableCommand { diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Builtins/Calculator/CalculatorActionProvider.cs b/src/modules/cmdpal/src/Exts/Microsoft.CmdPal.Ext.Calc/CalculatorActionProvider.cs similarity index 96% rename from src/modules/cmdpal/src/WindowsCommandPalette/Builtins/Calculator/CalculatorActionProvider.cs rename to src/modules/cmdpal/src/Exts/Microsoft.CmdPal.Ext.Calc/CalculatorActionProvider.cs index 9520a00c4a..1d85846416 100644 --- a/src/modules/cmdpal/src/WindowsCommandPalette/Builtins/Calculator/CalculatorActionProvider.cs +++ b/src/modules/cmdpal/src/Exts/Microsoft.CmdPal.Ext.Calc/CalculatorActionProvider.cs @@ -7,7 +7,7 @@ using Microsoft.Windows.CommandPalette.Extensions; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace Calculator; +namespace Microsoft.CmdPal.Ext.Calc; public class CalculatorActionProvider : ICommandProvider { diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Builtins/Calculator/CalculatorTopLevelListItem.cs b/src/modules/cmdpal/src/Exts/Microsoft.CmdPal.Ext.Calc/CalculatorTopLevelListItem.cs similarity index 97% rename from src/modules/cmdpal/src/WindowsCommandPalette/Builtins/Calculator/CalculatorTopLevelListItem.cs rename to src/modules/cmdpal/src/Exts/Microsoft.CmdPal.Ext.Calc/CalculatorTopLevelListItem.cs index db9dde0678..ddd91e17a8 100644 --- a/src/modules/cmdpal/src/WindowsCommandPalette/Builtins/Calculator/CalculatorTopLevelListItem.cs +++ b/src/modules/cmdpal/src/Exts/Microsoft.CmdPal.Ext.Calc/CalculatorTopLevelListItem.cs @@ -9,7 +9,7 @@ using Microsoft.Windows.CommandPalette.Extensions.Helpers; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace Calculator; +namespace Microsoft.CmdPal.Ext.Calc; public class CalculatorTopLevelListItem : ListItem, IFallbackHandler { diff --git a/src/modules/cmdpal/src/Exts/Microsoft.CmdPal.Ext.Calc/Microsoft.CmdPal.Ext.Calc.csproj b/src/modules/cmdpal/src/Exts/Microsoft.CmdPal.Ext.Calc/Microsoft.CmdPal.Ext.Calc.csproj new file mode 100644 index 0000000000..fa3109f94f --- /dev/null +++ b/src/modules/cmdpal/src/Exts/Microsoft.CmdPal.Ext.Calc/Microsoft.CmdPal.Ext.Calc.csproj @@ -0,0 +1,10 @@ + + + + Microsoft.CmdPal.Ext.Calc + + + + + + diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.CmdPal.UI.Poc.csproj b/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.CmdPal.UI.Poc.csproj index 7ab849ec08..ca45c4a6a3 100644 --- a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.CmdPal.UI.Poc.csproj +++ b/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.CmdPal.UI.Poc.csproj @@ -69,6 +69,7 @@ + True diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Views/MainPage.xaml.cs b/src/modules/cmdpal/src/WindowsCommandPalette/Views/MainPage.xaml.cs index bc15e5eb61..0d46552b38 100644 --- a/src/modules/cmdpal/src/WindowsCommandPalette/Views/MainPage.xaml.cs +++ b/src/modules/cmdpal/src/WindowsCommandPalette/Views/MainPage.xaml.cs @@ -9,6 +9,7 @@ using CmdPal.Models; using DeveloperCommandPalette; using Microsoft.CmdPal.Common.Extensions; using Microsoft.CmdPal.Common.Services; +using Microsoft.CmdPal.Ext.Calc; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; @@ -49,7 +50,7 @@ public sealed class MainViewModel internal MainViewModel() { _builtInCommands.Add(new Run.Bookmarks.BookmarksActionProvider()); - _builtInCommands.Add(new Calculator.CalculatorActionProvider()); + _builtInCommands.Add(new CalculatorActionProvider()); _builtInCommands.Add(new SettingsActionProvider()); _builtInCommands.Add(quitActionProvider); _builtInCommands.Add(reloadActionProvider);