From 730c940cd86dacc63c233ef48df290389d192c22 Mon Sep 17 00:00:00 2001
From: TomPallister <tom@threemammals.com>
Date: Tue, 24 Nov 2020 08:18:30 +0000
Subject: [PATCH] wip

---
 .config/dotnet-tools.json |  2 +-
 .dockerignore             |  7 +++++--
 Makefile                  | 44 +++++++++++++++++++--------------------
 build.cake                |  6 +++---
 build.ps1                 |  2 +-
 build.sh                  |  5 +++--
 docker/Dockerfile.base    |  2 +-
 7 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 73c839341..7c2d7fdc8 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "0.38.5",
+      "version": "0.35.0",
       "commands": [
         "dotnet-cake"
       ]
diff --git a/.dockerignore b/.dockerignore
index 54fec4f0a..ffb631235 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,5 @@
-*/*/bin
-*/*/obj
+*/*/bin
+*/*/obj
+tools/
+artifacts/
+TestResults/
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 834ba760b..0dc3cf94a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,23 @@
-NAME ?= ocelot
-
-build:
-	./build.sh
-
-build_and_run_tests:
-	./build.sh --target=RunTests
-
-release:
-	./build.sh --target=Release
-
-run_acceptance_tests:
-	./build.sh --target=RunAcceptanceTests
-
-run_benchmarks:
-	./build.sh --target=RunBenchmarkTests
-
-run_unit_tests:
-	./build.sh --target=RunUnitTests
-
-release_notes:
-	./build.sh --target=ReleaseNotes
+NAME ?= ocelot
+
+build:
+	mono --version
+
+build_and_run_tests:
+	./build.sh --target=RunTests
+
+release:
+	./build.sh --target=Release
+
+run_acceptance_tests:
+	./build.sh --target=RunAcceptanceTests
+
+run_benchmarks:
+	./build.sh --target=RunBenchmarkTests
+
+run_unit_tests:
+	./build.sh --target=RunUnitTests
+
+release_notes:
+	./build.sh --target=ReleaseNotes
 	
\ No newline at end of file
diff --git a/build.cake b/build.cake
index 6dda8a402..efd9e76b1 100644
--- a/build.cake
+++ b/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"
-#addin Cake.Coveralls&version=0.10.2
+#tool "nuget:?package=coveralls.net&version=0.7.0"
+#addin Cake.Coveralls&version=0.10.1
 
 // compile
 var compileConfig = Argument("configuration", "Release");
diff --git a/build.ps1 b/build.ps1
index 80bf4e64c..af696115f 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,2 +1,2 @@
-dotnet tool install Cake.Tool --version 0.38.5
+dotnet tool restore
 dotnet cake
diff --git a/build.sh b/build.sh
index 80bf4e64c..ad30a43a6 100755
--- a/build.sh
+++ b/build.sh
@@ -1,2 +1,3 @@
-dotnet tool install Cake.Tool --version 0.38.5
-dotnet cake
+# dotnet tool restore --tool-manifest ./.config/dotnet-tools.json
+# echo "tool installed?"
+# dotnet cake
diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index 7b57dd23c..f635566e3 100644
--- a/docker/Dockerfile.base
+++ b/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