Skip to content

Commit 326a384

Browse files
authored
Merge branch 'master' into add-support-to-configuration
2 parents 5474ade + 7651606 commit 326a384

File tree

546 files changed

+44134
-1422
lines changed

Some content is hidden

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

546 files changed

+44134
-1422
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,19 @@
1313
"Bash(wget:*)",
1414
"Bash(ssh:*)"
1515
]
16+
},
17+
"hooks": {
18+
"PostToolUse": [
19+
{
20+
"matcher": "Write|Edit",
21+
"hooks": [
22+
{
23+
"type": "command",
24+
"command": "slopwatch analyze -d . --hook",
25+
"timeout": 60000
26+
}
27+
]
28+
}
29+
]
1630
}
1731
}

.config/dotnet-tools.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-ef": {
6-
"version": "9.0.10",
6+
"version": "10.0.1",
77
"commands": [
88
"dotnet-ef"
9-
]
9+
],
10+
"rollForward": false
11+
},
12+
"csharpier": {
13+
"version": "1.2.5",
14+
"commands": [
15+
"csharpier"
16+
],
17+
"rollForward": false
1018
}
1119
}
1220
}

.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ charset = utf-8-bom
1616

1717
# C# files
1818
[*.cs]
19+
# editorconfig doesn't support multi-line values and #, so we use \n for new lines in the license header
20+
#see: https://github.com/dotnet/roslyn/issues/44596
21+
file_header_template = The MIT License (MIT)\nCopyright © 2014 Ian Cooper <ian_hammond_cooper@yahoo.co.uk>\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\n of this software and associated documentation files (the "Software"), to deal\n in the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\n The above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.
22+
23+
#endregion
1924
# Sort using and Import directives with System.* appearing first
2025
dotnet_sort_system_directives_first = true
2126
# New line preferences

.github/workflows/ci.yml

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,12 @@ jobs:
4343
dotnet-version: |
4444
8.0.x
4545
9.0.x
46+
10.0.x
4647
- run: dotnet --info
4748
- uses: actions/checkout@v6
4849
with:
4950
fetch-depth: 0
50-
- uses: actions/cache@v4
51+
- uses: actions/cache@v5
5152
with:
5253
path: ~/.nuget/packages
5354
key: Linux-nuget-${{ hashFiles('**/Directory.Packages.props') }}
@@ -62,7 +63,7 @@ jobs:
6263
dotnet test tests/Paramore.Brighter.Transforms.Adaptors.Tests/Paramore.Brighter.Transforms.Adaptors.Tests.csproj -c Release --no-restore --logger GitHubActions --no-build --verbosity d
6364
6465
- name: Upload packages as artifacts
65-
uses: actions/upload-artifact@v5
66+
uses: actions/upload-artifact@v6
6667
with:
6768
name: nuget packages
6869
path: "**/*.nupkg"
@@ -79,7 +80,7 @@ jobs:
7980
timeout-minutes: 5
8081
needs: [build]
8182
steps:
82-
- uses: actions/download-artifact@v6
83+
- uses: actions/download-artifact@v7
8384
with:
8485
name: nuget packages
8586
- name: Push generated package to NuGet
@@ -98,6 +99,7 @@ jobs:
9899
dotnet-version: |
99100
8.0.x
100101
9.0.x
102+
10.0.x
101103
- name: Install dependencies
102104
run: dotnet restore
103105
- name: In Memory Transport Tests
@@ -116,6 +118,7 @@ jobs:
116118
dotnet-version: |
117119
8.0.x
118120
9.0.x
121+
10.0.x
119122
- name: Install dependencies
120123
run: dotnet restore
121124
- name: Hangfire Tests
@@ -134,11 +137,31 @@ jobs:
134137
dotnet-version: |
135138
8.0.x
136139
9.0.x
140+
10.0.x
137141
- name: Install dependencies
138142
run: dotnet restore
139143
- name: Quartz Tests
140144
run: dotnet test ./tests/Paramore.Brighter.Quartz.Tests/Paramore.Brighter.Quartz.Tests.csproj --filter "Fragile!=CI" --configuration Release --logger "console;verbosity=normal" --logger GitHubActions --blame -v n
141145

