wip

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "0.38.5",
+      "version": "0.35.0",
       "commands": [
         "dotnet-cake"
       ]

.dockerignore

@@ -1,2 +1,5 @@
-*/*/bin
+*/*/bin
-*/*/obj
+*/*/obj
+tools/
+artifacts/
+TestResults/

Makefile

@@ -1,23 +1,23 @@
-NAME ?= ocelot
+NAME ?= ocelot
-
+
-build:
+build:
-	./build.sh
+	mono --version
-
+
-build_and_run_tests:
+build_and_run_tests:
-	./build.sh --target=RunTests
+	./build.sh --target=RunTests
-
+
-release:
+release:
-	./build.sh --target=Release
+	./build.sh --target=Release
-
+
-run_acceptance_tests:
+run_acceptance_tests:
-	./build.sh --target=RunAcceptanceTests
+	./build.sh --target=RunAcceptanceTests
-
+
-run_benchmarks:
+run_benchmarks:
-	./build.sh --target=RunBenchmarkTests
+	./build.sh --target=RunBenchmarkTests
-
+
-run_unit_tests:
+run_unit_tests:
-	./build.sh --target=RunUnitTests
+	./build.sh --target=RunUnitTests
-
+
-release_notes:
+release_notes:
-	./build.sh --target=ReleaseNotes
+	./build.sh --target=ReleaseNotes
 	

build.cake

@@ -1,11 +1,11 @@
 #tool "nuget:?package=GitVersion.CommandLine&version=5.0.1"
 #addin nuget:?package=Cake.Json
 #addin nuget:?package=Newtonsoft.Json
-#addin nuget:?package=System.Net.Http
+#addin nuget:?package=System.Net.Http&version=4.3.4
 #addin nuget:?package=System.Text.Encodings.Web&version=4.7.1
 #tool "nuget:?package=ReportGenerator"
-#tool "nuget:?package=coveralls.net&version=2.0.0"
+#tool "nuget:?package=coveralls.net&version=0.7.0"
-#addin Cake.Coveralls&version=0.10.2
+#addin Cake.Coveralls&version=0.10.1
 
 // compile
 var compileConfig = Argument("configuration", "Release");

build.ps1

@@ -1,2 +1,2 @@
-dotnet tool install Cake.Tool --version 0.38.5
+dotnet tool restore
 dotnet cake

build.sh

@@ -1,2 +1,3 @@
-dotnet tool install Cake.Tool --version 0.38.5
+# dotnet tool restore --tool-manifest ./.config/dotnet-tools.json
-dotnet cake
+# echo "tool installed?"
+# dotnet cake

docker/Dockerfile.base

@@ -6,6 +6,6 @@ RUN apt update
 RUN apt install -y dirmngr gnupg apt-transport-https ca-certificates software-properties-common
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 RUN apt-add-repository 'deb https://download.mono-project.com/repo/ubuntu stable-focal main'
-RUN apt install -y mono-devel
+RUN apt install -y mono-complete
 RUN apt install -y make
 RUN apt install -y build-essential