Bump packages and apply new api changes

tanchekwei · tanchekwei · commit d283abb60979 · 2025-11-25T21:33:20.000+08:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,11 +3,11 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.2.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.6.251022008" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.251003001" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
     <PackageVersion Include="System.Text.Json" Version="9.0.10" />
   </ItemGroup>
 </Project>
diff --git a/WorkspaceLauncherForVSCode/Classes/WorkspaceStorage.cs b/WorkspaceLauncherForVSCode/Classes/WorkspaceStorage.cs
@@ -96,7 +96,8 @@ private void InitializeDatabase()
                 var checkCmd = _connection.CreateCommand();
                 checkCmd.Transaction = transaction;
                 checkCmd.CommandText = "SELECT count(*) FROM sqlite_master WHERE type='table' AND name='Workspaces'";
-                var oldTableExists = (long)checkCmd.ExecuteScalar() > 0;
+                var count = checkCmd.ExecuteScalar() as long? ?? 0L;
+                var oldTableExists = count > 0;
 
                 if (oldTableExists)
                 {
@@ -133,7 +134,7 @@ public async Task<List<VisualStudioCodeWorkspace>> GetWorkspacesAsync()
                     {
                         Path = reader.GetString(0),
                         Name = reader.IsDBNull(1) ? null : reader.GetString(1),
-                        WorkspaceType = (Enums.WorkspaceType)reader.GetInt32(2),
+                        WorkspaceType = (WorkspaceType)reader.GetInt32(2),
                         Frequency = reader.GetInt32(3),
                         LastAccessed = reader.IsDBNull(4) ? DateTime.MinValue : DateTime.Parse(reader.GetString(4), CultureInfo.InvariantCulture),
                         PinDateTime = reader.IsDBNull(5) ? null : DateTime.Parse(reader.GetString(5), CultureInfo.InvariantCulture),
diff --git a/WorkspaceLauncherForVSCode/Commands/CopyPathCommand.cs b/WorkspaceLauncherForVSCode/Commands/CopyPathCommand.cs
diff --git a/WorkspaceLauncherForVSCode/Commands/OpenInExplorerCommand.cs b/WorkspaceLauncherForVSCode/Commands/OpenInExplorerCommand.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See the LICENSE file in the project root for details.
 using System;
 using System.IO;
-using Microsoft.CmdPal.Ext.System.Helpers;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using WorkspaceLauncherForVSCode.Classes;
 using WorkspaceLauncherForVSCode.Enums;
@@ -61,7 +60,7 @@ public override CommandResult Invoke()
                     return pathInvalidResult;
                 }
 
-                OpenInShellHelper.OpenInShell(_path, pathToOpen);
+                ShellHelpers.OpenInShell(_path, pathToOpen);
                 return CommandResult.Dismiss();
             }
             catch (Exception ex)
diff --git a/WorkspaceLauncherForVSCode/Commands/OpenInTerminalCommand.cs b/WorkspaceLauncherForVSCode/Commands/OpenInTerminalCommand.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See the LICENSE file in the project root for details.
 using System;
 using System.IO;
-using Microsoft.CmdPal.Ext.System.Helpers;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using WorkspaceLauncherForVSCode.Classes;
 using WorkspaceLauncherForVSCode.Enums;
@@ -59,7 +58,7 @@ public override CommandResult Invoke()
                     }
 
                     var terminal = _settingsManager.TerminalType == TerminalType.PowerShell ? "powershell.exe" : "cmd.exe";
-                    OpenInShellHelper.OpenInShell(terminal, workingDir: directoryPath);
+                    ShellHelpers.OpenInShell(terminal, workingDir: directoryPath);
                 }
 
                 return CommandResult.Dismiss();
diff --git a/WorkspaceLauncherForVSCode/Commands/OpenSolutionCommand.cs b/WorkspaceLauncherForVSCode/Commands/OpenSolutionCommand.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.System.Helpers;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using WorkspaceLauncherForVSCode.Classes;
 using WorkspaceLauncherForVSCode.Components;
@@ -111,7 +110,7 @@ public override CommandResult Invoke()
 
             if (Workspace.VSInstance != null)
             {
-                OpenInShellHelper.OpenInShell(Workspace.VSInstance.InstancePath, Workspace.Path, runAs: _elevated ? OpenInShellHelper.ShellRunAsType.Administrator : OpenInShellHelper.ShellRunAsType.None);
+                ShellHelpers.OpenInShell(Workspace.VSInstance.InstancePath, Workspace.Path, runAs: _elevated ? ShellHelpers.ShellRunAsType.Administrator : ShellHelpers.ShellRunAsType.None);
             }
 
             return PageCommandResultHandler.HandleCommandResult(page);
diff --git a/WorkspaceLauncherForVSCode/Commands/OpenVisualStudioCodeCommand.cs b/WorkspaceLauncherForVSCode/Commands/OpenVisualStudioCodeCommand.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.System.Helpers;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using WorkspaceLauncherForVSCode.Classes;
 using WorkspaceLauncherForVSCode.Enums;
