Skip to content

Commit 2e40065

Browse files
committed
chore: merge vnext into feature/serialize-as-json-compact-settings
2 parents d8c2a80 + 080c271 commit 2e40065

19 files changed

Lines changed: 1453 additions & 220 deletions

.github/dependabot.yml

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,41 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "github-actions"
4-
# default location of `.github/workflows`
5-
directory: "/"
6-
open-pull-requests-limit: 10
7-
schedule:
8-
interval: "daily"
9-
- package-ecosystem: "nuget"
10-
# location of package manifests
11-
directory: "/"
12-
open-pull-requests-limit: 10
13-
schedule:
14-
interval: "daily"
15-
groups:
16-
MicrosoftExtensions:
17-
patterns:
18-
- "Microsoft.Extensions.*"
19-
coverlet:
20-
patterns:
21-
- "coverlet.*"
22-
- package-ecosystem: dotnet-sdk
23-
directory: /
24-
schedule:
25-
interval: "daily"
26-
ignore:
27-
- dependency-name: '*'
28-
update-types:
29-
- version-update:semver-major
30-
- version-update:semver-minor
31-
- package-ecosystem: "devcontainers"
32-
directory: "/"
33-
open-pull-requests-limit: 10
34-
schedule:
35-
interval: "daily"
3+
- package-ecosystem: github-actions
4+
directory: /
5+
open-pull-requests-limit: 10
6+
schedule:
7+
interval: daily
8+
cooldown:
9+
default-days: 7
10+
- package-ecosystem: nuget
11+
directory: /
12+
open-pull-requests-limit: 10
13+
schedule:
14+
interval: daily
15+
groups:
16+
MicrosoftExtensions:
17+
patterns:
18+
- Microsoft.Extensions.*
19+
coverlet:
20+
patterns:
21+
- coverlet.*
22+
cooldown:
23+
default-days: 7
24+
- package-ecosystem: dotnet-sdk
25+
directory: /
26+
schedule:
27+
interval: daily
28+
ignore:
29+
- dependency-name: '*'
30+
update-types:
31+
- version-update:semver-major
32+
- version-update:semver-minor
33+
cooldown:
34+
default-days: 7
35+
- package-ecosystem: devcontainers
36+
directory: /
37+
open-pull-requests-limit: 10
38+
schedule:
39+
interval: daily
40+
cooldown:
41+
default-days: 7

.github/workflows/ci-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
6565
- name: Upload coverage report
6666
if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]') || (github.event_name != 'pull_request' && github.ref_name == github.event.repository.default_branch)
67-
uses: actions/upload-code-coverage@v1
67+
uses: actions/upload-code-coverage@v1.4.1
6868
with:
6969
file: ./reports/coverage/Cobertura.xml
7070
language: CSharp

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Initialize CodeQL
3636
id: init_codeql
37-
uses: github/codeql-action/init@v4
37+
uses: github/codeql-action/init@v4.37.4
3838
with:
3939
queries: security-and-quality
4040

@@ -54,6 +54,6 @@ jobs:
5454
5555
- name: Perform CodeQL Analysis
5656
id: analyze_codeql
57-
uses: github/codeql-action/analyze@v4
57+
uses: github/codeql-action/analyze@v4.37.4
5858

5959
# Built with ❤ by [Pipeline Foundation](https://pipeline.foundation)

