get rid of dependency on Wox (#383)

Closes #363 The WebSearch plugin pulled in all of Wox.Infrastructure, which resulted in us pulling in _all of WPF_ as a dependency, which we obviously don't need.
zadjii-msft · Feb 3, 2025 · 1a623ce · 1a623ce
1 parent e8bab4f
commit 1a623ce
Show file tree

Hide file tree

Showing 22 changed files with 286 additions and 25 deletions.
diff --git a/src/modules/cmdpal/Exts/EverythingExtension/EverythingExtension.csproj b/src/modules/cmdpal/Exts/EverythingExtension/EverythingExtension.csproj
@@ -28,7 +28,6 @@
 
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\Common.UI\Common.UI.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj" />
   </ItemGroup>
 

diff --git a/src/modules/cmdpal/Exts/HackerNewsExtension/HackerNewsExtension.csproj b/src/modules/cmdpal/Exts/HackerNewsExtension/HackerNewsExtension.csproj
@@ -29,7 +29,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj" />
-    <ProjectReference Include="..\..\..\..\common\Common.UI\Common.UI.csproj" />
   </ItemGroup>
 
   <!--

diff --git a/src/modules/cmdpal/Exts/MastodonExtension/MastodonExtension.csproj b/src/modules/cmdpal/Exts/MastodonExtension/MastodonExtension.csproj
@@ -33,7 +33,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj" />
-    <ProjectReference Include="..\..\..\..\common\Common.UI\Common.UI.csproj" />
   </ItemGroup>
 
   <!--

diff --git a/src/modules/cmdpal/Exts/MediaControlsExtension/MediaControlsExtension.csproj b/src/modules/cmdpal/Exts/MediaControlsExtension/MediaControlsExtension.csproj
@@ -28,7 +28,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj" />
-    <ProjectReference Include="..\..\..\..\common\Common.UI\Common.UI.csproj" />
   </ItemGroup>
 
   <!--

diff --git a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.WebSearch/Microsoft.CmdPal.Ext.WebSearch.csproj b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.WebSearch/Microsoft.CmdPal.Ext.WebSearch.csproj
@@ -8,10 +8,17 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\launcher\Wox.Infrastructure\Wox.Infrastructure.csproj" />
-    <ProjectReference Include="..\..\..\launcher\Wox.Plugin\Wox.Plugin.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.CsWin32">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DependentUpon>Resources.resx</DependentUpon>

diff --git a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.WebSearch/Pages/WebSearchListPage.cs b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.WebSearch/Pages/WebSearchListPage.cs
@@ -12,7 +12,7 @@
 using Microsoft.CmdPal.Ext.WebSearch.Properties;
 using Microsoft.CmdPal.Extensions;
 using Microsoft.CmdPal.Extensions.Helpers;
-using BrowserInfo = Wox.Plugin.Common.DefaultBrowserInfo;
+using BrowserInfo = Microsoft.CmdPal.Ext.WebSearch.Helpers.DefaultBrowserInfo;
 
 namespace Microsoft.CmdPal.Ext.WebSearch.Pages;
 

diff --git a/src/modules/cmdpal/Exts/PokedexExtension/PokedexExtension.csproj b/src/modules/cmdpal/Exts/PokedexExtension/PokedexExtension.csproj
@@ -28,7 +28,6 @@
 
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\Common.UI\Common.UI.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj" />
   </ItemGroup>
 

diff --git a/src/modules/cmdpal/Exts/ProcessMonitorExtension/ProcessMonitorExtension.csproj b/src/modules/cmdpal/Exts/ProcessMonitorExtension/ProcessMonitorExtension.csproj
@@ -27,7 +27,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\Common.UI\Common.UI.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj">
     </ProjectReference>
   </ItemGroup>

diff --git a/src/modules/cmdpal/Exts/SSHKeychainExtension/SSHKeychainExtension.csproj b/src/modules/cmdpal/Exts/SSHKeychainExtension/SSHKeychainExtension.csproj
@@ -28,7 +28,6 @@
 
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\Common.UI\Common.UI.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj" />
   </ItemGroup>
 

diff --git a/src/modules/cmdpal/Exts/SamplePagesExtension/SamplePagesExtension.csproj b/src/modules/cmdpal/Exts/SamplePagesExtension/SamplePagesExtension.csproj
@@ -29,7 +29,6 @@
 
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\Common.UI\Common.UI.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj" />
   </ItemGroup>
 

diff --git a/src/modules/cmdpal/Exts/SpongebotExtension/SpongebotExtension.csproj b/src/modules/cmdpal/Exts/SpongebotExtension/SpongebotExtension.csproj
@@ -27,7 +27,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\Common.UI\Common.UI.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj" />
   </ItemGroup>
 

diff --git a/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtension.csproj b/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtension.csproj
@@ -30,7 +30,6 @@
 
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\Common.UI\Common.UI.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj" />
   </ItemGroup>
 

diff --git a/src/modules/cmdpal/Exts/VirtualDesktopExtension/VirtualDesktopExtension.csproj b/src/modules/cmdpal/Exts/VirtualDesktopExtension/VirtualDesktopExtension.csproj
@@ -35,7 +35,6 @@
 
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\Common.UI\Common.UI.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj" />
   </ItemGroup>
 

diff --git a/src/modules/cmdpal/Exts/YouTubeExtension/YouTubeExtension.csproj b/src/modules/cmdpal/Exts/YouTubeExtension/YouTubeExtension.csproj
@@ -28,7 +28,6 @@
 
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\Common.UI\Common.UI.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CmdPal.Extensions.Helpers\Microsoft.CmdPal.Extensions.Helpers.csproj" />
   </ItemGroup>
 

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj
@@ -30,7 +30,7 @@
 
     <ProjectReference Include="..\Exts\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj" />
 
-    <ProjectReference Include="..\..\..\common\Common.UI\Common.UI.csproj" />
+    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
 
   </ItemGroup>
 

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
@@ -117,7 +117,6 @@
       <Private>True</Private>
       <CopyLocalSatelliteAssemblies>True</CopyLocalSatelliteAssemblies>
     </ProjectReference>
-    <!-- <ProjectReference Include="..\..\..\common\Common.UI\Common.UI.csproj" /> -->
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CmdPal.Extensions.Helpers/OpenUrlCommand.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CmdPal.Extensions.Helpers/OpenUrlCommand.cs
@@ -2,9 +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.Diagnostics;
-using Microsoft.CmdPal.Extensions.Helpers;
-
 namespace Microsoft.CmdPal.Extensions.Helpers;
 
 public sealed partial class OpenUrlCommand : InvokableCommand
@@ -22,7 +19,7 @@ public OpenUrlCommand(string target)
 
     public override CommandResult Invoke()
     {
-        Process.Start(new ProcessStartInfo(_target) { UseShellExecute = true });
+        ShellHelpers.OpenInShell(_target);
         return Result;
     }
 }
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CmdPal.Extensions.Helpers/ShellHelpers.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CmdPal.Extensions.Helpers/ShellHelpers.cs
@@ -0,0 +1,62 @@
+// 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.ComponentModel;
+using System.Diagnostics;
+
+namespace Microsoft.CmdPal.Extensions.Helpers;
+
+public static class ShellHelpers
+{
+    public static bool OpenCommandInShell(string? path, string? pattern, string? arguments, string? workingDir = null, ShellRunAsType runAs = ShellRunAsType.None, bool runWithHiddenWindow = false)
+    {
+        if (string.IsNullOrEmpty(pattern))
+        {
+            // Log.Warn($"Trying to run OpenCommandInShell with an empty pattern. The default browser definition might have issues. Path: '${path ?? string.Empty}' ; Arguments: '${arguments ?? string.Empty}' ; Working Directory: '${workingDir ?? string.Empty}'", typeof(ShellHelpers));
+        }
+        else if (pattern.Contains("%1", StringComparison.Ordinal))
+        {
+            arguments = pattern.Replace("%1", arguments);
+        }
+
+        return OpenInShell(path, arguments, workingDir, runAs, runWithHiddenWindow);
+    }
+
+    public static bool OpenInShell(string? path, string? arguments = null, string? workingDir = null, ShellRunAsType runAs = ShellRunAsType.None, bool runWithHiddenWindow = false)
+    {
+        using var process = new Process();
+        process.StartInfo.FileName = path;
+        process.StartInfo.WorkingDirectory = string.IsNullOrWhiteSpace(workingDir) ? string.Empty : workingDir;
+        process.StartInfo.Arguments = string.IsNullOrWhiteSpace(arguments) ? string.Empty : arguments;
+        process.StartInfo.WindowStyle = runWithHiddenWindow ? ProcessWindowStyle.Hidden : ProcessWindowStyle.Normal;
+        process.StartInfo.UseShellExecute = true;
+
+        if (runAs == ShellRunAsType.Administrator)
+        {
+            process.StartInfo.Verb = "RunAs";
+        }
+        else if (runAs == ShellRunAsType.OtherUser)
+        {
+            process.StartInfo.Verb = "RunAsUser";
+        }
+
+        try
+        {
+            process.Start();
+            return true;
+        }
+        catch (Win32Exception)
+        {
+            // Log.Exception($"Unable to open {path}: {ex.Message}", ex, MethodBase.GetCurrentMethod().DeclaringType);
+            return false;
+        }
+    }
+
+    public enum ShellRunAsType
+    {
+        None,
+        Administrator,
+        OtherUser,
+    }
+}
diff --git a/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WebSearch/Commands/SearchWebCommand.cs b/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WebSearch/Commands/SearchWebCommand.cs
@@ -6,8 +6,8 @@
 using Microsoft.CmdPal.Ext.WebSearch.Helpers;
 using Microsoft.CmdPal.Ext.WebSearch.Properties;
 using Microsoft.CmdPal.Extensions.Helpers;
