Merge branch 'hotfix/0.27.2' into main

cake-build · May 15, 2018 · 3a3be40 · 3a3be40
2 parents 7e44aa0 + 6bb8522
commit 3a3be40
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,10 +1,14 @@
+### New in 0.27.2 (Released 2018/05/15)
+
+* 2137 Dependency loading errors with Cake 0.27.1 and Cake.Powershell 0.4.5
+* 2134 Assembly conflicts during compilation
+
 ### 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

diff --git a/src/Cake.NuGet/Cake.NuGet.csproj b/src/Cake.NuGet/Cake.NuGet.csproj
@@ -22,6 +22,7 @@
     <PackageReference Include="NuGet.Frameworks" Version="4.6.0" />
     <PackageReference Include="NuGet.Versioning" Version="4.6.0" />
     <PackageReference Include="NuGet.ProjectModel" Version="4.6.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
   <!-- .NET Core packages -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

diff --git a/src/Cake/Scripting/Roslyn/ScriptAssemblyResolver.cs b/src/Cake/Scripting/Roslyn/ScriptAssemblyResolver.cs
@@ -34,18 +34,25 @@ private Assembly AssemblyResolve(object sender, ResolveEventArgs args)
             if (_resolvedNames.Add(name.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)
+                try
                 {
-                    _log.Verbose($"Resolved by assembly {assembly.FullName}");
+                    var assembly = AppDomain.CurrentDomain.GetAssemblies()
+                        .FirstOrDefault(x => !x.IsDynamic && x.GetName().Name == name.Name)
+                        ?? Assembly.Load(name.Name);
+                    if (assembly != null)
+                    {
+                        _log.Verbose($"Resolved {name.Name} by assembly {assembly.FullName}");
+                    }
+                    else
+                    {
+                        _log.Verbose($"Assembly {name.Name} not resolved");
+                    }
+                    return assembly;
                 }
-                else
+                catch (Exception ex)
                 {
-                    _log.Verbose($"Assembly not resolved");
+                    _log.Verbose($"Exception while resolving assembly {name.Name}: {ex.Message}");
                 }
-                return assembly;
             }
             return null;
         }

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
@@ -10,7 +10,7 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("Cake")]
-[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: AssemblyVersion("0.27.2.0")]
+[assembly: AssemblyFileVersion("0.27.2.0")]
+[assembly: AssemblyInformationalVersion("0.27.2-beta.1+4.Branch.hotfix/0.27.2.Sha.edc1dcd43136c6340a7f7407a9907506336cb8af")]
 [assembly: AssemblyCopyright("Copyright (c) .NET Foundation and Contributors")]