Merge 'ThreeMammals:develop' into 'master'

.circleci/config.yml

@@ -1,36 +1,43 @@
-version: 2.1
+version: 2.1
 orbs:
-  queue: eddiewebb/queue@1.5.0
+  queue: eddiewebb/queue@2.2.1
 jobs:
   build:
     docker:
-      - image: mijitt0m/ocelot-build:0.0.1
+      - image: ocelot2/circleci-build:8.21.0
     steps:
       - checkout
-      - run: make build
+      - run: dotnet tool restore && dotnet cake
   release:
     docker:
-      - image: mijitt0m/ocelot-build:0.0.1
+      - image: ocelot2/circleci-build:8.21.0
     steps:
       - checkout
-      - run: make release
+      - run: dotnet tool restore && dotnet cake --target=Release
 workflows:
   version: 2
-  master:
-    jobs:
+  main:
+    jobs:
       - queue/block_workflow:
-          time: "20"
-          only-on-branch: master
-      - release:
+          time: '20'
+          only-on-branch: main
+      - release:
           requires:
             - queue/block_workflow
           filters:
             branches:
-              only: master
+              only: main
+  develop:
+    jobs:
+      - build:
+          filters:
+            branches:
+              only: develop
   pr:
     jobs:
       - build:
           filters:
             branches:
-              ignore: 
-                - master
+              ignore:
+                - main
+                - develop

.config/dotnet-tools.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "4.0.0",
+      "commands": [
+        "dotnet-cake"
+      ]
+    },
+    "coveralls.net": {
+      "version": "4.0.1",
+      "commands": [
+        "csmacnz.Coveralls"
+      ]
+    }
+  }
+}

.dockerignore

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

.editorconfig

@@ -4,7 +4,12 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 
-[*.cs]
+[*.cs]
 end_of_line = lf
 indent_style = space
 indent_size = 4
+
+# XML files
+[*.xml]
+indent_style = space
+indent_size = 2