Use prebuilt pinget package

Resolve bundled Avalonia launches back to the installation root so root-level tools and assets are found when UniGetUI.Avalonia.exe runs from the Avalonia subfolder.

Replace the nested UniGetUI.Pinget.Cli publish step with the Devolutions.Pinget.Cli.Rust package and remove the obsolete C# pinget project from the solution.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: mamoreau-devolutions

src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj

@@ -30,13 +30,11 @@
     </PropertyGroup>
 
     <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
-        <PingetCliProject>$(MSBuildThisFileDirectory)..\UniGetUI.Pinget.Cli\UniGetUI.Pinget.Cli.csproj</PingetCliProject>
         <PingetCliRuntimeIdentifier Condition="'$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier)</PingetCliRuntimeIdentifier>
         <PingetCliRuntimeIdentifier Condition="'$(PingetCliRuntimeIdentifier)' == '' and '$(Platform)' == 'arm64'">win-arm64</PingetCliRuntimeIdentifier>
         <PingetCliRuntimeIdentifier Condition="'$(PingetCliRuntimeIdentifier)' == ''">win-x64</PingetCliRuntimeIdentifier>
-        <PingetCliPublishDir>$(MSBuildProjectDirectory)\obj\$(Platform)\$(Configuration)\BundledPinget\$(PingetCliRuntimeIdentifier)\</PingetCliPublishDir>
-        <PingetCliExecutablePath>$(PingetCliPublishDir)pinget.exe</PingetCliExecutablePath>
-        <PingetCliNativeSqlitePath>$(PingetCliPublishDir)e_sqlite3.dll</PingetCliNativeSqlitePath>
+        <PingetCliPackageNativePath>$(PkgDevolutions_Pinget_Cli_Rust)\runtimes\$(PingetCliRuntimeIdentifier)\native</PingetCliPackageNativePath>
+        <PingetCliExecutablePath>$(PingetCliPackageNativePath)\pinget.exe</PingetCliExecutablePath>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(EnableAvaloniaDiagnostics)' == 'true'">
@@ -48,18 +46,13 @@
         AfterTargets="Build;Publish"
       Condition="'$(DesignTimeBuild)' != 'true' and '$(SkipBundledPingetCli)' != 'true' and $([MSBuild]::IsOSPlatform('Windows'))"
     >
-        <MSBuild
-            Projects="$(PingetCliProject)"
-            Targets="Restore;Publish"
-            Properties="Configuration=$(Configuration);Platform=$(Platform);TargetFramework=net10.0;RuntimeIdentifier=$(PingetCliRuntimeIdentifier);SelfContained=true;PublishSingleFile=true;PublishTrimmed=true;TrimMode=partial;JsonSerializerIsReflectionEnabledByDefault=true;PublishDir=$(PingetCliPublishDir);AppendRuntimeIdentifierToOutputPath=false"
+        <Error
+            Condition="!Exists('$(PingetCliExecutablePath)')"
+            Text="NuGet pinget executable not found at '$(PingetCliExecutablePath)'. Ensure package restore has completed for Devolutions.Pinget.Cli.Rust."
         />
         <ItemGroup>
             <PingetCliOutputFiles Include="$(PingetCliExecutablePath)" Condition="Exists('$(PingetCliExecutablePath)')" />
-            <PingetCliOutputFiles Include="$(PingetCliNativeSqlitePath)" Condition="Exists('$(PingetCliNativeSqlitePath)')" />
-            <PingetCliOutputFiles Include="$(TargetDir)runtimes\$(PingetCliRuntimeIdentifier)\native\e_sqlite3.dll" Condition="!Exists('$(PingetCliNativeSqlitePath)') and Exists('$(TargetDir)runtimes\$(PingetCliRuntimeIdentifier)\native\e_sqlite3.dll')" />
             <PingetCliPublishOutputFiles Include="$(PingetCliExecutablePath)" Condition="Exists('$(PingetCliExecutablePath)')" />
