Fix empty WinGet update list on fresh launch + bump pinget to 0.9.0 (#4913)

GabrielDuf · web-flow · commit 78da8c2e9e6c · 2026-06-11T13:08:56.000-04:00
diff --git a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
@@ -138,7 +138,7 @@
         <PackageReference Include="Octokit" Version="14.0.0" />
         <PackageReference Include="Avalonia.Controls.WebView" Version="12.0.0" />
         <PackageReference Include="Tmds.DBus.Protocol" Version="0.92.0" />
-        <PackageReference Include="Devolutions.Pinget.Cli.Rust" Version="0.8.2" GeneratePathProperty="true" ExcludeAssets="build;buildTransitive;native" />
+        <PackageReference Include="Devolutions.Pinget.Cli.Rust" Version="0.9.0" GeneratePathProperty="true" ExcludeAssets="build;buildTransitive;native" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/PingetCliHelper.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/PingetCliHelper.cs
@@ -178,6 +178,7 @@ public void GetPackageDetails_UnSafe(IPackageDetails details)
 
     private T RunJson<T>(LoggableTaskType taskType, string arguments)
     {
+        using var _cliLock = WinGet.AcquireCliLock();
         using Process process = new()
         {
             StartInfo = new ProcessStartInfo
diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/PingetPackageDetailsProvider.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/PingetPackageDetailsProvider.cs
@@ -149,6 +149,7 @@ private static IReadOnlyList<string> BuildShowArguments(PackageQuery query, stri
 
     private string RunPinget(IReadOnlyList<string> arguments, INativeTaskLogger logger)
     {
+        using var _cliLock = WinGet.AcquireCliLock();
         using Process process = new()
         {
             StartInfo = new ProcessStartInfo
diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/WinGetCliHelper.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/WinGetCliHelper.cs
@@ -40,6 +40,7 @@ IPingetPackageDetailsProvider packageDetailsProvider
 
     public IReadOnlyList<Package> GetAvailableUpdates_UnSafe()
     {
+        using var _cliLock = WinGet.AcquireCliLock();
         List<Package> Packages = [];
         using Process p = new()
         {
@@ -175,6 +176,7 @@ public IReadOnlyList<Package> GetAvailableUpdates_UnSafe()
 
     public IReadOnlyList<Package> GetInstalledPackages_UnSafe()
     {
+        using var _cliLock = WinGet.AcquireCliLock();
         List<Package> Packages = [];
         using Process p = new()
         {
@@ -307,6 +309,7 @@ public IReadOnlyList<Package> GetInstalledPackages_UnSafe()
 
     public IReadOnlyList<Package> FindPackages_UnSafe(string query)
     {
+        using var _cliLock = WinGet.AcquireCliLock();
         List<Package> Packages = [];
         using Process p = new()
         {
@@ -435,6 +438,7 @@ public void GetPackageDetails_UnSafe(IPackageDetails details)
 
     public IReadOnlyList<string> GetInstallableVersions_Unsafe(IPackage package)
     {
+        using var _cliLock = WinGet.AcquireCliLock();
         using Process p = new()
         {
             StartInfo = new ProcessStartInfo
@@ -498,6 +502,7 @@ public IReadOnlyList<string> GetInstallableVersions_Unsafe(IPackage package)
 
     public IReadOnlyList<IManagerSource> GetSources_UnSafe()
     {
+        using var _cliLock = WinGet.AcquireCliLock();
         List<IManagerSource> sources = [];
 
         using Process p = new()
diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/UniGetUI.PackageEngine.Managers.WinGet.csproj b/src/UniGetUI.PackageEngine.Managers.WinGet/UniGetUI.PackageEngine.Managers.WinGet.csproj
@@ -24,7 +24,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Devolutions.Pinget.Core" Version="0.8.2" />
+        <PackageReference Include="Devolutions.Pinget.Core" Version="0.9.0" />
         <PackageReference Include="PhotoSauce.MagicScaler" Version="0.15.0" />
     </ItemGroup>
 </Project>
diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs
@@ -59,6 +59,35 @@ public class WinGet : PackageManager
         internal WinGetCliToolKind SelectedCliToolKind { get; private set; } =
             WinGetCliToolKind.SystemWinGet;
 
+        // winget's local index isn't safe under concurrent process access: a `source update` (writer)
+        // running alongside list/upgrade/search (readers) yields partial or empty results. The COM
+        // backend serialized this implicitly; the CLI backends (winget.exe / pinget.exe) must do it
+        // explicitly. Reentrant (Monitor) so same-thread nested invocations don't self-deadlock.
+        private static readonly object _cliInvocationLock = new();
+
+        // Safety valve: never wait on the CLI lock longer than this, so a hung process can't freeze all WinGet queries.
+        private static readonly TimeSpan CliLockTimeout = TimeSpan.FromSeconds(120);
+
+        internal static IDisposable AcquireCliLock()
+        {
+            bool taken = false;
+            Monitor.TryEnter(_cliInvocationLock, CliLockTimeout, ref taken);
+            if (!taken)
+                Logger.Warn("WinGet CLI lock not acquired within timeout; proceeding unserialized to avoid a hang.");
+            return new CliLockReleaser(taken);
+        }
+
+        private sealed class CliLockReleaser(bool taken) : IDisposable
+        {
+            private bool _released;
+            public void Dispose()
+            {
+                if (_released || !taken) return;
+                _released = true;
+                Monitor.Exit(_cliInvocationLock);
+            }
+        }
+
         public WinGet()
         {
             Capabilities = new ManagerCapabilities
@@ -719,6 +748,7 @@ private static void TryRepairTempFolderPermissions()
 
         public override void RefreshPackageIndexes()
         {
+            using var _cliLock = AcquireCliLock();
             using Process p = new()
             {
                 StartInfo = new ProcessStartInfo
diff --git a/src/UniGetUI/UniGetUI.csproj b/src/UniGetUI/UniGetUI.csproj
@@ -221,7 +221,7 @@
         <PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
         <PackageReference Include="Octokit" Version="14.0.0" />
         <PackageReference Include="Devolutions.UniGetUI.Elevator" Version="2.6.1.3" GeneratePathProperty="true" ExcludeAssets="build;buildTransitive;native" />
-        <PackageReference Include="Devolutions.Pinget.Cli.Rust" Version="0.8.2" GeneratePathProperty="true" ExcludeAssets="build;buildTransitive;native" />
+        <PackageReference Include="Devolutions.Pinget.Cli.Rust" Version="0.9.0" GeneratePathProperty="true" ExcludeAssets="build;buildTransitive;native" />
 
         <Manifest Include="$(ApplicationManifest)" />
     </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,7 @@ public void GetPackageDetails_UnSafe(IPackageDetails details)`
`178`	`178`
`179`	`179`	`private T RunJson<T>(LoggableTaskType taskType, string arguments)`
`180`	`180`	`{`
	`181`	`+ using var _cliLock = WinGet.AcquireCliLock();`
`181`	`182`	`using Process process = new()`
`182`	`183`	`{`
`183`	`184`	`StartInfo = new ProcessStartInfo`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ private static IReadOnlyList<string> BuildShowArguments(PackageQuery query, stri`
`149`	`149`
`150`	`150`	`private string RunPinget(IReadOnlyList<string> arguments, INativeTaskLogger logger)`
`151`	`151`	`{`
	`152`	`+ using var _cliLock = WinGet.AcquireCliLock();`
`152`	`153`	`using Process process = new()`
`153`	`154`	`{`
`154`	`155`	`StartInfo = new ProcessStartInfo`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ IPingetPackageDetailsProvider packageDetailsProvider`
`40`	`40`
`41`	`41`	`public IReadOnlyList<Package> GetAvailableUpdates_UnSafe()`
`42`	`42`	`{`
	`43`	`+ using var _cliLock = WinGet.AcquireCliLock();`
`43`	`44`	`List<Package> Packages = [];`
`44`	`45`	`using Process p = new()`
`45`	`46`	`{`
`@@ -175,6 +176,7 @@ public IReadOnlyList<Package> GetAvailableUpdates_UnSafe()`
`175`	`176`
`176`	`177`	`public IReadOnlyList<Package> GetInstalledPackages_UnSafe()`
`177`	`178`	`{`
	`179`	`+ using var _cliLock = WinGet.AcquireCliLock();`
`178`	`180`	`List<Package> Packages = [];`
`179`	`181`	`using Process p = new()`
`180`	`182`	`{`
`@@ -307,6 +309,7 @@ public IReadOnlyList<Package> GetInstalledPackages_UnSafe()`
`307`	`309`
`308`	`310`	`public IReadOnlyList<Package> FindPackages_UnSafe(string query)`
`309`	`311`	`{`
	`312`	`+ using var _cliLock = WinGet.AcquireCliLock();`
`310`	`313`	`List<Package> Packages = [];`
`311`	`314`	`using Process p = new()`
`312`	`315`	`{`
`@@ -435,6 +438,7 @@ public void GetPackageDetails_UnSafe(IPackageDetails details)`
`435`	`438`
`436`	`439`	`public IReadOnlyList<string> GetInstallableVersions_Unsafe(IPackage package)`
`437`	`440`	`{`
	`441`	`+ using var _cliLock = WinGet.AcquireCliLock();`
`438`	`442`	`using Process p = new()`
`439`	`443`	`{`
`440`	`444`	`StartInfo = new ProcessStartInfo`
`@@ -498,6 +502,7 @@ public IReadOnlyList<string> GetInstallableVersions_Unsafe(IPackage package)`
`498`	`502`
`499`	`503`	`public IReadOnlyList<IManagerSource> GetSources_UnSafe()`
`500`	`504`	`{`
	`505`	`+ using var _cliLock = WinGet.AcquireCliLock();`
`501`	`506`	`List<IManagerSource> sources = [];`
`502`	`507`
`503`	`508`	`using Process p = new()`