Checkpointing, NuGet restore is now working properly from Cake

nunit · Nov 7, 2016 · 73078f3 · 73078f3
1 parent 4bd9c01
commit 73078f3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/build.cake b/build.cake
@@ -67,6 +67,14 @@ var ZIP_PACKAGE = PACKAGE_DIR + "NUnit-" + packageVersion + ".zip";
 
 bool isDotNetCoreInstalled;
 
+var packages = new string[]{
+    "src/NUnitFramework/framework/packages.config",
+    "src/NUnitFramework/nunitlite/packages.config",
+    "src/NUnitFramework/nunitlite.tests/packages.config",
+    "src/NUnitFramework/testdata/packages.config",
+    "src/NUnitFramework/tests/packages.config",
+};
+
 ///////////////////////////////////////////////////////////////////////////////
 // SETUP / TEARDOWN
 ///////////////////////////////////////////////////////////////////////////////
@@ -98,10 +106,22 @@ Task("InitializeBuild")
     .Description("Initializes the build")
     .Does(() =>
     {
-        NuGetRestore(SOLUTION_FILE, new NuGetRestoreSettings()
+        foreach(var package in packages)
         {
-            Source = PACKAGE_SOURCE
-        });
+            NuGetRestore(package, new NuGetRestoreSettings
+            {
+                PackagesDirectory = "./packages/",
+                Source = PACKAGE_SOURCE
+            });
+        }
+
+        if(isDotNetCoreInstalled)
+        {
+            StartProcess("dotnet", new ProcessSettings
+            {
+                Arguments = "restore"
+            });
+        }
 
         if (isAppveyor)
         {
@@ -556,7 +576,7 @@ void RunDotnetCoreTests(FilePath exePath, DirectoryPath workingDir, string frame
 void RunDotnetCoreTests(FilePath exePath, DirectoryPath workingDir, string arguments, string framework, ref List<string> errorDetail)
 {
     int rc = StartProcess(
-        "dotnet.exe",
+        "dotnet",
         new ProcessSettings()
         {
             Arguments = exePath + " " + arguments,

diff --git a/packages/Mono.Cecil.0.9.6.1/Mono.Cecil.0.9.6.1.nupkg b/packages/Mono.Cecil.0.9.6.1/Mono.Cecil.0.9.6.1.nupkg
diff --git a/packages/Mono.Cecil.0.9.6.1/lib/net20/Mono.Cecil.dll b/packages/Mono.Cecil.0.9.6.1/lib/net20/Mono.Cecil.dll
diff --git a/src/NUnitFramework/nunitlite-runner/nunitlite-runner-netstandard.csproj b/src/NUnitFramework/nunitlite-runner/nunitlite-runner-netstandard.csproj
@@ -23,6 +23,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\bin\Debug\netstandard\</OutputPath>
+    <StartArguments>..\..\..\bin\Debug\netstandard\nunitlite-runner.exe nunit.framework.tests.dll</StartArguments>
     <DefineConstants>TRACE;DEBUG;PORTABLE;NETCOREAPP1_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -35,6 +36,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\bin\Release\netstandard\</OutputPath>
+    <StartArguments>..\..\..\bin\Release\netstandard\nunitlite-runner.exe nunit.framework.tests.dll</StartArguments>
     <DefineConstants>TRACE;PORTABLE;NETCOREAPP1_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>