-            <PingetCliPublishOutputFiles Include="$(PingetCliNativeSqlitePath)" Condition="Exists('$(PingetCliNativeSqlitePath)')" />
-            <PingetCliPublishOutputFiles Include="$(PublishDir)runtimes\$(PingetCliRuntimeIdentifier)\native\e_sqlite3.dll" Condition="!Exists('$(PingetCliNativeSqlitePath)') and Exists('$(PublishDir)runtimes\$(PingetCliRuntimeIdentifier)\native\e_sqlite3.dll')" />
         </ItemGroup>
         <Copy
             SourceFiles="@(PingetCliOutputFiles)"
@@ -101,6 +94,7 @@
         <PackageReference Include="Octokit" Version="14.0.0" />
         <PackageReference Include="Avalonia.Controls.WebView" Version="12.0.0-rc1" />
         <PackageReference Include="Tmds.DBus.Protocol" Version="0.92.0" />
+        <PackageReference Include="Devolutions.Pinget.Cli.Rust" Version="0.4.0" GeneratePathProperty="true" ExcludeAssets="build;buildTransitive;native" />
     </ItemGroup>
 
     <ItemGroup>

src/UniGetUI.Core.Data.Tests/CoreTests.cs

@@ -39,6 +39,36 @@ public void CheckOtherAttributes()
             );
         }
 
+        [Fact]
+        public void ResolveInstallationDirectoryReturnsParentForBundledAvaloniaDirectory()
+        {
+            string installDirectory = Path.GetFullPath(Path.Join("install-root"));
+            string avaloniaDirectory = Path.Join(installDirectory, "Avalonia");
+            string classicExecutable = Path.Join(installDirectory, "UniGetUI.exe");
+
+            string resolvedDirectory = CoreData.ResolveInstallationDirectory(
+                avaloniaDirectory,
+                filePath => filePath == classicExecutable,
+                static _ => false
+            );
+
+            Assert.Equal(installDirectory, resolvedDirectory);
+        }
+
+        [Fact]
+        public void ResolveInstallationDirectoryKeepsStandaloneAvaloniaDirectory()
+        {
+            string avaloniaDirectory = Path.GetFullPath(Path.Join("standalone", "Avalonia"));
+
+            string resolvedDirectory = CoreData.ResolveInstallationDirectory(
+                avaloniaDirectory,
+                static _ => false,
+                static _ => false
+            );
+
+            Assert.Equal(avaloniaDirectory, resolvedDirectory);
+        }
+
         [Theory]
         [InlineData("3.3.7", "3.3.7")]
         [InlineData("2026.1.2", "v2026.1.2")]

src/UniGetUI.Core.Data/CoreData.cs

@@ -8,6 +8,9 @@ public static class CoreData
     {
         private const string GitHubReleasePageBaseUrl = "https://github.com/Devolutions/UniGetUI/releases/tag/";
         private const string GitHubReleaseApiBaseUrl = "https://api.github.com/repos/Devolutions/UniGetUI/releases/tags/";
+        private const string BundledModernAppDirectoryName = "Avalonia";
+        private const string ClassicExecutableName = "UniGetUI.exe";
+        private const string BundledPingetExecutableName = "pinget.exe";
 
         private static int? __code_page;
         public static int CODE_PAGE
@@ -326,22 +329,47 @@ public static string UniGetUIExecutableDirectory
         {
             get
             {
-                string? dir = AppContext.BaseDirectory.TrimEnd(
-                    Path.DirectorySeparatorChar,
-                    Path.AltDirectorySeparatorChar
-                );
-                if (dir is not null)
+                string dir = NormalizeDirectoryPath(AppContext.BaseDirectory);
+                if (!string.IsNullOrEmpty(dir))
                 {
-                    return dir;
+                    return ResolveInstallationDirectory(dir);
                 }
 
                 Logger.Error("AppContext.BaseDirectory returned an empty path");
 
-                return AppContext.BaseDirectory.TrimEnd(
-                    Path.DirectorySeparatorChar,
-                    Path.AltDirectorySeparatorChar
-                );
+                return ResolveInstallationDirectory(NormalizeDirectoryPath(AppContext.BaseDirectory));
+            }
+        }
+
+        public static string ResolveInstallationDirectory(
+            string executableDirectory,
+            Func<string, bool>? fileExists = null,
+            Func<string, bool>? directoryExists = null
+        )
+        {
+            fileExists ??= File.Exists;
+            directoryExists ??= Directory.Exists;
+
+            string normalizedDirectory = NormalizeDirectoryPath(executableDirectory);
+            if (!string.Equals(
+                    Path.GetFileName(normalizedDirectory),
+                    BundledModernAppDirectoryName,
+                    StringComparison.OrdinalIgnoreCase
+                ))
+            {
+                return normalizedDirectory;
+            }
+
+            string? parentDirectory = Path.GetDirectoryName(normalizedDirectory);
+            if (string.IsNullOrEmpty(parentDirectory))
+            {
+                return normalizedDirectory;
             }
+
+            parentDirectory = NormalizeDirectoryPath(parentDirectory);
+            return IsInstallRoot(parentDirectory, fileExists, directoryExists)
+                ? parentDirectory
+                : normalizedDirectory;
         }
 
         /// <summary>
@@ -598,6 +626,14 @@ private static string GetUserHomeDirectory()
             return Environment.GetEnvironmentVariable("HOME") ?? AppContext.BaseDirectory;
         }
 
