(cake-buildGH-129) When using .NET Global tool, resolve Cake.dll to n…

…etcoreapp3.1 Bakery currently needs Cake.Core and Cake.Common targeting netstandard2.0 only cake-build#129 (comment)
augustoproiete-forks · Mar 7, 2021 · 9cf5942 · 9cf5942
1 parent 45f37b1
commit 9cf5942
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Cake.Scripting/CodeGen/CakeScriptGenerator.cs b/src/Cake.Scripting/CodeGen/CakeScriptGenerator.cs
@@ -264,8 +264,8 @@ private DirectoryPath GetCakePath(DirectoryPath toolPath)
                 .FirstOrDefault(x => _fileSystem.Exist(x))?.GetDirectory();
             if (dotnetCakePath != null)
             {
-                pattern = string.Concat(dotnetCakePath.FullPath, "/.store/**/Cake.dll");
-                var cakeDllPath = _globber.GetFiles(pattern).FirstOrDefault();
+                pattern = string.Concat(dotnetCakePath.FullPath, "/.store/**/^{netcoreapp3.1,netcoreapp2.1}/**/Cake.dll");
+                var cakeDllPath = _globber.GetFiles(pattern).LastOrDefault();
 
                 if (cakeDllPath != null)
                 {