Feat/net6.0 upgrade (#1558)

* +semver: major upgrading from net5.0 to net6.0

* packages upgraded

* removed global.json for ocelot sf sample

* update build image

* test new build

* remove make

* fix tests

* make test fail like in CI

* tests passing locally

* updated docs


Co-authored-by: TGP <[email protected]>

Author: TomPallister

Diff for: .circleci/config.yml

@@ -4,16 +4,16 @@ orbs:
 jobs:
   build:
     docker:
-      - image: mijitt0m/ocelot-build:0.0.3
+      - image: mcr.microsoft.com/dotnet/sdk:6.0-alpine
     steps:
       - checkout
-      - run: make build
+      - run: dotnet tool restore && dotnet cake
   release:
     docker:
-      - image: mijitt0m/ocelot-build:0.0.3
+      - image: mcr.microsoft.com/dotnet/sdk:6.0-alpine
     steps:
       - checkout
-      - run: make release
+      - run: dotnet tool restore && dotnet cake --target=Release
 workflows:
   version: 2
   master:

Diff for: .config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "2.0.0",
+      "commands": [
+        "dotnet-cake"
+      ]
+    }
+  }
+}

Diff for: .dockerignore

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

Diff for: Makefile

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29613.14
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5CFB79B7-C9DC-45A4-9A75-625D92471702}"
 EndProject

Diff for: Ocelot.sln

@@ -43,7 +43,7 @@ A quick list of Ocelot's capabilities for more information see the [documentatio
 
 ## How to install
 
-Ocelot is designed to work with ASP.NET Core only and it targets `netcoreapp3.1`.
+Ocelot is designed to work with ASP.NET and it targets `net6.0`.
 
 Install Ocelot and it's dependencies using NuGet.
 

Diff for: README.md

@@ -1,7 +1,8 @@
-#tool "nuget:?package=GitVersion.CommandLine&version=5.0.1"
+// #tool "nuget:?package=GitVersion.CommandLine&version=5.8.1"
+#tool "dotnet:?package=GitVersion.Tool&version=5.8.1"
 #addin nuget:?package=Cake.Json&version=4.0.0
 #addin nuget:?package=Newtonsoft.Json
-#addin nuget:?package=System.Net.Http&version=4.3.4
+// #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=0.7.0"
@@ -82,12 +83,12 @@ Task("Compile")
 	.IsDependentOn("Version")
 	.Does(() =>
 	{	
-		var settings = new DotNetCoreBuildSettings
+		var settings = new DotNetBuildSettings
 		{
 			Configuration = compileConfig,
 		};
 
-		DotNetCoreBuild(slnFile, settings);
+		DotNetBuild(slnFile, settings);
 	});
 
 Task("Clean")