Merge pull request #29 from IceCryptonym/main

Fix designer DLL not found when NUGET_PACKAGES is set
kuiperzone · Jul 22, 2023 · 81032e6 · 81032e6
2 parents 9d3c5d9 + 6430e1d
commit 81032e6
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/AvantGarde/Loading/RemoteLoader.cs b/AvantGarde/Loading/RemoteLoader.cs
@@ -158,10 +158,15 @@ public static PathItem FindDesignerHost(string? version)
             // ~/.nuget/packages/avalonia/<avalonia-version>/tools/netcoreapp2.0/designer/Avalonia.Designer.HostApp.dll
             if (!string.IsNullOrWhiteSpace(version))
             {
-                string src = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+                string? src = Environment.GetEnvironmentVariable("NUGET_PACKAGES");
+
+                if (string.IsNullOrEmpty(src))
+                {
+                    src = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+                    src = Path.Combine(src, ".nuget");
+                    src = Path.Combine(src, "packages");
+                }
 
-                src = Path.Combine(src, ".nuget");
-                src = Path.Combine(src, "packages");
                 src = Path.Combine(src, "avalonia");
                 src = Path.Combine(src, version);
                 src = Path.Combine(src, "tools");