From a7666df5a3cce1e32c382d29ac944038d2055f82 Mon Sep 17 00:00:00 2001 From: Dave Glick Date: Tue, 24 Apr 2018 14:24:42 -0400 Subject: [PATCH 1/3] Handles exceptions from the runtime assembly resolver (#2137) --- .../Roslyn/ScriptAssemblyResolver.cs | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/Cake/Scripting/Roslyn/ScriptAssemblyResolver.cs b/src/Cake/Scripting/Roslyn/ScriptAssemblyResolver.cs index 0a695f5afa..726b5d0c2d 100644 --- 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; } From 9f60b4519f1079936caadf7beac41d1c95653382 Mon Sep 17 00:00:00 2001 From: Dave Glick Date: Tue, 24 Apr 2018 14:32:22 -0400 Subject: [PATCH 2/3] References latest Newtonsoft.Json from Cake.NuGet (#2134) --- src/Cake.NuGet/Cake.NuGet.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Cake.NuGet/Cake.NuGet.csproj b/src/Cake.NuGet/Cake.NuGet.csproj index b7c5eaaaf0..4ad438ad05 100644 --- a/src/Cake.NuGet/Cake.NuGet.csproj +++ b/src/Cake.NuGet/Cake.NuGet.csproj @@ -22,6 +22,7 @@ + From 6bb8522954fa9625f0a3d25377cdd916c98d0e7d Mon Sep 17 00:00:00 2001 From: Patrik Svensson Date: Tue, 15 May 2018 23:14:24 +0200 Subject: [PATCH 3/3] (build) Updated version and release notes --- ReleaseNotes.md | 6 +++++- src/SolutionInfo.cs | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index d5c30f013a..61a940dd87 100644 --- 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/SolutionInfo.cs b/src/SolutionInfo.cs index 06f0e7ef73..66e49abd57 100644 --- 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")]