Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync 'develop' to 'release/net8' #1798

Merged
merged 6 commits into from
Nov 22, 2023
Merged

Sync 'develop' to 'release/net8' #1798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24b507e
#1787 Upgrade to .NET 8 (#1789)
ggnaegi Nov 19, 2023
7d93623
.NET8 Release artifacts (#1792)
raman-m Nov 20, 2023
50ff768
+semver: breaking | Release 21.0
raman-m Nov 20, 2023
0b25c41
Merge pull request #1790 from ThreeMammals/release/net8
raman-m Nov 21, 2023
940b058
Merge 'release/net8' into 'release/net8-to-develop'
raman-m Nov 21, 2023
04ad9bf
Resolve issues with projects after auto-merging. Format Document
raman-m Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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