@@ -114,7 +113,7 @@ public override CommandResult Invoke()
             }
             else
             {
-                OpenInShellHelper.OpenInShell(Workspace.VSCodeInstance.ExecutablePath, arguments, runAs: _elevated ? OpenInShellHelper.ShellRunAsType.Administrator : OpenInShellHelper.ShellRunAsType.None);
+                ShellHelpers.OpenInShell(Workspace.VSCodeInstance.ExecutablePath, arguments, runAs: _elevated ? ShellHelpers.ShellRunAsType.Administrator : ShellHelpers.ShellRunAsType.None);
             }
 
             Task.Run(() => page.UpdateFrequencyAsync(Workspace.Path, Workspace.WorkspaceType));
diff --git a/WorkspaceLauncherForVSCode/Helpers/OpenInShellHelper.cs b/WorkspaceLauncherForVSCode/Helpers/OpenInShellHelper.cs
diff --git a/WorkspaceLauncherForVSCode/Pages/StaticHelpItems.cs b/WorkspaceLauncherForVSCode/Pages/StaticHelpItems.cs
@@ -93,7 +93,7 @@ public static void Initialize(Dependencies deps)
                     new ListItem(VisualStudioDetailPage)
                     {
                         Subtitle = "Visual Studio",
-                        Icon = Icon.VisualStudio,
+                        Icon = Icon.VisualStudio2026,
                     },
                     new ListItem(VisualStudioCodeDetailPage)
                     {
diff --git a/WorkspaceLauncherForVSCode/Pages/VisualStudioDetailPage.cs b/WorkspaceLauncherForVSCode/Pages/VisualStudioDetailPage.cs
@@ -62,7 +62,7 @@ public override IListItem[] GetItems()
                     {
                         Title = _countTracker[CountType.VisualStudio].ToString(CultureInfo.InvariantCulture),
                         Subtitle = "Total",
-                        Icon = Classes.Icon.VisualStudio,
+                        Icon = Classes.Icon.VisualStudio2026,
                     }
                 ];
             }
diff --git a/WorkspaceLauncherForVSCode/WorkspaceLauncherForVSCode.csproj b/WorkspaceLauncherForVSCode/WorkspaceLauncherForVSCode.csproj
@@ -7,10 +7,10 @@
     <AssemblyTitle>Visual Studio / Code for Command Palette</AssemblyTitle>
     <WindowsPackageType Condition="'$(BuildingInsideVisualStudio)' != 'true'">None</WindowsPackageType>
 
-    <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.26100.38</WindowsSdkPackageVersion>
     <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
 
     <PublishProfile>win-$(Platform).pubxml</PublishProfile>
diff --git a/WorkspaceLauncherForVSCode/WorkspaceLauncherForVSCodeCommandsProvider.cs b/WorkspaceLauncherForVSCode/WorkspaceLauncherForVSCodeCommandsProvider.cs
@@ -47,7 +47,7 @@ public WorkspaceLauncherForVSCodeCommandsProvider(SettingsManager settingsManage
         }
     }
 
