Merge pull request ThreeMammals#1798 from ThreeMammals/release/net8-t…

…o-develop Sync 'develop' to 'release/net8' (hotfix process)
jlukawska · Nov 22, 2023 · 40fa20f · 40fa20f
2 parents ec55504 + 04ad9bf
commit 40fa20f
Show file tree

Hide file tree

Showing 82 changed files with 1,231 additions and 900 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,13 +4,13 @@ orbs:
 jobs:
   build:
     docker:
-      - image: mijitt0m/ocelot-build:0.0.9
+      - image: ocelot2/circleci-build:8.21.0
     steps:
       - checkout
       - run: dotnet tool restore && dotnet cake
   release:
     docker:
-      - image: mijitt0m/ocelot-build:0.0.9
+      - image: ocelot2/circleci-build:8.21.0
     steps:
       - checkout
       - run: dotnet tool restore && dotnet cake --target=Release
@@ -19,7 +19,7 @@ workflows:
   main:
     jobs:
       - queue/block_workflow:
-          time: "20"
+          time: '20'
           only-on-branch: main
       - release:
           requires:
@@ -38,6 +38,6 @@ workflows:
       - build:
           filters:
             branches:
-              ignore: 
+              ignore:
                 - main
                 - develop
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "3.0.0",
+      "version": "4.0.0",
       "commands": [
         "dotnet-cake"
       ]
@@ -15,4 +15,4 @@
       ]
     }
   }
-}
+}
diff --git a/.editorconfig b/.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