浏览代码

Fixed linux build

Nikita Tsukanov 8 年之前
父节点
当前提交
f3394b881f
共有 2 个文件被更改,包括 6 次插入8 次删除
  1. 5 7
      build.cake
  2. 1 1
      packages.cake

+ 5 - 7
build.cake

@@ -157,7 +157,7 @@ Task("Build")
     }
     }
 });
 });
 
 
-void RunCoreTest(string dir)
+void RunCoreTest(string dir, Parameters parameters)
 {
 {
     DotNetCoreRestore(dir);
     DotNetCoreRestore(dir);
     var frameworks = new List<string>{"netcoreapp1.1"};
     var frameworks = new List<string>{"netcoreapp1.1"};
@@ -171,14 +171,12 @@ void RunCoreTest(string dir)
     }
     }
 }
 }
 
 
-void RunDotNetCoreTest()
-{
-    RunCoreTest("./tests/Avalonia.Base.UnitTests");
-}
 
 
 Task("Run-Net-Core-Unit-Tests")
 Task("Run-Net-Core-Unit-Tests")
     .IsDependentOn("Clean")
     .IsDependentOn("Clean")
-    .Does(() => RunDotNetCoreTest());
+    .Does(() => {
+        RunCoreTest("./tests/Avalonia.Base.UnitTests", parameters);
+    });
 
 
 Task("Run-Unit-Tests")
 Task("Run-Unit-Tests")
     .IsDependentOn("Run-Net-Core-Unit-Tests")
     .IsDependentOn("Run-Net-Core-Unit-Tests")
@@ -371,7 +369,7 @@ Task("AppVeyor")
   .IsDependentOn("Publish-NuGet");
   .IsDependentOn("Publish-NuGet");
 
 
 Task("Travis")
 Task("Travis")
-  .IsDependentOn("Run-Unit-Tests");
+  .IsDependentOn("Run-Net-Core-Unit-Tests");
 
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 // EXECUTE
 // EXECUTE

+ 1 - 1
packages.cake

@@ -91,7 +91,7 @@ public class Packages
         context.Information("Package: SharpDX.DXGI, version: {0}", SharpDXDXGIVersion);
         context.Information("Package: SharpDX.DXGI, version: {0}", SharpDXDXGIVersion);
 
 
         var nugetPackagesDir = System.Environment.GetEnvironmentVariable("NUGET_HOME")
         var nugetPackagesDir = System.Environment.GetEnvironmentVariable("NUGET_HOME")
-            ?? System.IO.Path.Combine(System.Environment.GetEnvironmentVariable("USERPROFILE"), ".nuget");
+            ?? System.IO.Path.Combine(System.Environment.GetEnvironmentVariable("USERPROFILE") ?? System.Environment.GetEnvironmentVariable("HOME"), ".nuget");
         
         
         NugetPackagesDir = System.IO.Path.Combine(nugetPackagesDir, "packages");
         NugetPackagesDir = System.IO.Path.Combine(nugetPackagesDir, "packages");