Skip to content

Commit f765e10

Browse files
varndellwagglebeevarndellwagglebee
authored
Merge pull request #150 from Stillpoint-Software/develop
Updated nugets
2 parents 042c069 + 9c8cb62 commit f765e10

14 files changed

Lines changed: 464 additions & 456 deletions

‎.github/workflows/format.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
if: ${{ needs.discover.result == 'success' }}
4747
uses: Stillpoint-Software/shared-workflows/.github/workflows/format.yml@main
4848
with:
49-
dotnet_version: "10.0.x"
5049
branch: ${{ needs.discover.outputs.branch_name }}
5150
secrets: inherit
5251

‎Directory.Build.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@
22
<!-- Shared package refs -->
33
<ItemGroup>
44
<!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
5-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" PrivateAssets="all" />
6-
5+
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
76
<!-- SourceLink for GitHub -->
8-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
9-
<PrivateAssets>all</PrivateAssets>
10-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
11-
</PackageReference>
12-
13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
7+
<PackageReference Include="Microsoft.SourceLink.GitHub"/>
8+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
149
</ItemGroup>
1510

1611
<!-- SourceLink / build hygiene -->
@@ -45,4 +40,9 @@
4540
PackagePath="\"
4641
Link="LICENSE" />
4742
</ItemGroup>
43+
<!-- Global project properies -->
44+
<PropertyGroup>
45+
<ImplicitUsings>enable</ImplicitUsings>
46+
<TargetFramework>net10.0</TargetFramework>
47+
</PropertyGroup>
4848
</Project>

‎Directory.Packages.props‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<!-- Core Application Dependencies -->
7+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.0.0" />
8+
<!-- Development Tools -->
9+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
10+
<PrivateAssets>all</PrivateAssets>
11+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
12+
</PackageVersion>
13+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" />
14+
<!-- Testing Framework -->
15+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
16+
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
17+
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
18+
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
19+
<PackageVersion Include="coverlet.collector" Version="6.0.4">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageVersion>
23+
<PackageVersion Include="JsonCons.JsonPath" Version="1.1.0" />
24+
<PackageVersion Include="JsonPatch.Net" Version="4.0.1" />
25+
<PackageVersion Include="JsonPath.Net" Version="2.2.0" />
26+
<PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="10.0.1" />
27+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
28+
<!-- Benchmarking -->
29+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
30+
<PackageVersion Include="JsonCraft.JsonPath" Version="1.0.0" />
31+
</ItemGroup>
32+
</Project>

‎Hyperbee.Json.slnx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Solution>
22
<Folder Name="/Solution Items/">
33
<File Path="Directory.Build.props" />
4+
<File Path="Directory.Packages.props" />
45
<File Path="LICENSE" />
56
<File Path="README.md" />
67
<File Path="version.json" />

‎README.md‎

Lines changed: 202 additions & 200 deletions
Large diffs are not rendered by default.

‎src/Hyperbee.Json/Hyperbee.Json.csproj‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
4-
<ImplicitUsings>enable</ImplicitUsings>
53
<IsPackable>true</IsPackable>
6-
74
<Authors>Stillpoint Software, Inc.</Authors>
85
<PackageId>Hyperbee.Json</PackageId>
96
<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -36,11 +33,8 @@
3633
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="/" />
3734
<None Include="..\..\README.md" Pack="true" Visible="true" PackagePath="/" Link="README.md" />
3835
<None Include="..\..\LICENSE" Pack="true" Visible="false" PackagePath="/" />
39-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
40-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
41-
<PrivateAssets>all</PrivateAssets>
42-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
43-
</PackageReference>
44-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
36+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" />
37+
<PackageReference Update="Microsoft.SourceLink.GitHub" />
38+
<PackageReference Update="Nerdbank.GitVersioning" />
4539
</ItemGroup>
4640
</Project>

‎test/Hyperbee.Json.Benchmark/Hyperbee.Json.Benchmark.csproj‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net10.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
75
<IsPackable>false</IsPackable>
86
</PropertyGroup>
97

@@ -14,26 +12,18 @@
1412
</ItemGroup>
1513

1614
<ItemGroup>
17-
<PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
18-
<PackageReference Include="JsonCons.JsonPath" Version="1.1.0" />
19-
<PackageReference Include="JsonCraft.JsonPath" Version="1.0.0" />
20-
<PackageReference Include="JsonPatch.Net" Version="4.0.0" />
21-
<PackageReference Include="JsonPath.Net" Version="2.2.0" />
22-
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="10.0.1" />
23-
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
15+
<PackageReference Include="BenchmarkDotNet" />
16+
<PackageReference Include="JsonCons.JsonPath" />
17+
<PackageReference Include="JsonCraft.JsonPath" />
18+
<PackageReference Include="JsonPatch.Net" />
19+
<PackageReference Include="JsonPath.Net" />
20+
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" />
21+
<PackageReference Include="Newtonsoft.Json" />
22+
<PackageReference Update="Microsoft.SourceLink.GitHub" />
23+
<PackageReference Update="Nerdbank.GitVersioning" />
2424
</ItemGroup>
2525

2626
<ItemGroup>
2727
<ProjectReference Include="..\..\src\Hyperbee.Json\Hyperbee.Json.csproj" />
2828
</ItemGroup>
29-
30-
<ItemGroup>
31-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
32-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
33-
<PrivateAssets>all</PrivateAssets>
34-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
35-
</PackageReference>
36-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
37-
</ItemGroup>
38-
3929
</Project>