.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: windows-latest
3636
steps:
3737
- name: Set up JDK 17
38-
uses: actions/setup-java@v5
38+
uses: actions/setup-java@v5.7.0
3939
with:
4040
distribution: 'adopt'
4141
java-version: 17
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
```
22
33
BenchmarkDotNet v0.15.8, Linux Ubuntu 24.04.4 LTS (Noble Numbat)
4-
AMD EPYC 7763 2.45GHz, 1 CPU, 4 logical and 2 physical cores
5-
.NET SDK 10.0.301
6-
[Host] : .NET 8.0.28 (8.0.28, 8.0.2826.26413), X64 RyuJIT x86-64-v3
7-
ShortRun : .NET 8.0.28 (8.0.28, 8.0.2826.26413), X64 RyuJIT x86-64-v3
4+
INTEL XEON PLATINUM 8573C 2.30GHz, 1 CPU, 4 logical and 2 physical cores
5+
.NET SDK 10.0.302
6+
[Host] : .NET 8.0.29 (8.0.29, 8.0.2926.32403), X64 RyuJIT x86-64-v4
7+
ShortRun : .NET 8.0.29 (8.0.29, 8.0.2926.32403), X64 RyuJIT x86-64-v4
88
99
Job=ShortRun IterationCount=3 LaunchCount=1
1010
WarmupCount=3
1111
1212
```
13-
| Method | Mean | Error | StdDev | Gen0 | Gen1 | Gen2 | Allocated |
14-
|------------- |---------------:|--------------:|-------------:|-----------:|-----------:|----------:|-------------:|
15-
| PetStoreYaml | 582.2 μs | 208.61 μs | 11.43 μs | 19.5313 | 3.9063 | - | 375.68 KB |
16-
| PetStoreJson | 252.3 μs | 29.46 μs | 1.61 μs | 11.7188 | 1.9531 | - | 209.67 KB |
17-
| GHESYaml | 1,005,560.1 μs | 211,112.24 μs | 11,571.77 μs | 22000.0000 | 18000.0000 | 3000.0000 | 311035.48 KB |
18-
| GHESJson | 369,047.2 μs | 94,799.88 μs | 5,196.30 μs | 9000.0000 | 8000.0000 | 2000.0000 | 140644.21 KB |
19-
| GHESNextYaml | 1,241,432.6 μs | 106,390.00 μs | 5,831.60 μs | 34000.0000 | 19000.0000 | 3000.0000 | 513301.23 KB |
20-
| GHESNextJson | 626,499.0 μs | 70,802.74 μs | 3,880.94 μs | 22000.0000 | 10000.0000 | 2000.0000 | 345119.94 KB |
13+
| Method | Mean | Error | StdDev | Gen0 | Gen1 | Gen2 | Allocated |
14+
|------------- |---------------:|--------------:|-------------:|----------:|----------:|----------:|-------------:|
15+
| PetStoreYaml | 477.6 μs | 237.53 μs | 13.02 μs | 3.9063 | - | - | 375.67 KB |
16+
| PetStoreJson | 193.3 μs | 29.03 μs | 1.59 μs | 1.9531 | - | - | 209.67 KB |
17+
| GHESYaml | 878,325.2 μs | 555,688.50 μs | 30,459.16 μs | 4000.0000 | 3000.0000 | 1000.0000 | 310814.2 KB |
18+
| GHESJson | 225,445.4 μs | 35,058.33 μs | 1,921.67 μs | 1000.0000 | - | - | 140426.65 KB |
19+
| GHESNextYaml | 1,254,063.7 μs | 245,210.30 μs | 13,440.80 μs | 8000.0000 | 6000.0000 | 2000.0000 | 512928.9 KB |
20+
| GHESNextJson | 588,121.5 μs | 83,680.85 μs | 4,586.83 μs | 5000.0000 | 4000.0000 | 1000.0000 | 344754.7 KB |
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Method,Job,AnalyzeLaunchVariance,EvaluateOverhead,MaxAbsoluteError,MaxRelativeError,MinInvokeCount,MinIterationTime,OutlierMode,Affinity,EnvironmentVariables,Jit,LargeAddressAware,Platform,PowerPlanMode,Runtime,AllowVeryLargeObjects,Concurrent,CpuGroups,Force,HeapAffinitizeMask,HeapCount,NoAffinitize,RetainVm,Server,Arguments,BuildConfiguration,Clock,EngineFactory,NuGetReferences,Toolchain,IsMutator,InvocationCount,IterationCount,IterationTime,LaunchCount,MaxIterationCount,MaxWarmupIterationCount,MemoryRandomization,MinIterationCount,MinWarmupIterationCount,RunStrategy,UnrollFactor,WarmupCount,Mean,Error,StdDev,Gen0,Gen1,Gen2,Allocated
2-
PetStoreYaml,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,582.2 μs,208.61 μs,11.43 μs,19.5313,3.9063,0.0000,375.68 KB
3-
PetStoreJson,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,252.3 μs,29.46 μs,1.61 μs,11.7188,1.9531,0.0000,209.67 KB
4-
GHESYaml,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"1,005,560.1 μs","211,112.24 μs","11,571.77 μs",22000.0000,18000.0000,3000.0000,311035.48 KB
5-
GHESJson,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"369,047.2 μs","94,799.88 μs","5,196.30 μs",9000.0000,8000.0000,2000.0000,140644.21 KB
6-
GHESNextYaml,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"1,241,432.6 μs","106,390.00 μs","5,831.60 μs",34000.0000,19000.0000,3000.0000,513301.23 KB
7-
GHESNextJson,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"626,499.0 μs","70,802.74 μs","3,880.94 μs",22000.0000,10000.0000,2000.0000,345119.94 KB
2+
PetStoreYaml,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,477.6 μs,237.53 μs,13.02 μs,3.9063,0.0000,0.0000,375.67 KB
3+
PetStoreJson,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,193.3 μs,29.03 μs,1.59 μs,1.9531,0.0000,0.0000,209.67 KB
4+
GHESYaml,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"878,325.2 μs","555,688.50 μs","30,459.16 μs",4000.0000,3000.0000,1000.0000,310814.2 KB
5+
GHESJson,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"225,445.4 μs","35,058.33 μs","1,921.67 μs",1000.0000,0.0000,0.0000,140426.65 KB
6+
GHESNextYaml,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"1,254,063.7 μs","245,210.30 μs","13,440.80 μs",8000.0000,6000.0000,2000.0000,512928.9 KB
7+
GHESNextJson,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"588,121.5 μs","83,680.85 μs","4,586.83 μs",5000.0000,4000.0000,1000.0000,344754.7 KB

performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang='en'>
33
<head>
44
<meta charset='utf-8' />
5-
<title>performance.Descriptions-20260714-121715</title>
5+
<title>performance.Descriptions-20260807-144733</title>
66

77
<style type="text/css">
88
table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
@@ -14,10 +14,10 @@
1414
<body>
1515
<pre><code>
1616
BenchmarkDotNet v0.15.8, Linux Ubuntu 24.04.4 LTS (Noble Numbat)
17-
AMD EPYC 7763 2.45GHz, 1 CPU, 4 logical and 2 physical cores
18-
.NET SDK 10.0.301
19-
[Host] : .NET 8.0.28 (8.0.28, 8.0.2826.26413), X64 RyuJIT x86-64-v3
20-
ShortRun : .NET 8.0.28 (8.0.28, 8.0.2826.26413), X64 RyuJIT x86-64-v3
17+
INTEL XEON PLATINUM 8573C 2.30GHz, 1 CPU, 4 logical and 2 physical cores
18+
.NET SDK 10.0.302
19+
[Host] : .NET 8.0.29 (8.0.29, 8.0.2926.32403), X64 RyuJIT x86-64-v4
20+
ShortRun : .NET 8.0.29 (8.0.29, 8.0.2926.32403), X64 RyuJIT x86-64-v4
2121
</code></pre>
2222
<pre><code>Job=ShortRun IterationCount=3 LaunchCount=1
2323
WarmupCount=3
@@ -26,12 +26,12 @@
2626
<table>
2727
<thead><tr><th>Method</th><th>Mean </th><th>Error </th><th>StdDev</th><th>Gen0</th><th>Gen1</th><th>Gen2</th><th>Allocated</th>
2828
</tr>
29-
</thead><tbody><tr><td>PetStoreYaml</td><td>582.2 &mu;s</td><td>208.61 &mu;s</td><td>11.43 &mu;s</td><td>19.5313</td><td>3.9063</td><td>-</td><td>375.68 KB</td>
30-
</tr><tr><td>PetStoreJson</td><td>252.3 &mu;s</td><td>29.46 &mu;s</td><td>1.61 &mu;s</td><td>11.7188</td><td>1.9531</td><td>-</td><td>209.67 KB</td>
31-
</tr><tr><td>GHESYaml</td><td>1,005,560.1 &mu;s</td><td>211,112.24 &mu;s</td><td>11,571.77 &mu;s</td><td>22000.0000</td><td>18000.0000</td><td>3000.0000</td><td>311035.48 KB</td>
32-
</tr><tr><td>GHESJson</td><td>369,047.2 &mu;s</td><td>94,799.88 &mu;s</td><td>5,196.30 &mu;s</td><td>9000.0000</td><td>8000.0000</td><td>2000.0000</td><td>140644.21 KB</td>
33-
</tr><tr><td>GHESNextYaml</td><td>1,241,432.6 &mu;s</td><td>106,390.00 &mu;s</td><td>5,831.60 &mu;s</td><td>34000.0000</td><td>19000.0000</td><td>3000.0000</td><td>513301.23 KB</td>
34-
</tr><tr><td>GHESNextJson</td><td>626,499.0 &mu;s</td><td>70,802.74 &mu;s</td><td>3,880.94 &mu;s</td><td>22000.0000</td><td>10000.0000</td><td>2000.0000</td><td>345119.94 KB</td>
29+
</thead><tbody><tr><td>PetStoreYaml</td><td>477.6 &mu;s</td><td>237.53 &mu;s</td><td>13.02 &mu;s</td><td>3.9063</td><td>-</td><td>-</td><td>375.67 KB</td>
30+
</tr><tr><td>PetStoreJson</td><td>193.3 &mu;s</td><td>29.03 &mu;s</td><td>1.59 &mu;s</td><td>1.9531</td><td>-</td><td>-</td><td>209.67 KB</td>
31+
</tr><tr><td>GHESYaml</td><td>878,325.2 &mu;s</td><td>555,688.50 &mu;s</td><td>30,459.16 &mu;s</td><td>4000.0000</td><td>3000.0000</td><td>1000.0000</td><td>310814.2 KB</td>
32+
</tr><tr><td>GHESJson</td><td>225,445.4 &mu;s</td><td>35,058.33 &mu;s</td><td>1,921.67 &mu;s</td><td>1000.0000</td><td>-</td><td>-</td><td>140426.65 KB</td>
33+
</tr><tr><td>GHESNextYaml</td><td>1,254,063.7 &mu;s</td><td>245,210.30 &mu;s</td><td>13,440.80 &mu;s</td><td>8000.0000</td><td>6000.0000</td><td>2000.0000</td><td>512928.9 KB</td>
34+
</tr><tr><td>GHESNextJson</td><td>588,121.5 &mu;s</td><td>83,680.85 &mu;s</td><td>4,586.83 &mu;s</td><td>5000.0000</td><td>4000.0000</td><td>1000.0000</td><td>344754.7 KB</td>
3535
</tr></tbody></table>
3636
</body>
3737
</html>

performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)