Skip to content

Commit d4a0c74

Browse files
varndellwagglebeevarndellwagglebee
committed
Centralized the nuget packages and updated format.yml
1 parent c7bd3af commit d4a0c74

9 files changed

Lines changed: 69 additions & 47 deletions

File tree

‎.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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
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" />
5+
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
66

77
<!-- SourceLink for GitHub -->
8-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
8+
<PackageReference Include="Microsoft.SourceLink.GitHub">
99
<PrivateAssets>all</PrivateAssets>
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
</PackageReference>
1212

13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
13+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
1414
</ItemGroup>
1515

1616
<!-- SourceLink / build hygiene -->
@@ -45,4 +45,9 @@
4545
PackagePath="\"
4646
Link="LICENSE" />
4747
</ItemGroup>
48+
<!-- Global project properies -->
49+
<PropertyGroup>
50+
<ImplicitUsings>enable</ImplicitUsings>
51+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
52+
</PropertyGroup>
4853
</Project>

‎Directory.Packages.props‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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="BenchmarkDotNet" Version="0.15.8" />
24+
<PackageVersion Include="JsonCons.JsonPath" Version="1.1.0" />
25+
<PackageVersion Include="JsonCraft.JsonPath" Version="1.0.0" />
26+
<PackageVersion Include="JsonPatch.Net" Version="4.0.0" />
27+
<PackageVersion Include="JsonPath.Net" Version="2.2.0" />
28+
<PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="10.0.1" />
29+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
30+
</ItemGroup>
31+
</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" />

‎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: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net10.0</TargetFramework>
5+
<TargetFrameworks>net10.0</TargetFrameworks>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
@@ -14,26 +14,25 @@
1414
</ItemGroup>
1515

1616
<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" />
17+
<PackageReference Include="BenchmarkDotNet" />
18+
<PackageReference Include="JsonCons.JsonPath" />
19+
<PackageReference Include="JsonCraft.JsonPath" />
20+
<PackageReference Include="JsonPatch.Net" />
21+
<PackageReference Include="JsonPath.Net" />
22+
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" />
23+
<PackageReference Include="Newtonsoft.Json" />
2424
</ItemGroup>
2525

2626
<ItemGroup>
2727
<ProjectReference Include="..\..\src\Hyperbee.Json\Hyperbee.Json.csproj" />
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
32-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
31+
<PackageReference Update="Microsoft.SourceLink.GitHub">
3332
<PrivateAssets>all</PrivateAssets>
3433
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3534
</PackageReference>
36-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
35+
<PackageReference Update="Nerdbank.GitVersioning" />
3736
</ItemGroup>
3837

3938
</Project>

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@
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
7-
ShortRun : .NET 10.0.1 (10.0.1, 10.0.125.57005), X64 RyuJIT x86-64-v3
6+
[Host] : .NET 10.0.1 (10.0.1, 10.0.125.57005), X64 RyuJIT x86-64-v3 [AttachedDebugger]
87
98
109
| Method | Mean | Error
1110
| :------------------------ | ----: | -----:
1211
| FilterParser_JsonElement | NA | NA
13-
| FilterParser_JsonNode | NA | NA
1412
1513
Benchmarks with issues:
1614
FilterExpressionParserEvaluator.FilterParser_JsonElement: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3) [Filter=("world" == 'world') && (true || false)]
17-
FilterExpressionParserEvaluator.FilterParser_JsonNode: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3) [Filter=("world" == 'world') && (true || false)]
1815
```

‎test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
5-
<ImplicitUsings>enable</ImplicitUsings>
64
<Nullable>enable</Nullable>
7-
85
<IsPackable>false</IsPackable>
96
<IsTestProject>true</IsTestProject>
107
</PropertyGroup>
118

129
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" Version="6.0.4">
10+
<PackageReference Include="coverlet.collector">
1411
<PrivateAssets>all</PrivateAssets>
1512
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1613
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
18-
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
19-
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
15+
<PackageReference Include="MSTest.TestFramework" />
16+
<PackageReference Include="MSTest.TestAdapter" />
2017
</ItemGroup>
2118

2219
<ItemGroup>
@@ -28,12 +25,12 @@
2825
</ItemGroup>
2926

3027
<ItemGroup>
31-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
32-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
28+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" />
29+
<PackageReference Update="Microsoft.SourceLink.GitHub">
3330
<PrivateAssets>all</PrivateAssets>
3431
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3532
</PackageReference>
36-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
33+
<PackageReference Update="Nerdbank.GitVersioning" />
3734
</ItemGroup>
3835

3936
</Project>

‎test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
43
<IsPackable>false</IsPackable>
54
<RootNamespace>Hyperbee.Json.Tests</RootNamespace>
65
</PropertyGroup>
76
<ItemGroup>
87
<EmbeddedResource Include="TestSupport\Json\BookStore.json" />
98
</ItemGroup>
109
<ItemGroup>
11-
<PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
13-
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
14-
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
15-
<PackageReference Include="YamlDotNet" Version="16.3.0" />
10+
<PackageReference Include="BenchmarkDotNet" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
12+
<PackageReference Include="MSTest.TestFramework" />
13+
<PackageReference Include="MSTest.TestAdapter" />
14+
<PackageReference Include="YamlDotNet"/>
1615
</ItemGroup>
1716
<ItemGroup>
1817
<ProjectReference Include="..\..\src\Hyperbee.Json\Hyperbee.Json.csproj" />
1918
</ItemGroup>
2019
<ItemGroup>
21-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
22-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
20+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" />
21+
<PackageReference Update="Microsoft.SourceLink.GitHub">
2322
<PrivateAssets>all</PrivateAssets>
2423
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2524
</PackageReference>
26-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
25+
<PackageReference Update="Nerdbank.GitVersioning" />
2726
</ItemGroup>
2827
</Project>

0 commit comments

Comments
 (0)