146+
tickerq:
147+
runs-on: ubuntu-latest
148+
timeout-minutes: 8
149+
needs: [ build ]
150+
151+
steps:
152+
- uses: actions/checkout@v6
153+
- name: Setup dotnet
154+
uses: actions/setup-dotnet@v5
155+
with:
156+
dotnet-version: |
157+
8.0.x
158+
9.0.x
159+
10.0.x
160+
- name: Install dependencies
161+
run: dotnet restore
162+
- name: TickerQ Tests
163+
run: dotnet test ./tests/Paramore.Brighter.TickerQ.Tests/Paramore.Brighter.TickerQ.Tests.csproj --filter "Fragile!=CI" --configuration Release --logger "console;verbosity=normal" --logger GitHubActions --blame -v n
164+
142165
redis-ci:
143166
runs-on: ubuntu-latest
144167
timeout-minutes: 5
@@ -163,6 +186,7 @@ jobs:
163186
dotnet-version: |
164187
8.0.x
165188
9.0.x
189+
10.0.x
166190
- name: Install dependencies
167191
run: dotnet restore
168192
- name: Redis Transport Tests
@@ -188,6 +212,7 @@ jobs:
188212
dotnet-version: |
189213
8.0.x
190214
9.0.x
215+
10.0.x
191216
- name: Install dependencies
192217
run: dotnet restore
193218
- name: MQTT Transport Tests
@@ -218,6 +243,7 @@ jobs:
218243
dotnet-version: |
219244
8.0.x
220245
9.0.x
246+
10.0.x
221247
- name: Install dependencies
222248
run: dotnet restore
223249
- name: RMQ Async Transport Tests
@@ -283,6 +309,7 @@ jobs:
283309
dotnet-version: |
284310
8.0.x
285311
9.0.x
312+
10.0.x
286313
- name: Install dependencies
287314
run: dotnet restore
288315
- name: Kafka Transport Tests
@@ -314,6 +341,7 @@ jobs:
314341
dotnet-version: |
315342
8.0.x
316343
9.0.x
344+
10.0.x
317345
- name: Install dependencies
318346
run: dotnet restore
319347
- name: Postgres Tests
@@ -340,6 +368,7 @@ jobs:
340368
dotnet-version: |
341369
8.0.x
342370
9.0.x
371+
10.0.x
343372
- name: Install dependencies
344373
run: dotnet restore
345374
- name: MSSQL Tests
@@ -368,6 +397,7 @@ jobs:
368397
dotnet-version: |
369398
8.0.x
370399
9.0.x
400+
10.0.x
371401
- name: Install dependencies
372402
run: dotnet restore
373403
- name: Verify MariaDB connection
@@ -399,6 +429,7 @@ jobs:
399429
dotnet-version: |
400430
8.0.x
401431
9.0.x
432+
10.0.x
402433
- name: Install dependencies
403434
run: dotnet restore
404435
- name: DynamoDB Tests
@@ -433,7 +464,8 @@ jobs:
433464
dotnet-version: |
434465
8.0.x
435466
9.0.x
436-
- uses: actions/cache@v4
467+
10.0.x
468+
- uses: actions/cache@v5
437469
with:
438470
path: ~/.nuget/packages
439471
key: Linux-nuget-${{ hashFiles('**/Directory.Packages.props') }}
@@ -465,6 +497,7 @@ jobs:
465497
dotnet-version: |
466498
8.0.x
467499
9.0.x
500+
10.0.x
468501
- name: Install dependencies
469502
run: dotnet restore
470503
- name: Configure AWS Credentials
@@ -499,6 +532,7 @@ jobs:
499532
dotnet-version: |
500533
8.0.x
501534
9.0.x
535+
10.0.x
502536
- name: Install dependencies
503537
run: dotnet restore
504538
- name: Configure AWS Credentials
@@ -525,6 +559,7 @@ jobs:
525559
dotnet-version: |
526560
8.0.x
527561
9.0.x
562+
10.0.x
528563
- name: Install dependencies
529564
run: dotnet restore
530565
- name: Sqlite Tests
@@ -542,6 +577,7 @@ jobs:
542577
dotnet-version: |
543578
8.0.x
544579
9.0.x
580+
10.0.x
545581
- name: Install dependencies
546582
run: dotnet restore
547583
- name: Azure Tests
@@ -574,6 +610,7 @@ jobs:
574610
dotnet-version: |
575611
8.0.x
576612
9.0.x
613+
10.0.x
577614
- name: Install dependencies
578615
run: dotnet restore
579616
- name: MongoDB Tests
@@ -609,6 +646,7 @@ jobs:
609646
dotnet-version: |
610647
8.0.x
611648
9.0.x
649+
10.0.x
612650
613651
- name: Install dependencies
614652
run: dotnet restore

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,6 @@ paket-files/
303303
__pycache__/
304304
*.pyc
305305

306-
# Cake - Uncomment if you are using it
307-
tools/**
308-
!tools/packages.config
309-
310306
# Tabs Studio
311307
*.tss
312308

0 commit comments

Comments
 (0)