‎test/Hyperbee.Json.Benchmark/benchmark/results/Hyperbee.Json.Benchmark.FilterExpressionParserEvaluator-report-jsonpath.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
BenchmarkDotNet v0.15.8, Windows 11 (10.0.26200.7462/25H2/2025Update/HudsonValley2)
44
12th Gen Intel Core i9-12900HK 2.50GHz, 1 CPU, 20 logical and 14 physical cores
55
.NET SDK 10.0.101
6-
[Host] : .NET 10.0.1 (10.0.1, 10.0.125.57005), X64 RyuJIT x86-64-v3 DEBUG
6+
[Host] : .NET 10.0.1 (10.0.1, 10.0.125.57005), X64 RyuJIT x86-64-v3 [AttachedDebugger]
77
ShortRun : .NET 10.0.1 (10.0.1, 10.0.125.57005), X64 RyuJIT x86-64-v3
88
99

‎test/Hyperbee.Json.Benchmark/benchmark/results/Hyperbee.Json.Benchmark.JsonDiffBenchmark-report-jsonpath.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
BenchmarkDotNet v0.15.8, Windows 11 (10.0.26200.7462/25H2/2025Update/HudsonValley2)
44
12th Gen Intel Core i9-12900HK 2.50GHz, 1 CPU, 20 logical and 14 physical cores
55
.NET SDK 10.0.101
6-
[Host] : .NET 10.0.1 (10.0.1, 10.0.125.57005), X64 RyuJIT x86-64-v3 DEBUG
6+
[Host] : .NET 10.0.1 (10.0.1, 10.0.125.57005), X64 RyuJIT x86-64-v3 [AttachedDebugger]
77
ShortRun : .NET 10.0.1 (10.0.1, 10.0.125.57005), X64 RyuJIT x86-64-v3
88
99
10-
| Method | Mean | Error | StdDev | Allocated
11-
| :-------------------- | --------: | ---------: | --------: | ---------:
12-
| JsonDiff_JsonNode | 438.2 ns | 45.95 ns | 2.52 ns | 1.3 KB
13-
| JsonDiff_JsonElement | 663.2 ns | 538.12 ns | 29.50 ns | 1.93 KB
14-
| | | | |
15-
| JsonDiff_JsonNode | 347.0 ns | 117.11 ns | 6.42 ns | 1.2 KB
16-
| JsonDiff_JsonElement | 472.1 ns | 175.95 ns | 9.64 ns | 1.66 KB
10+
| Method | Mean | Error | StdDev | Allocated
11+
| :-------------------- | --------: | ---------: | -------: | ---------:
12+
| JsonDiff_JsonNode | 431.2 ns | 109.04 ns | 5.98 ns | 1.3 KB
13+
| JsonDiff_JsonElement | 636.4 ns | 70.49 ns | 3.86 ns | 1.93 KB
14+
| | | | |
15+
| JsonDiff_JsonNode | 335.6 ns | 80.57 ns | 4.42 ns | 1.2 KB
16+
| JsonDiff_JsonElement | 507.5 ns | 180.81 ns | 9.91 ns | 1.66 KB
1717
```

‎test/Hyperbee.Json.Benchmark/benchmark/results/Hyperbee.Json.Benchmark.JsonPatchBenchmark-report-jsonpath.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
BenchmarkDotNet v0.15.8, Windows 11 (10.0.26200.7462/25H2/2025Update/HudsonValley2)
44
12th Gen Intel Core i9-12900HK 2.50GHz, 1 CPU, 20 logical and 14 physical cores
55
.NET SDK 10.0.101
6-
[Host] : .NET 10.0.1 (10.0.1, 10.0.125.57005), X64 RyuJIT x86-64-v3 DEBUG
6+
[Host] : .NET 10.0.1 (10.0.1, 10.0.125.57005), X64 RyuJIT x86-64-v3 [AttachedDebugger]
77
ShortRun : .NET 10.0.1 (10.0.1, 10.0.125.57005), X64 RyuJIT x86-64-v3
88
99
10-
| Method | Mean | Error | StdDev | Allocated
11-
| :----------------------- | ---------: | ---------: | ---------: | ---------:
12-
| Hyperbee_JsonElement | 79.45 ns | 34.78 ns | 1.906 ns | 392 B
13-
| Hyperbee_JsonNode | 84.85 ns | 64.17 ns | 3.517 ns | 392 B
14-
| JsonEverything_JsonNode | 188.61 ns | 319.11 ns | 17.491 ns | 968 B
15-
| AspNetCore_JsonNode | 353.32 ns | 106.43 ns | 5.834 ns | 1024 B
10+
| Method | Mean | Error | StdDev | Allocated
11+
| :----------------------- | ---------: | ---------: | --------: | ---------:
12+
| Hyperbee_JsonNode | 78.55 ns | 14.146 ns | 0.775 ns | 392 B
13+
| Hyperbee_JsonElement | 83.08 ns | 11.340 ns | 0.622 ns | 392 B
14+
| JsonEverything_JsonNode | 184.07 ns | 2.770 ns | 0.152 ns | 968 B
15+
| AspNetCore_JsonNode | 325.06 ns | 51.946 ns | 2.847 ns | 1024 B
1616
```

0 commit comments

Comments
 (0)