NugetAssemblyLocator better logging

Author: ky-one

Core.Common.Standard/KY.Core.Common.Standard.csproj

@@ -4,11 +4,11 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>KY.Core</RootNamespace>
     <AssemblyName>KY.Core.Common</AssemblyName>
-    <Version>4.18.0</Version>
+    <Version>4.19.0</Version>
     <Authors>KY-Programming</Authors>
     <Company>KY-Programmingp</Company>
     <Product>KY.Core</Product>
-    <Copyright>2020 - KY-Programming</Copyright>
+    <Copyright>2021 - KY-Programming</Copyright>
     <Description>KY.Core.Common for .net Standard
 Contains Dependency Injection, Module Loader and some helper classes</Description>
     <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>

Core.Common.Standard/Nuget/NugetAssemblyLocator.cs

@@ -13,11 +13,11 @@ public class NugetAssemblyLocator
     {
         private const string PackageDirectoryName = "\\packages\\";
 
+        private readonly List<string> resolvedAssemblies = new List<string>();
+
         public static List<string> FrameworkFolders { get; } = new List<string>(new[] { "netstandard*", "netcore*", "net5*", "net4*" });
         public static List<string> NugetFolders { get; } = new List<string>(new[] { "lib", "ref" });
 
-        private readonly List<string> resolvedAssemblies = new List<string>();
-
         public List<SearchLocation> Locations { get; }
         public bool SkipResourceAssemblies { get; set; }
         public bool SkipSystemAssemblies { get; set; }
@@ -53,8 +53,13 @@ public Assembly Locate(string search, bool loadDependencies)
         public Assembly Locate(string search, Version defaultVersion = null, bool loadDependencies = false, bool forceSearchOnDisk = false)
         {
             AssemblyInfo info = (this.GetAssemblyInfoFromLongName(search) ?? this.GetAssemblyInfoFromPath(search, defaultVersion)) ?? new AssemblyInfo(search, defaultVersion);
-            if (this.SkipResourceAssemblies && info.IsResource || this.SkipSystemAssemblies && info.Name.StartsWith("System.") || info.Name == "netstandard" || info.Name == "mscorlib")
+            if (this.SkipResourceAssemblies && info.IsResource || info.Name == "netstandard" || info.Name == "mscorlib")
+            {
+                return null;
+            }
+            if(this.SkipSystemAssemblies && info.Name.StartsWith("System."))
             {
+                Logger.Trace($"Search for {info.Name} skipped. Set {nameof(this.SkipSystemAssemblies)} to false to disable this behaviour.");
                 return null;
             }
             Assembly assembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(x => x.GetName().Name == info.Name);
@@ -73,15 +78,15 @@ public Assembly Locate(string search, Version defaultVersion = null, bool loadDe
             }
             if (!forceSearchOnDisk && info.Name.StartsWith("System."))
             {
-                    assembly = AssemblyLoadContext.Default.LoadFromAssemblyName(new AssemblyName(search));
-                    if (assembly != null)
+                assembly = AssemblyLoadContext.Default.LoadFromAssemblyName(new AssemblyName(search));
+                if (assembly != null)
+                {
+                    if (loadDependencies)
                     {
-                        if (loadDependencies)
-                        {
-                            this.ResolveDependencies(assembly);
-                        }
-                        return assembly;
+                        this.ResolveDependencies(assembly);
                     }
+                    return assembly;
+                }
             }
             Logger.Trace($"Try to find assembly {info}...");
             List<SearchLocation> locations = this.CleanLocations(this.Locations);
@@ -109,21 +114,29 @@ public Assembly Locate(string search, Version defaultVersion = null, bool loadDe
             List<PossibleLocation> possibleLocations = new List<PossibleLocation>();
             foreach (SearchLocation location in locations.Where(x => x.SearchByVersion))
             {
+                List<PossibleLocation> foundLocations = new List<PossibleLocation>();
                 DirectoryInfo packageDirectory = FileSystem.GetDirectoryInfo(location.Path, info.Name);
                 if (packageDirectory.Exists)
                 {
                     packageDirectory.GetDirectories()
                                     .Select(x => new PossibleLocation(x.FullName, this.Parse(x.Name)))
                                     .Where(x => x.Version != null)
-                                    .ForEach(possibleLocations.Add);
+                                    .ForEach(foundLocations.Add);
                 }
                 FileSystem.GetDirectoryInfos(location.Path, info.Name + "*")
                           .Select(x => new PossibleLocation(x.FullName, this.Parse(Regex.Replace(x.Name, Regex.Escape(info.Name), string.Empty, RegexOptions.IgnoreCase).Trim("."))))
                           .Where(x => x.Version != null)
-                          .ForEach(possibleLocations.Add);
+                          .ForEach(foundLocations.Add);
+                if (foundLocations.Count > 0)
+                {
+                    foundLocations.ForEach(x => Logger.Trace($"Assembly found in: {x.Path}"));
+                }
+                else
+                {
+                    Logger.Trace($"Assembly not found in: {location.Path}");
+                }
             }
             possibleLocations = possibleLocations.OrderByDescending(x => x.Version).ToList();
-            possibleLocations.ForEach(x => Logger.Trace($"Assembly found in: {x.Path}"));
             PossibleLocation possibleLocation = possibleLocations.FirstOrDefault(x => info.Version == null || x.Version.ToString() == info.Version.ToString())
                                                 ?? possibleLocations.FirstOrDefault(x => x.Version.ToString(3) == info.Version.ToString(3))
                                                 ?? possibleLocations.FirstOrDefault(x => x.Version.ToString(2) == info.Version.ToString(2))
@@ -201,7 +214,7 @@ private Assembly TryFind(AssemblyInfo info, params string[] chunks)
                 }
                 catch (TargetInvocationException)
                 {
-                    if (DoNotTryToLoadDependenciesOnError)
+                    if (this.DoNotTryToLoadDependenciesOnError)
                     {
                         throw;
                     }

Core.Common.Standard/Nuget/NugetPackageDependencyLoader.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using KY.Core.DataAccess;
 using KY.Core.Nuget;
@@ -27,13 +25,13 @@ 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(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());
             }
             else
             {
-                Locations.Add(new SearchLocation(FileSystem.Combine(Environment.GetEnvironmentVariable("HOME"), ".nuget\\packages")).SearchOnlyByVersion());
+                Locations.Add(new SearchLocation(FileSystem.Combine(Environment.GetEnvironmentVariable("HOME"), ".nuget", "packages")).SearchOnlyByVersion());
             }
         }