+        private static string NormalizeDirectoryPath(string path)
+        {
+            return Path.GetFullPath(path).TrimEnd(
+                Path.DirectorySeparatorChar,
+                Path.AltDirectorySeparatorChar
+            );
+        }
+
         private static string NormalizeExecutablePath(string path)
         {
             if (
@@ -610,5 +646,18 @@ private static string NormalizeExecutablePath(string path)
 
             return path;
         }
+
+        private static bool IsInstallRoot(
+            string directory,
+            Func<string, bool> fileExists,
+            Func<string, bool> directoryExists
+        )
+        {
+            return fileExists(Path.Join(directory, ClassicExecutableName))
+                   || fileExists(Path.Join(directory, BundledPingetExecutableName))
+                   || fileExists(Path.Join(directory, "IntegrityTree.json"))
+                   || directoryExists(Path.Join(directory, "Assets", "Utilities"))
+                   || directoryExists(Path.Join(directory, "Assets", "Data"));
+        }
     }
 }

src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs

@@ -336,14 +336,19 @@ internal static string GetBundledPingetExecutablePath(
             Func<string, bool> fileExists
         )
         {
-            string rootPingetPath = Path.Join(executableDirectory, PingetExecutableName);
+            string installDirectory = CoreData.ResolveInstallationDirectory(
+                executableDirectory,
+                fileExists,
+                static _ => false
+            );
+            string rootPingetPath = Path.Join(installDirectory, PingetExecutableName);
             if (fileExists(rootPingetPath))
             {
                 return rootPingetPath;
             }
 
             string avaloniaPingetPath = Path.Join(
-                executableDirectory,
+                installDirectory,
                 "Avalonia",
                 PingetExecutableName
             );

src/UniGetUI.PackageEngine.Tests/WinGetManagerTests.cs

@@ -158,6 +158,21 @@ public void GetBundledPingetExecutablePathPrefersRootExecutable()
         Assert.Equal(rootPinget, path);
     }
 
+    [Fact]
+    public void GetBundledPingetExecutablePathFindsRootExecutableFromAvaloniaDirectory()
+    {
+        const string installDir = @"C:\Program Files\UniGetUI";
+        string avaloniaDir = Path.Join(installDir, "Avalonia");
+        string rootPinget = Path.Join(installDir, "pinget.exe");
+
+        string path = WinGet.GetBundledPingetExecutablePath(
+            avaloniaDir,
+            filePath => filePath == rootPinget
+        );
+
+        Assert.Equal(rootPinget, path);
+    }
+
     [Fact]
     public void GetBundledPingetExecutablePathFallsBackToAvaloniaExecutable()
     {