Skip to content

Commit

Permalink
Merge pull request #1790 from ThreeMammals/release/net8
Browse files Browse the repository at this point in the history
Release 21.0
  • Loading branch information
raman-m authored Nov 21, 2023
2 parents d3a623e + 50ff768 commit 0b25c41
Show file tree
Hide file tree
Showing 81 changed files with 1,054 additions and 741 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -19,7 +19,7 @@ workflows:
main:
jobs:
- queue/block_workflow:
time: "20"
time: '20'
only-on-branch: main
- release:
requires:
Expand All @@ -38,6 +38,6 @@ workflows:
- build:
filters:
branches:
ignore:
ignore:
- main
- develop
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "3.0.0",
"version": "4.0.0",
"commands": [
"dotnet-cake"
]
Expand All @@ -15,4 +15,4 @@
]
}
}
}
}
7 changes: 6 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit 0b25c41

Please sign in to comment.