#20 - Tidy up. Update command line scripts. Fix running benchmarks.

Ocelot.sln

@@ -9,21 +9,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
-		build-and-run-tests.bat = build-and-run-tests.bat
+		build-and-run-tests.ps1 = build-and-run-tests.ps1
-		build.bat = build.bat
 		build.cake = build.cake
 		build.ps1 = build.ps1
 		configuration-explanation.txt = configuration-explanation.txt
 		global.json = global.json
 		LICENSE.md = LICENSE.md
 		Ocelot.nuspec = Ocelot.nuspec
-		push-to-nuget.bat = push-to-nuget.bat
 		README.md = README.md
 		release.ps1 = release.ps1
-		run-acceptance-tests.bat = run-acceptance-tests.bat
+		run-acceptance-tests.ps1 = run-acceptance-tests.ps1
 		run-benchmarks.bat = run-benchmarks.bat
-		run-tests.bat = run-tests.bat
+		run-benchmarks.ps1 = run-benchmarks.ps1
-		run-unit-tests.bat = run-unit-tests.bat
+		run-unit-tests.ps1 = run-unit-tests.ps1
 	EndProjectSection
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ocelot", "src\Ocelot\Ocelot.xproj", "{D6DF4206-0DBA-41D8-884D-C3E08290FDBB}"

build-and-release-unstable.ps1

@@ -0,0 +1 @@
+./build.ps1 -target build-full

build-and-run-tests.bat

@@ -1,2 +0,0 @@
-./run-tests.bat
-./build.bat

build-and-run-tests.ps1

@@ -0,0 +1 @@
+./build.ps1 -target RunTests

build.bat

@@ -1,8 +0,0 @@
-echo -------------------------
-
-echo Building Ocelot
-dotnet restore src/Ocelot
-dotnet build src/Ocelot -c Release
-
-
-

build.cake

@@ -2,21 +2,15 @@
 #tool "nuget:?package=OpenCover"
 #tool "nuget:?package=ReportGenerator"
 #tool "nuget:?package=GitReleaseNotes"
-#addin nuget:?package=Cake.DoInDirectory
+#addin "nuget:?package=Cake.DoInDirectory"
-#addin "Cake.Json"
+#addin "nuget:?package=Cake.Json"
 
-var target = Argument("target", "Default");
+// compile
-var artifactsDir = Directory("artifacts");
-
-Information("target is " +target);
-
-// versioning
-var committedVersion = "0.0.0-dev";
-var buildVersion = committedVersion;
-
-//compile
 var compileConfig = Argument("configuration", "Release");
-Information("Build configuration is " + compileConfig);	
+var projectJson = "./src/Ocelot/project.json";
+
+// build artifacts
+var artifactsDir = Directory("artifacts");
 
 // unit testing
 var artifactsForUnitTestsDir = artifactsDir + Directory("UnitTests");
@@ -31,31 +25,41 @@ var artifactsForBenchmarkTestsDir = artifactsDir + Directory("BenchmarkTests");
 var benchmarkTestAssemblies = @"./test/Ocelot.Benchmarks";
 
 // packaging
-var projectJson = "./src/Ocelot/project.json";
 var packagesDir = artifactsDir + Directory("Packages");
 var releaseNotesFile = packagesDir + File("releasenotes.md");
 var artifactsFile = packagesDir + File("artifacts.txt");
 
-//unstable releases
+// unstable releases
-var publishUnstableBuilds = true;
 var nugetFeedUnstableKey = EnvironmentVariable("nuget-apikey-unstable");
 var nugetFeedUnstableUploadUrl = "https://www.myget.org/F/ocelot-unstable/api/v2/package";
 var nugetFeedUnstableSymbolsUploadUrl = "https://www.myget.org/F/ocelot-unstable/symbols/api/v2/package";
 
-//stable releases
+// stable releases
 var tagsUrl = "https://api.github.com/repos/binarymash/ocelot/releases/tags/";
-var releaseTag = "";
 var nugetFeedStableKey = EnvironmentVariable("nuget-apikey-stable");
 var nugetFeedStableUploadUrl = "https://www.myget.org/F/ocelot-stable/api/v2/package";
 var nugetFeedStableSymbolsUploadUrl = "https://www.myget.org/F/ocelot-stable/symbols/api/v2/package";
 
+// internal build variables - don't change these.
+var releaseTag = "";
+var buildVersion = committedVersion;
+var committedVersion = "0.0.0-dev";
+
+var target = Argument("target", "Default");
+
+Information("target is " +target);
+Information("Build configuration is " + compileConfig);	
+
 Task("Default")
+	.IsDependentOn("Build");
+
+Task("Build")
 	.IsDependentOn("RunTests")
-	.IsDependentOn("CreatePackages")
+	.IsDependentOn("CreatePackages");
-	.IsDependentOn("ReleasePackagesToUnstableFeed")
+
-	.Does(() =>
+Task("BuildAndReleaseUnstable")
-	{
+	.IsDependentOn("Build")
-	});
+	.IsDependentOn("ReleasePackagesToUnstableFeed");
 	
 Task("Clean")
 	.Does(() =>
@@ -138,7 +142,7 @@ Task("RunBenchmarkTests")
 
 		DoInDirectory(benchmarkTestAssemblies, () =>
 		{
-			DotNetCoreRun(".", "--args", buildSettings);
+			DotNetCoreRun(".", "", buildSettings);
 		});
 	});
 

run-acceptance-tests.bat

@@ -1,8 +0,0 @@
-echo Running Ocelot.AcceptanceTests
-cd test/Ocelot.AcceptanceTests/
-dotnet restore 
-dotnet test 
-cd ../../
-
-echo Restoring Ocelot.ManualTest
-dotnet restore test/Ocelot.ManualTest/

run-acceptance-tests.ps1

@@ -0,0 +1 @@
+./build -target RunAcceptanceTests

run-benchmarks.bat

@@ -1,15 +0,0 @@
-echo -------------------------
-
-echo Running Ocelot.Benchmarks
-
-cd test/Ocelot.Benchmarks
-
-dotnet restore 
-
-dotnet run 
-
-cd ../../
-
-
-
-

run-benchmarks.ps1

@@ -0,0 +1 @@
+./build.ps1 -target RunBenchmarkTests

run-tests.bat

@@ -1,2 +0,0 @@
-./run-unit-tests.bat
-./run-acceptance-tests.bat

run-unit-tests.bat

@@ -1,8 +0,0 @@
-echo -------------------------
-
-echo Restoring Ocelot
-dotnet restore src/Ocelot
-
-echo Running Ocelot.UnitTests
-dotnet restore test/Ocelot.UnitTests/
-dotnet test test/Ocelot.UnitTests/

run-unit-tests.ps1

@@ -0,0 +1 @@
+./build.ps1 -target RunUnitTests

test.txt

@@ -1 +0,0 @@
-test