+semver: upgrade to net5.0 (#1390)

* breaking upgrade base build image to net5.0

* add make and build tools to image

* fix code broken after net5.0 upgrade

* fix warnings

* fix tests and line endings

* upgrade dotnet test and coverages packages

* update circle build image

* removed rafty and updated more packages

* bring back develop

* rename authorisation to authorization

.circleci/config.yml

@@ -1,36 +1,43 @@
-version: 2.1
+version: 2.1
 orbs:
   queue: eddiewebb/[email protected]
 jobs:
   build:
     docker:
-      - image: mijitt0m/ocelot-build:0.0.1
+      - image: mijitt0m/ocelot-build:0.0.3
     steps:
       - checkout
       - run: make build
   release:
     docker:
-      - image: mijitt0m/ocelot-build:0.0.1
+      - image: mijitt0m/ocelot-build:0.0.3
     steps:
       - checkout
       - run: make release
 workflows:
   version: 2
   master:
-    jobs:
+    jobs:
       - queue/block_workflow:
           time: "20"
           only-on-branch: master
-      - release:
+      - release:
           requires:
             - queue/block_workflow
           filters:
             branches:
               only: master
+  develop:
+    jobs:
+      - build:
+          filters:
+            branches:
+              only: develop
   pr:
     jobs:
       - build:
           filters:
             branches:
               ignore: 
                 - master
+                - develop

.dockerignore

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

Makefile

@@ -1,23 +1,24 @@
-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:
+	./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
+
 

Ocelot.sln

@@ -44,8 +44,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Provider.Eureka", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Provider.Polly", "src\Ocelot.Provider.Polly\Ocelot.Provider.Polly.csproj", "{1F6E5DCF-8A2E-4E24-A25D-064362DE8D0E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Provider.Rafty", "src\Ocelot.Provider.Rafty\Ocelot.Provider.Rafty.csproj", "{AC153C67-EF18-47E6-A230-F0D3CF5F0A98}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Tracing.Butterfly", "src\Ocelot.Tracing.Butterfly\Ocelot.Tracing.Butterfly.csproj", "{6045E23D-669C-4F27-AF8E-8EEE6DB3557F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Provider.Kubernetes", "src\Ocelot.Provider.Kubernetes\Ocelot.Provider.Kubernetes.csproj", "{72C8E528-B4F5-45CE-8A06-CD3787364856}"
@@ -138,10 +136,6 @@ Global
 		{1F6E5DCF-8A2E-4E24-A25D-064362DE8D0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F6E5DCF-8A2E-4E24-A25D-064362DE8D0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F6E5DCF-8A2E-4E24-A25D-064362DE8D0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC153C67-EF18-47E6-A230-F0D3CF5F0A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC153C67-EF18-47E6-A230-F0D3CF5F0A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC153C67-EF18-47E6-A230-F0D3CF5F0A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC153C67-EF18-47E6-A230-F0D3CF5F0A98}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6045E23D-669C-4F27-AF8E-8EEE6DB3557F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6045E23D-669C-4F27-AF8E-8EEE6DB3557F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6045E23D-669C-4F27-AF8E-8EEE6DB3557F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -210,7 +204,6 @@ Global
 		{02F5AE4D-9C36-4E58-B7C6-012CBBDEFDE0} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
 		{9BBD3586-145C-4FA0-91C5-9ED58287D753} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
 		{1F6E5DCF-8A2E-4E24-A25D-064362DE8D0E} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
-		{AC153C67-EF18-47E6-A230-F0D3CF5F0A98} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
 		{6045E23D-669C-4F27-AF8E-8EEE6DB3557F} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
 		{72C8E528-B4F5-45CE-8A06-CD3787364856} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
 		{ED0B3A09-112B-4BA4-82D6-11569BC7A99B} = {ED066001-BAF7-4117-9884-DF591A56347D}

README.md

@@ -30,7 +30,7 @@ A quick list of Ocelot's capabilities for more information see the [documentatio
 * Kubernetes 
 * WebSockets
 * Authentication
-* Authorisation
+* Authorization
 * Rate Limiting
 * Caching
 * Retry policies / QoS