Merge branch 'hotfix/0.27.1' into main

* hotfix/0.27.1:
  (build) Updated version and release notes
  Prevent recursion in the assembly resolver (#2132)

Author: gep13

ReleaseNotes.md

@@ -1,5 +1,10 @@
+### New in 0.27.1 (Released 2018/04/21)
+
+* 2132 Problems with loading certain assemblies (0.27.0)
+
 ### New in 0.27.0 (Released 2018/04/19)
 
+
 * 2078 Support expand environment variables in script pre-processor directives
 * 2047 Specify version during Nuget Updating
 * 2005 Add entries for Setup/Teardown in report

src/Cake/Scripting/Roslyn/ScriptAssemblyResolver.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Cake.Core.Diagnostics;
@@ -12,6 +13,7 @@ namespace Cake.Scripting.Roslyn
     internal sealed class ScriptAssemblyResolver : IDisposable
     {
         private readonly ICakeLog _log;
+        private readonly HashSet<string> _resolvedNames = new HashSet<string>();
 
         public ScriptAssemblyResolver(ICakeLog log)
         {
@@ -27,19 +29,25 @@ public void Dispose()
         private Assembly AssemblyResolve(object sender, ResolveEventArgs args)
         {
             var name = new AssemblyName(args.Name);
-            _log.Verbose($"Resolving assembly {args.Name}");
-            var assembly = AppDomain.CurrentDomain.GetAssemblies()
-                .FirstOrDefault(x => !x.IsDynamic && x.GetName().Name == name.Name)
-                ?? Assembly.Load(name.Name);
-            if (assembly != null)
-            {
-                _log.Verbose($"Resolved by assembly {assembly.FullName}");
-            }
-            else
+
+            // Prevent recursion from the Assembly.Load() call inside
+            if (_resolvedNames.Add(name.Name))
             {
-                _log.Verbose($"Assembly not resolved");
+                _log.Verbose($"Resolving assembly {args.Name}");
+                var assembly = AppDomain.CurrentDomain.GetAssemblies()
+                    .FirstOrDefault(x => !x.IsDynamic && x.GetName().Name == name.Name)
+                    ?? Assembly.Load(name.Name);
+                if (assembly != null)
+                {
+                    _log.Verbose($"Resolved by assembly {assembly.FullName}");
+                }
+                else
+                {
+                    _log.Verbose($"Assembly not resolved");
+                }
+                return assembly;
             }
-            return assembly;
+            return null;
         }
     }
 }

src/SolutionInfo.cs

@@ -10,7 +10,7 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("Cake")]
-[assembly: AssemblyVersion("0.27.0.0")]
-[assembly: AssemblyFileVersion("0.27.0.0")]
-[assembly: AssemblyInformationalVersion("0.27.0-beta.1+0.Branch.release/0.27.0.Sha.67466468cec2e01e01ffa8d959aac168bb60762b")]
+[assembly: AssemblyVersion("0.27.1.0")]
+[assembly: AssemblyFileVersion("0.27.1.0")]
+[assembly: AssemblyInformationalVersion("0.27.1-beta.1+0.Branch.release/0.27.1.Sha.645ee5a6ca687c8da4d1ccba4a866101ae546022")]
 [assembly: AssemblyCopyright("Copyright (c) .NET Foundation and Contributors")]