(cake-buildGH-3823) Only load valid versioned assmblies

* fixes cake-build#3823
devlead · Apr 2, 2022 · 64e9bfa · 64e9bfa
1 parent a5f2378
commit 64e9bfa
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/Cake/Infrastructure/Scripting/ReferenceAssemblyResolver.cs b/src/Cake/Infrastructure/Scripting/ReferenceAssemblyResolver.cs
@@ -9,6 +9,7 @@ namespace Cake.Infrastructure.Scripting
 {
     public sealed class ReferenceAssemblyResolver : IReferenceAssemblyResolver
     {
+        private static readonly Version VersionZero = new Version(0, 0, 0, 0);
         private readonly ICakeLog _log;
 
         public ReferenceAssemblyResolver(ICakeLog log)
@@ -36,7 +37,7 @@ IEnumerable<Assembly> TryGetReferenceAssemblies()
                     }
                     catch (Exception ex)
                     {
-                        _log.Debug(log => log("Failed to load {0}\r\n{1}", reference.FilePath, ex));
+                        _log.Debug(log => log("Failed to load {0}\r\nException: {1}", reference.FilePath, ex));
                         continue;
                     }
 
@@ -49,14 +50,20 @@ IEnumerable<Assembly> TryGetReferenceAssemblies()
 
                     foreach (var assemblyRefName in assembly.GetReferencedAssemblies())
                     {
+                        if (assemblyRefName == null ||
+                            assemblyRefName.Version == VersionZero)
+                        {
+                            continue;
+                        }
+
                         Assembly assemblyRef;
                         try
                         {
                             assemblyRef = Assembly.Load(assemblyRefName);
                         }
                         catch (Exception ex)
                         {
-                            _log.Debug(log => log("Failed to load {0}\r\n{1}", reference.FilePath, ex));
+                            _log.Debug(log => log("Failed to load {0}\r\nReference: {1}\r\n Exception: {2}", assemblyRefName, assembly, ex));
                             continue;
                         }
 

diff --git a/src/Cake/Infrastructure/Scripting/ScriptAssemblyResolver.cs b/src/Cake/Infrastructure/Scripting/ScriptAssemblyResolver.cs
@@ -15,6 +15,7 @@ namespace Cake.Infrastructure.Scripting
     public sealed class ScriptAssemblyResolver : IDisposable
     {
         private const string AssemblyResourcesExtension = ".resources";
+        private static readonly Version VersionZero = new Version(0, 0, 0, 0);
 
         private readonly ICakeEnvironment _environment;
         private readonly ICakeLog _log;
@@ -49,6 +50,11 @@ private Assembly AssemblyResolve(object sender, ResolveEventArgs args)
             var shortName = assemblyName.Name;
             var version = assemblyName.Version;
 
+            if (version == VersionZero)
+            {
+                return null;
+            }
+
             // Preventing indirect recursive calls via Assembly.Load()
             if (!_resolvedNames.Add(shortName + version))
             {
@@ -65,6 +71,11 @@ private Assembly AssemblyResolve(AssemblyName assemblyName)
             var shortName = assemblyName.Name;
             var version = assemblyName.Version;
 
+            if (version == VersionZero)
+            {
+                return null;
+            }
+
             Assembly assembly = null;
             try
             {