From 928a0b01eb0577b11087c0c550212b30d244cd23 Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Thu, 30 Jan 2025 10:56:01 -0600 Subject: [PATCH] Start pulling out a template sln --- Directory.Packages.props | 10 +-- PowerToys.sln | 26 +----- .../Common.Dotnet.AotCompatibility.props | 9 ++ .../Directory.Packages.props | 15 ++++ .../TemplateCmdPalExtension.sln | 43 ++++++++++ .../Assets/LockScreenLogo.scale-200.png | Bin 0 -> 432 bytes .../Assets/SplashScreen.scale-200.png | Bin 0 -> 5372 bytes .../Assets/Square150x150Logo.scale-200.png | Bin 0 -> 1755 bytes .../Assets/Square44x44Logo.scale-200.png | Bin 0 -> 637 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 283 bytes .../Assets/StoreLogo.png | Bin 0 -> 456 bytes .../Assets/Wide310x150Logo.scale-200.png | Bin 0 -> 2097 bytes .../Package.appxmanifest | 78 ++++++++++++++++++ .../Pages/TemplateExtensionPage.cs | 25 ++++++ .../TemplateCmdPalExtension/Program.cs | 36 ++++++++ .../SampleExtension.cs | 36 ++++++++ .../TemplateCmdPalExtension.csproj | 62 ++++++++++++++ .../TemplateExtensionCommandsProvider.cs | 23 ++++++ .../TemplateCmdPalExtension/app.manifest | 19 +++++ .../TemplateCmdPalExtension/nuget.config | 16 ++++ .../WindowsTerminalCommandsProvider.cs | 7 +- .../TemplateExtension.csproj | 1 + .../TemplateExtensionCommandsProvider.cs | 11 +-- .../Commands/BuiltInsCommandProvider.cs | 2 +- .../Commands/MainListPage.cs | 2 +- .../Models/ExtensionWrapper.cs | 3 +- .../IconHelpers.cs | 15 ++++ .../Pages/WinGetExtensionPage.cs | 2 +- .../WinGetExtensionCommandsProvider.cs | 2 +- 29 files changed, 394 insertions(+), 49 deletions(-) create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Common.Dotnet.AotCompatibility.props create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension.sln create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/LockScreenLogo.scale-200.png create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/SplashScreen.scale-200.png create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/Square150x150Logo.scale-200.png create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/Square44x44Logo.scale-200.png create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/Square44x44Logo.targetsize-24_altform-unplated.png create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/StoreLogo.png create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/Wide310x150Logo.scale-200.png create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Package.appxmanifest create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Pages/TemplateExtensionPage.cs create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Program.cs create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/SampleExtension.cs create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateExtensionCommandsProvider.cs create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/app.manifest create mode 100644 src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/nuget.config create mode 100644 src/modules/cmdpal/extensionsdk/Microsoft.CmdPal.Extensions.Helpers/IconHelpers.cs diff --git a/Directory.Packages.props b/Directory.Packages.props index 6b2888838edd..a0e995b25bdc 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -35,7 +35,7 @@ - + @@ -55,9 +55,9 @@ TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed. This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail. --> - - - + + + @@ -109,4 +109,4 @@ - + \ No newline at end of file diff --git a/PowerToys.sln b/PowerToys.sln index 73c3e0681e69..2c156f5bf7eb 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -670,8 +670,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpongebotExtension", "src\m EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SSHKeychainExtension", "src\modules\cmdpal\Exts\SSHKeychainExtension\SSHKeychainExtension.csproj", "{BE349BD2-7FF8-47B6-8F74-42B52DDF730A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TemplateExtension", "src\modules\cmdpal\Exts\TemplateExtension\TemplateExtension.csproj", "{EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YouTubeExtension", "src\modules\cmdpal\Exts\YouTubeExtension\YouTubeExtension.csproj", "{8E47BF33-A402-4582-930C-95E35418F653}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{7520A2FE-00A2-49B8-83ED-DB216E874C04}" @@ -690,8 +688,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkspacesCsharpLibrary", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualDesktopExtension", "src\modules\cmdpal\Exts\VirtualDesktopExtension\VirtualDesktopExtension.csproj", "{B79B52FB-8B2E-4CF5-B0FE-37E3E981AC7A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Templates", "Project Templates", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewPlus.ShellExtension.win10", "src\modules\NewPlus\NewShellExtensionContextMenu.win10\NewPlus.ShellExtension.win10.vcxproj", "{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Indexer", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj", "{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}" @@ -3124,24 +3120,6 @@ Global {BE349BD2-7FF8-47B6-8F74-42B52DDF730A}.Release|x86.ActiveCfg = Release|x64 {BE349BD2-7FF8-47B6-8F74-42B52DDF730A}.Release|x86.Build.0 = Release|x64 {BE349BD2-7FF8-47B6-8F74-42B52DDF730A}.Release|x86.Deploy.0 = Release|x64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Debug|ARM64.Build.0 = Debug|ARM64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Debug|x64.ActiveCfg = Debug|x64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Debug|x64.Build.0 = Debug|x64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Debug|x64.Deploy.0 = Debug|x64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Debug|x86.ActiveCfg = Debug|x64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Debug|x86.Build.0 = Debug|x64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Debug|x86.Deploy.0 = Debug|x64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Release|ARM64.ActiveCfg = Release|ARM64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Release|ARM64.Build.0 = Release|ARM64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Release|ARM64.Deploy.0 = Release|ARM64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Release|x64.ActiveCfg = Release|x64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Release|x64.Build.0 = Release|x64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Release|x64.Deploy.0 = Release|x64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Release|x86.ActiveCfg = Release|x64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Release|x86.Build.0 = Release|x64 - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB}.Release|x86.Deploy.0 = Release|x64 {8E47BF33-A402-4582-930C-95E35418F653}.Debug|ARM64.ActiveCfg = Debug|ARM64 {8E47BF33-A402-4582-930C-95E35418F653}.Debug|ARM64.Build.0 = Debug|ARM64 {8E47BF33-A402-4582-930C-95E35418F653}.Debug|ARM64.Deploy.0 = Debug|ARM64 @@ -3664,7 +3642,6 @@ Global {C831231F-891C-4572-9694-45062534B42A} = {071E18A4-A530-46B8-AB7D-B862EE55E24E} {2C2AF4F4-3DB2-416F-9F38-2B710D961E6F} = {071E18A4-A530-46B8-AB7D-B862EE55E24E} {BE349BD2-7FF8-47B6-8F74-42B52DDF730A} = {071E18A4-A530-46B8-AB7D-B862EE55E24E} - {EEBDB1CA-BBDD-421D-9D86-67145D0C6EEB} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} {8E47BF33-A402-4582-930C-95E35418F653} = {071E18A4-A530-46B8-AB7D-B862EE55E24E} {7520A2FE-00A2-49B8-83ED-DB216E874C04} = {3846508C-77EB-4034-A702-F8BB263C4F79} {8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90} = {7520A2FE-00A2-49B8-83ED-DB216E874C04} @@ -3674,13 +3651,12 @@ Global {8ABE2195-7514-425E-9A89-685FA42CEFC3} = {071E18A4-A530-46B8-AB7D-B862EE55E24E} {89D0E199-B17A-418C-B2F8-7375B6708357} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF} {B79B52FB-8B2E-4CF5-B0FE-37E3E981AC7A} = {071E18A4-A530-46B8-AB7D-B862EE55E24E} - {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {3846508C-77EB-4034-A702-F8BB263C4F79} {0DB0F63A-D2F8-4DA3-A650-2D0B8724218E} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC} {453CBB73-A3CB-4D0B-8D24-6940B86FE21D} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2} {C0CE3B5E-16D3-495D-B335-CA791B660162} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2} {3A9A7297-92C4-4F16-B6F9-8D4AB652C86C} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2} - {605E914B-7232-4789-AF46-BF5D3DDFC14E} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2} {D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE} = {9873BA05-4C41-4819-9283-CF45D795431B} + {605E914B-7232-4789-AF46-BF5D3DDFC14E} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2} {7F5B9557-5878-4438-A721-3E28296BA193} = {9873BA05-4C41-4819-9283-CF45D795431B} {E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2} {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC} diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Common.Dotnet.AotCompatibility.props b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Common.Dotnet.AotCompatibility.props new file mode 100644 index 000000000000..9c9b3faa250d --- /dev/null +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Common.Dotnet.AotCompatibility.props @@ -0,0 +1,9 @@ + + + + + true + true + 2 + + diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props new file mode 100644 index 000000000000..2a3ebd0534fe --- /dev/null +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props @@ -0,0 +1,15 @@ + + + true + + + + + + + + + + + + diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension.sln b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension.sln new file mode 100644 index 000000000000..47823e38569e --- /dev/null +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension.sln @@ -0,0 +1,43 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.13.35507.96 d17.13 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TemplateCmdPalExtension", "TemplateCmdPalExtension\TemplateCmdPalExtension.csproj", "{79F86DE5-70B1-4EC1-9832-DF428B55E466}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Debug|ARM64.Build.0 = Debug|ARM64 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Debug|x64.ActiveCfg = Debug|x64 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Debug|x64.Build.0 = Debug|x64 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Debug|x64.Deploy.0 = Debug|x64 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Debug|x86.ActiveCfg = Debug|x86 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Debug|x86.Build.0 = Debug|x86 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Debug|x86.Deploy.0 = Debug|x86 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Release|ARM64.ActiveCfg = Release|ARM64 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Release|ARM64.Build.0 = Release|ARM64 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Release|ARM64.Deploy.0 = Release|ARM64 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Release|x64.ActiveCfg = Release|x64 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Release|x64.Build.0 = Release|x64 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Release|x64.Deploy.0 = Release|x64 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Release|x86.ActiveCfg = Release|x86 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Release|x86.Build.0 = Release|x86 + {79F86DE5-70B1-4EC1-9832-DF428B55E466}.Release|x86.Deploy.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {CEDBC581-5818-4350-BC8A-A1ECE687D357} + EndGlobalSection +EndGlobal diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/LockScreenLogo.scale-200.png b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/LockScreenLogo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..7440f0d4bf7c7e26e4e36328738c68e624ee851e GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(FqV6|IEGZ*x-#9g>~Mkr+x6^F zy~CDX2QIMs&Gcs3RnRBoxBA!*(Mfw0KTCYuYk0WlEIV>qBmPl! zq4ukrvfADX@#p8fbLY(H47N+k`FZ(FZh?cDro7>{8mkBO3>^oaIx`3!Jl)Qq)HI!+ z(S=1{o~eT)&W^=Ea8C`-17(Jv5(nHFJ{dOjGdxLVkY_y6&S1whfuFI4MM0kF0f&cO zPDVpV%nz;Id$>+0Ga5e9625-JcI)oq=#Pa3p^>8BB}21BUw@eN!-6@w%X+^`+Vn?! zryu|3T>kVWNBYyBc=7Y6H#s1Ah!OI_nezW zXTqOdkv2Az6KKBV=$yHdF^R3Fqw(TZEoNSZX>reXJ#bwX42%f|Pgg&ebxsLQ010xn AssI20 literal 0 HcmV?d00001 diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/SplashScreen.scale-200.png b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/SplashScreen.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..32f486a86792a5e34cd9a8261b394c49b48f86be GIT binary patch literal 5372 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 literal 0 HcmV?d00001 diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/Square44x44Logo.scale-200.png b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..f713bba67f551ef91020b75716a4dc8ebd744b1c GIT binary patch literal 637 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8kjIJFu8cTIEGZ*dUI*J;2{SImxtDO zm%3!R$UazoY}x{$j0P5ABYXWr(l=jxJ6ps1W{tV=^>{Dl><3nv3A}sm=EZ)#l3`NR zpZda3^rNox*D1%NC98Z~L*6zipLw~Gxn&(Y-;KmJ+aR6eLabU-L#y8HW%7P-E_-VlLqIabbHPHKT*)fT@9iWJ7iWgOT9%0}Lrj>lztPxWq6sPw3pi z#-<=#$jjrP_DD*i!RLsn0mIA=>4~N)IMYWIf=j%-zuKCdMG%tHYot70D1| zvWa0wMhauW#S>1CnI_;>!1Q3zMA17@DOVq{MQ+{U7^a&yA+%dMCG;WNPV0i;w$tu; zX^b}UKziPM)(<;)ruW;-`)bBN+rQNM*Zs_>?n$|FVFo-e*PZb*@U7VAd+tHb4e?=Blc~}S6K)wL}r*Gf`BM#QB z+y>N$mCswb4d{^{S9v_!eQj4fTRMOwOCi?lSk9%<=vAz}jM-*PQtH@Odn1LZcd^j#o> hW$4xn+CT+ep9lJ{OAO?njobhL002ovPDHLkV1nYebbkN< literal 0 HcmV?d00001 diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/StoreLogo.png b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Assets/StoreLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..a4586f26bdf7841cad10f39cdffe2aca3af252c1 GIT binary patch literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fF!p=8IEGZ*dUM0H=rDtTTVkd2 z(%lbKn@VS_lUaADVB&;Z6F#LM+mPsa?e>FnHo;HND^!P`-lX%BH~FOg%y&x+t*x!? zg$#_1A1kgsSvO(fw`bOmo;lrJX8byO1j^gf7qohR%mmt z@L)WX;>gqgK|tWJvQ5j;4;=gt4HXVKSMYRv5RhY5vS~TqfK_NAP*r{h!!g^BZ;w4r z7CGdsai)y;fJQc`7{Zc2b==h%o`Op$|bg6a&nL{*m7-=0>k4M4-PXlU;G-?%*(*g>iFt^ U$m#7DfHB12>FVdQ&MBb@0G`#n8vpc0sq%A~kJcD9FY~qQRMt?ZR3YyDZt}Od;|mgpc{2dv9AHF){kXU%k({ z=Y8JidEayHTkG@twPZ|U3_^%3ct-OgLSiFAqDN!|tbCX@c@?4P`2x*TMK!+Q4b?k0 ziW7!!KF6dPWcF<%I|iznM~`QJ_V7sHGV_D`dhgpA9Vd@&X}ErK+j~_rdv;Bp?OA@a zFXOk7eWOJe5NcK;6h$FaM&7JxNc#-@QTwzW6x#d_zmQNkz5) zPI;kh;3d;5UCJU+9a(cOxX(|edWoOiAEdGU#kPJ&xnc2||3vDbuhBCkj-pb0as$Zl z5;}4n=**n6(1g`JEtSy;SG6X;#-F~Oz3lESG2b5`j@wAwY4Yp<=4Xeb>iH=6aicF?DxD&q{`!&}ct zBI)aycwuobQAf&678Uf+Mmh-@9RUhyH~>?w0dixO0#jZjEc9R^=5NZw=|a(kcB?9^ zfnTiEFXp-q#B;Tn>(O%$A*ud^Rg&eVH6Y_5Y%!E39RR&s?XpG`gKwU!6FE1 z7X)DC7)*(5g}lh`4`{i~DZcWupZI`K)_4P)VE{@gc7@Xsd^86zl~_mOYH?I4!aGeX z^E(_=L6?PgveDQ+r%P@UISEXrkn`LHJZ##+!-anV>6h)IkKp;E@p8+3&(5%kS2)ld*J*rJccZM0iyaAx7+F~GW1UWFK&3X$PE1^}NH zgAG9ck5K!{07OwU@j@Do>TbH=CDEo#4m0cEyAuXy_<&jlzJVcKweSJ5 z&=q~iIn18$w8yb=rmEmHxVEUA^?RwnB?6Qlp1os8@*dWTGL2bhzZ!s*xqScR?EPL` zo(JwNdKUUYy7GtvZ3asXm)cgFvCx9EmAi;|w=a0iGiv%%VYKh`P0Wma4y`Xyx|T~( zAmfGbgbEEC7)j8b@WA@+5W3a61HJXC1dX@6_T|Czk0I0zBk%tnW~()VWITGI!`$c< gARL?UBrYYkwoDw4eo*CrzXGTrZ@;GF>596)00d&n@&Et; literal 0 HcmV?d00001 diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Package.appxmanifest b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Package.appxmanifest new file mode 100644 index 000000000000..6b15867eb1ef --- /dev/null +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Package.appxmanifest @@ -0,0 +1,78 @@ + + + + + + + + TemplateDisplayName + A Lone Developer + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Pages/TemplateExtensionPage.cs b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Pages/TemplateExtensionPage.cs new file mode 100644 index 000000000000..3770771be41a --- /dev/null +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Pages/TemplateExtensionPage.cs @@ -0,0 +1,25 @@ +// Copyright (c) Microsoft Corporation +// The Microsoft Corporation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Microsoft.CmdPal.Extensions; +using Microsoft.CmdPal.Extensions.Helpers; + +namespace TemplateCmdPalExtension; + +internal sealed partial class TemplateCmdPalExtensionPage : ListPage +{ + public TemplateCmdPalExtensionPage() + { + Icon = new(string.Empty); + Name = "TemplateDisplayName"; + } + + public override IListItem[] GetItems() + { + return [ + new ListItem(new NoOpCommand()) { Title = "TODO: Implement your extension here" } + ]; + } +} diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Program.cs b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Program.cs new file mode 100644 index 000000000000..353a59bdb4e1 --- /dev/null +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Program.cs @@ -0,0 +1,36 @@ +// Copyright (c) Microsoft Corporation +// The Microsoft Corporation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Threading; +using Microsoft.CmdPal.Extensions; + +namespace TemplateCmdPalExtension; + +public class Program +{ + [MTAThread] + public static void Main(string[] args) + { + if (args.Length > 0 && args[0] == "-RegisterProcessAsComServer") + { + using ExtensionServer server = new(); + var extensionDisposedEvent = new ManualResetEvent(false); + var extensionInstance = new SampleExtension(extensionDisposedEvent); + + // We are instantiating an extension instance once above, and returning it every time the callback in RegisterExtension below is called. + // This makes sure that only one instance of SampleExtension is alive, which is returned every time the host asks for the IExtension object. + // If you want to instantiate a new instance each time the host asks, create the new instance inside the delegate. + server.RegisterExtension(() => extensionInstance); + + // This will make the main thread wait until the event is signalled by the extension class. + // Since we have single instance of the extension object, we exit as soon as it is disposed. + extensionDisposedEvent.WaitOne(); + } + else + { + Console.WriteLine("Not being launched as a Extension... exiting."); + } + } +} diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/SampleExtension.cs b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/SampleExtension.cs new file mode 100644 index 000000000000..3ce0d64a6587 --- /dev/null +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/SampleExtension.cs @@ -0,0 +1,36 @@ +// Copyright (c) Microsoft Corporation +// The Microsoft Corporation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Runtime.InteropServices; +using System.Threading; +using Microsoft.CmdPal.Extensions; + +namespace TemplateCmdPalExtension; + +[ComVisible(true)] +[Guid("FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF")] +[ComDefaultInterface(typeof(IExtension))] +public sealed partial class SampleExtension : IExtension, IDisposable +{ + private readonly ManualResetEvent _extensionDisposedEvent; + + private readonly TemplateCmdPalExtensionActionsProvider _provider = new(); + + public SampleExtension(ManualResetEvent extensionDisposedEvent) + { + this._extensionDisposedEvent = extensionDisposedEvent; + } + + public object? GetProvider(ProviderType providerType) + { + return providerType switch + { + ProviderType.Commands => _provider, + _ => null, + }; + } + + public void Dispose() => this._extensionDisposedEvent.Set(); +} diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj new file mode 100644 index 000000000000..5dc1cece6f71 --- /dev/null +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj @@ -0,0 +1,62 @@ + + + WinExe + TemplateCmdPalExtension + app.manifest + + 10.0.22621.48 + net9.0-windows10.0.22621.0 + 10.0.19041.0 + 10.0.19041.0 + win-x64;win-arm64 + + win-$(Platform).pubxml + true + enable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateExtensionCommandsProvider.cs b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateExtensionCommandsProvider.cs new file mode 100644 index 000000000000..6e29555194f6 --- /dev/null +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateExtensionCommandsProvider.cs @@ -0,0 +1,23 @@ +// Copyright (c) Microsoft Corporation +// The Microsoft Corporation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using Microsoft.CmdPal.Extensions; +using Microsoft.CmdPal.Extensions.Helpers; + +namespace TemplateCmdPalExtension; + +public partial class TemplateCmdPalExtensionActionsProvider : CommandProvider +{ + public TemplateCmdPalExtensionActionsProvider() + { + DisplayName = "TemplateDisplayName Commands"; + Icon = IconHelpers.FromRelativePath("Assets\\StoreLogo.png"); + } + + private readonly ICommandItem[] _commands = [ + new CommandItem(new TemplateCmdPalExtensionPage()), + ]; + + public override ICommandItem[] TopLevelCommands() => _commands; +} diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/app.manifest b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/app.manifest new file mode 100644 index 000000000000..930a1b5cfac8 --- /dev/null +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/app.manifest @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + PerMonitorV2 + + + \ No newline at end of file diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/nuget.config b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/nuget.config new file mode 100644 index 000000000000..ed4ed00a402a --- /dev/null +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/nuget.config @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.WindowsTerminal/WindowsTerminalCommandsProvider.cs b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.WindowsTerminal/WindowsTerminalCommandsProvider.cs index f9a65db0166c..9b21062502b2 100644 --- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.WindowsTerminal/WindowsTerminalCommandsProvider.cs +++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.WindowsTerminal/WindowsTerminalCommandsProvider.cs @@ -2,8 +2,6 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.IO; using Microsoft.CmdPal.Ext.WindowsTerminal.Helpers; using Microsoft.CmdPal.Ext.WindowsTerminal.Pages; using Microsoft.CmdPal.Ext.WindowsTerminal.Properties; @@ -17,9 +15,8 @@ public partial class WindowsTerminalCommandsProvider : CommandProvider private readonly TerminalTopLevelCommandItem _terminalCommand; private readonly SettingsManager _settingsManager = new(); - public static IconInfo TerminalIcon { get; } = new( - new(Path.Combine(AppDomain.CurrentDomain.BaseDirectory.ToString(), "Assets\\WindowsTerminal.light.png")), - new(Path.Combine(AppDomain.CurrentDomain.BaseDirectory.ToString(), "Assets\\WindowsTerminal.dark.png"))); + public static IconInfo TerminalIcon { get; } = + IconHelpers.FromRelativePaths("Assets\\WindowsTerminal.light.png", "Assets\\WindowsTerminal.dark.png"); public WindowsTerminalCommandsProvider() { diff --git a/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtension.csproj b/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtension.csproj index 2590cd965730..d9918247b181 100644 --- a/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtension.csproj +++ b/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtension.csproj @@ -2,6 +2,7 @@ WinExe + Enable TemplateExtension app.manifest win-$(Platform).pubxml diff --git a/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtensionCommandsProvider.cs b/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtensionCommandsProvider.cs index 5bda2e6fe635..282e34455299 100644 --- a/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtensionCommandsProvider.cs +++ b/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtensionCommandsProvider.cs @@ -2,11 +2,6 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Microsoft.CmdPal.Extensions; using Microsoft.CmdPal.Extensions.Helpers; @@ -17,14 +12,12 @@ public partial class TemplateExtensionActionsProvider : CommandProvider public TemplateExtensionActionsProvider() { DisplayName = "TemplateDisplayName Commands"; + Icon = IconHelpers.FromRelativePath("Assets\\StoreLogo.png"); } private readonly ICommandItem[] _commands = [ new CommandItem(new TemplateExtensionPage()), ]; - public override ICommandItem[] TopLevelCommands() - { - return _commands; - } + public override ICommandItem[] TopLevelCommands() => _commands; } diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs index bdf181ddbc27..6068050920cd 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs @@ -35,6 +35,6 @@ public BuiltInsCommandProvider() { Id = "Core"; DisplayName = "Built-in commands"; - Icon = new(Path.Combine(AppDomain.CurrentDomain.BaseDirectory.ToString(), "Assets\\StoreLogo.scale-200.png")); + Icon = IconHelpers.FromRelativePath("Assets\\StoreLogo.scale-200.png"); } } diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs index 36a4aaf44edc..3662f688eca1 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs @@ -32,7 +32,7 @@ public partial class MainListPage : DynamicListPage, public MainListPage(IServiceProvider serviceProvider) { Name = "Command Palette"; - Icon = new(Path.Combine(AppDomain.CurrentDomain.BaseDirectory.ToString(), "Assets\\StoreLogo.scale-200.png")); + Icon = IconHelpers.FromRelativePath("Assets\\StoreLogo.scale-200.png"); _serviceProvider = serviceProvider; _tlcManager = _serviceProvider.GetService()!; diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs index d21adb81c899..57524638f677 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs @@ -108,7 +108,8 @@ await Task.Run(() => { // -2147024809: E_INVALIDARG // -2147467262: E_NOINTERFACE - var hr = PInvoke.CoCreateInstance(Guid.Parse(ExtensionClassId), null, CLSCTX.CLSCTX_LOCAL_SERVER, typeof(IExtension).GUID, out var extensionObj); + var guid = typeof(IExtension).GUID; + var hr = PInvoke.CoCreateInstance(Guid.Parse(ExtensionClassId), null, CLSCTX.CLSCTX_LOCAL_SERVER, guid, out var extensionObj); extensionPtr = Marshal.GetIUnknownForObject(extensionObj); if (hr < 0) { diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CmdPal.Extensions.Helpers/IconHelpers.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CmdPal.Extensions.Helpers/IconHelpers.cs new file mode 100644 index 000000000000..db2b391decf9 --- /dev/null +++ b/src/modules/cmdpal/extensionsdk/Microsoft.CmdPal.Extensions.Helpers/IconHelpers.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation +// The Microsoft Corporation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +namespace Microsoft.CmdPal.Extensions.Helpers; + +public sealed class IconHelpers +{ + public static IconInfo FromRelativePath(string path) => new(Path.Combine(AppDomain.CurrentDomain.BaseDirectory.ToString(), path)); + + public static IconInfo FromRelativePaths(string lightIcon, string darkIcon) => + new( + new(Path.Combine(AppDomain.CurrentDomain.BaseDirectory.ToString(), lightIcon)), + new(Path.Combine(AppDomain.CurrentDomain.BaseDirectory.ToString(), darkIcon))); +} diff --git a/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs b/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs index c56202415b12..f4ab722b704b 100644 --- a/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs +++ b/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs @@ -30,7 +30,7 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable private IEnumerable? _results; - public static IconInfo WinGetIcon { get; } = new(Path.Combine(AppDomain.CurrentDomain.BaseDirectory.ToString(), "Assets\\AppList.scale-100.png")); + public static IconInfo WinGetIcon { get; } = IconHelpers.FromRelativePath("Assets\\AppList.scale-100.png"); public static IconInfo ExtensionsIcon { get; } = new("\uEA86"); // Puzzle diff --git a/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionCommandsProvider.cs b/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionCommandsProvider.cs index 9b05781e53ef..cc6a9d767b04 100644 --- a/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionCommandsProvider.cs +++ b/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionCommandsProvider.cs @@ -34,7 +34,7 @@ public WinGetExtensionCommandsProvider() new OpenUrlCommand("ms-windows-store://assoc/?Tags=AppExtension-com.microsoft.windows.commandpalette")) { Title = "Search for extensions on the Store", - Icon = new(Path.Combine(AppDomain.CurrentDomain.BaseDirectory.ToString(), "Assets\\ms-store.png")), + Icon = IconHelpers.FromRelativePath("Assets\\ms-store.png"), }, ];