feat: cache installed runtime

feat: nuget package loader more logging
feat: nuget package loader external access to paths

Author: kai-melchior

Core.Common.Standard/Helpers/InstalledRuntime.cs

@@ -8,6 +8,7 @@ namespace KY.Core
 {
     public class InstalledRuntime
     {
+        private static InstalledRuntime[] cache;
         public string Type { get; }
         public Version Version { get; }
         public string Path { get; }
@@ -29,7 +30,7 @@ public static InstalledRuntime Parse(string value)
 
         public static InstalledRuntime[] Get()
         {
-            Process process = new Process();
+            Process process = new();
             process.StartInfo.FileName = "dotnet";
             process.StartInfo.Arguments = "--list-runtimes";
             process.StartInfo.UseShellExecute = false;
@@ -44,7 +45,11 @@ public static InstalledRuntime[] Get()
 
         public static InstalledRuntime[] GetCurrent()
         {
-            return Get().Where(x => x.Version == Environment.Version).ToArray();
+            if (cache == null)
+            {
+                cache = Get().Where(x => x.Version == Environment.Version).ToArray();
+            }
+            return cache;
         }
     }
-}
+}

Core.Common.Standard/Nuget/AssemblyCache.cs

@@ -4,6 +4,6 @@ namespace KY.Core;
 
 public interface IAssemblyCache
 {
-    Dictionary<string, string> Global { get; set; }
-    Dictionary<string, string> Local { get; set; }
+    void Add(string name, string location);
+    string Resolve(string name);
 }

Core.Common.Standard/Nuget/NugetAssemblyLocator.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -209,6 +210,8 @@ private Assembly TryFind(AssemblyInfo info, params string[] chunks)
             if (FileSystem.FileExists(file))
             {
                 Logger.Trace($"Assembly found in: {file}");
+                Stopwatch stopwatch = new();
+                stopwatch.Start();
                 try
                 {
                     return AssemblyLoadContext.Default?.LoadFromAssemblyPath(file);
@@ -226,6 +229,11 @@ private Assembly TryFind(AssemblyInfo info, params string[] chunks)
                     AssemblyLoadContext.GetLoadContext(assembly)?.Unload();
                     return AssemblyLoadContext.Default?.LoadFromAssemblyPath(file);
                 }
+                finally
+                {
+                    stopwatch.Stop();
+                    Logger.Trace($"Assembly {info.Name} loaded in {(stopwatch.ElapsedMilliseconds >= 1 ? stopwatch.ElapsedMilliseconds.ToString() : "<1")} ms");
+                }
             }
             else
             {

Core.Common.Standard/Nuget/NugetPackageDependencyLoader.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -10,6 +11,9 @@ namespace KY.Core
 {
     public static class NugetPackageDependencyLoader
     {
+        public static readonly string WindowsNugetCachePath = FileSystem.Combine(Environment.ExpandEnvironmentVariables("%USERPROFILE%"), ".nuget", "packages");
+        public static readonly string WindowsNugetFallbackPath = FileSystem.Combine(Environment.ExpandEnvironmentVariables("%PROGRAMFILES%"), "dotnet", "sdk", "NuGetFallbackFolder");
+        public static readonly string LinuxNugetCachePath = FileSystem.Combine(Environment.GetEnvironmentVariable("HOME"), ".nuget", "packages");
         private static bool isActivated;
         private static bool isRuntimeLocationsAdded;
         private static IAssemblyCache cache;
@@ -26,18 +30,19 @@ static NugetPackageDependencyLoader()
                         };
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                Locations.Add(new SearchLocation(FileSystem.Combine(Environment.ExpandEnvironmentVariables("%USERPROFILE%"), ".nuget", "packages")).SearchOnlyByVersion());
-                Locations.Add(new SearchLocation(FileSystem.Combine(Environment.ExpandEnvironmentVariables("%PROGRAMFILES%"), "dotnet", "sdk", "NuGetFallbackFolder")).SearchOnlyByVersion());
-                Locations.Add(new SearchLocation(FileSystem.Combine(Environment.ExpandEnvironmentVariables("%PROGRAMFILES%"), "dotnet", "sdk", "NuGetFallbackFolder")).SearchOnlyLocal());
+                Locations.Add(new SearchLocation(WindowsNugetCachePath).SearchOnlyByVersion());
+                Locations.Add(new SearchLocation(WindowsNugetFallbackPath).SearchOnlyByVersion());
+                Locations.Add(new SearchLocation(WindowsNugetFallbackPath).SearchOnlyLocal());
             }
             else
             {
-                Locations.Add(new SearchLocation(FileSystem.Combine(Environment.GetEnvironmentVariable("HOME"), ".nuget", "packages")).SearchOnlyByVersion());
+                Locations.Add(new SearchLocation(LinuxNugetCachePath).SearchOnlyByVersion());
             }
         }
 
-        public static void Activate(IAssemblyCache assemblyCache)
+        public static void Activate(IAssemblyCache assemblyCache = null)
         {
+            cache = assemblyCache ?? cache;
             if (isActivated)
             {
                 return;
@@ -55,17 +60,21 @@ public static void Deactivate()
 
         private static Assembly Resolve(object sender, ResolveEventArgs args)
         {
-            if (cache?.Local != null && cache.Local.TryGetValue(args.Name, out string localPath) && FileSystem.FileExists(localPath))
+            string assemblyPath = cache?.Resolve(args.Name);
+            if (assemblyPath != null && FileSystem.FileExists(assemblyPath))
             {
-                return Assembly.Load(localPath);
+                Stopwatch stopwatch = new();
+                stopwatch.Start();
+                Assembly cachedAssembly = AssemblyLoadContext.Default?.LoadFromAssemblyPath(assemblyPath);
+                stopwatch.Stop();
+                Logger.Trace($"Assembly {args.Name.Split(',').FirstOrDefault()} loaded in {(stopwatch.ElapsedMilliseconds >= 1 ? stopwatch.ElapsedMilliseconds.ToString() : "<1")} ms");
+                return cachedAssembly;
             }
-            if (cache?.Global != null && cache.Global.TryGetValue(args.Name, out string globalPath) && FileSystem.FileExists(globalPath))
-            {
-                return Assembly.Load(globalPath);
-            }
-            return CreateLocator()
-                   .AddLocation(0, args.RequestingAssembly)
-                   .Locate(args.Name, null, false, true);
+            Assembly assembly = CreateLocator()
+                                .AddLocation(0, args.RequestingAssembly)
+                                .Locate(args.Name, null, false, true);
+            cache?.Add(args.Name, assembly.Location);
+            return assembly;
         }
 
         public static NugetAssemblyLocator CreateLocator()