Make sure right dotnet.exe tooling used for integration tests

cake-build · Apr 17, 2017 · 518468f · 518468f
1 parent 5965629
commit 518468f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/tests/integration/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cake b/tests/integration/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cake
@@ -4,6 +4,12 @@
 Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.Setup")
     .Does(() =>
 {
+    var dotnetExePath = Paths.TestRoot.CombineWithFilePath(Context.IsRunningOnUnix() ? ".dotnet/dotnet" : ".dotnet/dotnet.exe");
+    if (FileExists(dotnetExePath))
+    {
+        Context.Tools.RegisterFile(dotnetExePath);
+    }
+
     var sourcePath = Paths.Resources.Combine("./Cake.Common/Tools/DotNetCore");
     var targetPath = Paths.Temp.Combine("./Cake.Common/Tools/DotNetCore");
     EnsureDirectoryExist(targetPath.Combine("../").Collapse());

diff --git a/tests/integration/utilities/paths.cake b/tests/integration/utilities/paths.cake
@@ -1,10 +1,12 @@
 public static class Paths
 {
+    public static DirectoryPath TestRoot { get; private set; }
     public static DirectoryPath Temp { get; private set; }
     public static DirectoryPath Resources { get; private set; }
 
     public static void Initialize(ICakeContext context)
     {
+        TestRoot = new DirectoryPath("./").MakeAbsolute(context.Environment);
         Temp = new DirectoryPath("./temp").MakeAbsolute(context.Environment);
         Resources = new DirectoryPath("./resources").MakeAbsolute(context.Environment);
     }