-    private void OnInstanceSettingsChanged(object? sender, System.EventArgs e)
+    private void OnInstanceSettingsChanged(object? sender, EventArgs e)
     {
         try
         {
diff --git a/WorkspaceLauncherForVSCode/Workspaces/WorkspaceFilter.cs b/WorkspaceLauncherForVSCode/Workspaces/WorkspaceFilter.cs
@@ -25,29 +25,26 @@ public static List<VisualStudioCodeWorkspace> Filter(
 
                 if (isSearching)
                 {
-                    var matcher = StringMatcher.Instance;
-                    matcher.UserSettingSearchPrecision = SearchPrecisionScore.Regular;
-
-                    var matchedItems = new List<(VisualStudioCodeWorkspace item, MatchResult bestMatch)>();
+                    var matchedItems = new List<(VisualStudioCodeWorkspace item, int score)>();
 
                     foreach (var item in allWorkspaces)
                     {
                         var titleScore = (searchBy is SearchBy.Title or SearchBy.Both)
-                            ? matcher.FuzzyMatch(searchText, item.Name ?? string.Empty)
-                            : new MatchResult(false, 0);
+                            ? FuzzyStringMatcher.ScoreFuzzy(searchText, item.Name ?? string.Empty)
+                            : 0;
 
                         var subtitleScore = (searchBy is SearchBy.Path or SearchBy.Both)
-                            ? matcher.FuzzyMatch(searchText, item.WindowsPath ?? string.Empty)
-                            : new MatchResult(false, 0);
+                            ? FuzzyStringMatcher.ScoreFuzzy(searchText, item.WindowsPath ?? string.Empty)
+                            : 0;
 
-                        var bestMatch = titleScore.Score >= subtitleScore.Score ? titleScore : subtitleScore;
-                        if (bestMatch.Success)
+                        var bestScore = Math.Max(titleScore, subtitleScore);
+                        if (bestScore > 0)
                         {
-                            matchedItems.Add((item, bestMatch));
+                            matchedItems.Add((item, bestScore));
                         }
                     }
 
-                    matchedItems.Sort((a, b) => b.bestMatch.Score.CompareTo(a.bestMatch.Score));
+                    matchedItems.Sort((a, b) => b.score.CompareTo(a.score));
 
                     filteredItems = new List<VisualStudioCodeWorkspace>(matchedItems.Count);
                     foreach (var match in matchedItems)
@@ -137,4 +134,3 @@ public static List<VisualStudioCodeWorkspace> Filter(
         }
     }
 }
-

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// Licensed under the MIT License. See the LICENSE file in the project root for details.`
`3`	`3`	`using System;`
`4`	`4`	`using System.IO;`
`5`		`-using Microsoft.CmdPal.Ext.System.Helpers;`
`6`	`5`	`using Microsoft.CommandPalette.Extensions.Toolkit;`
`7`	`6`	`using WorkspaceLauncherForVSCode.Classes;`
`8`	`7`	`using WorkspaceLauncherForVSCode.Enums;`
`@@ -59,7 +58,7 @@ public override CommandResult Invoke()`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`var terminal = _settingsManager.TerminalType == TerminalType.PowerShell ? "powershell.exe" : "cmd.exe";`
`62`		`- OpenInShellHelper.OpenInShell(terminal, workingDir: directoryPath);`
	`61`	`+ ShellHelpers.OpenInShell(terminal, workingDir: directoryPath);`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`return CommandResult.Dismiss();`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using System;`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using System.Threading.Tasks;`
`6`		`-using Microsoft.CmdPal.Ext.System.Helpers;`
`7`	`6`	`using Microsoft.CommandPalette.Extensions.Toolkit;`
`8`	`7`	`using WorkspaceLauncherForVSCode.Classes;`
`9`	`8`	`using WorkspaceLauncherForVSCode.Components;`
`@@ -111,7 +110,7 @@ public override CommandResult Invoke()`
`111`	`110`
`112`	`111`	`if (Workspace.VSInstance != null)`
`113`	`112`	`{`
`114`		`- OpenInShellHelper.OpenInShell(Workspace.VSInstance.InstancePath, Workspace.Path, runAs: _elevated ? OpenInShellHelper.ShellRunAsType.Administrator : OpenInShellHelper.ShellRunAsType.None);`
	`113`	`+ ShellHelpers.OpenInShell(Workspace.VSInstance.InstancePath, Workspace.Path, runAs: _elevated ? ShellHelpers.ShellRunAsType.Administrator : ShellHelpers.ShellRunAsType.None);`
`115`	`114`	`}`
`116`	`115`
`117`	`116`	`return PageCommandResultHandler.HandleCommandResult(page);`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using System.Diagnostics;`
`5`	`5`	`using System.IO;`
`6`	`6`	`using System.Threading.Tasks;`
`7`		`-using Microsoft.CmdPal.Ext.System.Helpers;`
`8`	`7`	`using Microsoft.CommandPalette.Extensions.Toolkit;`
`9`	`8`	`using WorkspaceLauncherForVSCode.Classes;`
`10`	`9`	`using WorkspaceLauncherForVSCode.Enums;`
`@@ -114,7 +113,7 @@ public override CommandResult Invoke()`
`114`	`113`	`}`
`115`	`114`	`else`
`116`	`115`	`{`
`117`		`- OpenInShellHelper.OpenInShell(Workspace.VSCodeInstance.ExecutablePath, arguments, runAs: _elevated ? OpenInShellHelper.ShellRunAsType.Administrator : OpenInShellHelper.ShellRunAsType.None);`
	`116`	`+ ShellHelpers.OpenInShell(Workspace.VSCodeInstance.ExecutablePath, arguments, runAs: _elevated ? ShellHelpers.ShellRunAsType.Administrator : ShellHelpers.ShellRunAsType.None);`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`Task.Run(() => page.UpdateFrequencyAsync(Workspace.Path, Workspace.WorkspaceType));`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public static void Initialize(Dependencies deps)`
`93`	`93`	`new ListItem(VisualStudioDetailPage)`
`94`	`94`	`{`
`95`	`95`	`Subtitle = "Visual Studio",`
`96`		`- Icon = Icon.VisualStudio,`
	`96`	`+ Icon = Icon.VisualStudio2026,`
`97`	`97`	`},`
`98`	`98`	`new ListItem(VisualStudioCodeDetailPage)`
`99`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public override IListItem[] GetItems()`
`62`	`62`	`{`
`63`	`63`	`Title = _countTracker[CountType.VisualStudio].ToString(CultureInfo.InvariantCulture),`
`64`	`64`	`Subtitle = "Total",`
`65`		`- Icon = Classes.Icon.VisualStudio,`
	`65`	`+ Icon = Classes.Icon.VisualStudio2026,`
`66`	`66`	`}`
`67`	`67`	`];`
`68`	`68`	`}`