-using Wox.Infrastructure;
-using BrowserInfo = Wox.Plugin.Common.DefaultBrowserInfo;
+
+using BrowserInfo = Microsoft.CmdPal.Ext.WebSearch.Helpers.DefaultBrowserInfo;
 
 namespace Microsoft.CmdPal.Ext.WebSearch.Commands;
 
@@ -28,7 +28,7 @@ internal SearchWebCommand(string arguments, SettingsManager settingsManager)
 
     public override CommandResult Invoke()
     {
-        if (!Helper.OpenCommandInShell(BrowserInfo.Path, BrowserInfo.ArgumentsPattern, $"? {Arguments}"))
+        if (!ShellHelpers.OpenCommandInShell(BrowserInfo.Path, BrowserInfo.ArgumentsPattern, $"? {Arguments}"))
         {
             // TODO GH# 138 --> actually display feedback from the extension somewhere.
             return CommandResult.KeepOpen();

diff --git a/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WebSearch/FallbackExecuteSearchItem.cs b/src/modules/cmdpal/exts/Microsoft.CmdPal.Ext.WebSearch/FallbackExecuteSearchItem.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using Microsoft.CmdPal.Ext.WebSearch.Helpers;
 using Microsoft.CmdPal.Extensions.Helpers;
-using BrowserInfo = Wox.Plugin.Common.DefaultBrowserInfo;
+using BrowserInfo = Microsoft.CmdPal.Ext.WebSearch.Helpers.DefaultBrowserInfo;
 
 namespace Microsoft.CmdPal.Ext.WebSearch.Commands;