Skip to content

Commit 0b25c41

Browse files
authored
Merge pull request #1790 from ThreeMammals/release/net8
Release 21.0
2 parents d3a623e + 50ff768 commit 0b25c41

File tree

81 files changed

+1054
-741
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1054
-741
lines changed

.circleci/config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ orbs:
44
jobs:
55
build:
66
docker:
7-
- image: mijitt0m/ocelot-build:0.0.9
7+
- image: ocelot2/circleci-build:8.21.0
88
steps:
99
- checkout
1010
- run: dotnet tool restore && dotnet cake
1111
release:
1212
docker:
13-
- image: mijitt0m/ocelot-build:0.0.9
13+
- image: ocelot2/circleci-build:8.21.0
1414
steps:
1515
- checkout
1616
- run: dotnet tool restore && dotnet cake --target=Release
@@ -19,7 +19,7 @@ workflows:
1919
main:
2020
jobs:
2121
- queue/block_workflow:
22-
time: "20"
22+
time: '20'
2323
only-on-branch: main
2424
- release:
2525
requires:
@@ -38,6 +38,6 @@ workflows:
3838
- build:
3939
filters:
4040
branches:
41-
ignore:
41+
ignore:
4242
- main
4343
- develop

.config/dotnet-tools.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "3.0.0",
6+
"version": "4.0.0",
77
"commands": [
88
"dotnet-cake"
99
]
@@ -15,4 +15,4 @@
1515
]
1616
}
1717
}
18-
}
18+
}

.editorconfig

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ root = true
44
end_of_line = lf
55
insert_final_newline = true
66

7-
[*.cs]
7+
[*.cs]
88
end_of_line = lf
99
indent_style = space
1010
indent_size = 4
11+
12+
# XML files
13+
[*.xml]
14+
indent_style = space
15+
indent_size = 2

0 commit comments

Comments
 (0)