Merge branch 'hotfix/0.6.2'

* hotfix/0.6.2: (GH-129) When using .NET Global tool, resolve Cake.dll to netcoreapp3.1
cake-build · Mar 8, 2021 · 991ded1 · 991ded1
2 parents d39d3b8 + c1e22a1
commit 991ded1
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)
                 {