Merge pull request #156 from Stillpoint-Software/develop

varndellwagglebee · web-flow · commit 3b75b22947e6 · 2026-01-21T12:36:23.000-05:00
Develop
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,11 @@
 <Project>
-  <!-- Shared package refs -->
+  <PropertyGroup>
+    <!-- Suppress NU1507 (multiple package sources with CPM) -->
+    <NoWarn>$(NoWarn);NU1507;MSTEST0001</NoWarn>
+    <WarningsNotAsErrors>$(WarningsNotAsErrors);MSTEST0001</WarningsNotAsErrors>
+  </PropertyGroup>
   <ItemGroup>
-    <!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
     <PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
-    <!-- SourceLink for GitHub -->
     <PackageReference Include="Microsoft.SourceLink.GitHub"/>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
   </ItemGroup>
@@ -43,6 +45,7 @@
   <!-- Global project properies -->
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
-    <TargetFramework>net10.0</TargetFramework>
+    <!-- Primary target: .NET 10 (next LTS), with .NET 9 for current support, .NET 8 for compatibility -->
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -20,13 +20,28 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
     <PackageVersion Include="JsonCons.JsonPath" Version="1.1.0" />
     <PackageVersion Include="JsonPatch.Net" Version="4.0.1" />
     <PackageVersion Include="JsonPath.Net" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="10.0.1" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
-    <!-- Benchmarking -->
-    <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
+  </ItemGroup>
+
+  <!-- .NET 8.0 specific packages -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="8.0.23" />
+  </ItemGroup>
+
+  <!-- .NET 9.0 specific packages -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
     <PackageVersion Include="JsonCraft.JsonPath" Version="1.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="9.0.12" />
+  </ItemGroup>
+
+  <!-- .NET 10.0 specific packages -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="10.0.2" />
+    <PackageVersion Include="JsonCraft.JsonPath" Version="1.1.0" />
   </ItemGroup>
+
 </Project>
diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+</configuration>
diff --git a/src/Hyperbee.Json/Hyperbee.Json.csproj b/src/Hyperbee.Json/Hyperbee.Json.csproj
@@ -33,7 +33,6 @@
     <None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="/" />
     <None Include="..\..\README.md" Pack="true" Visible="true" PackagePath="/" Link="README.md" />
     <None Include="..\..\LICENSE" Pack="true" Visible="false" PackagePath="/" />
-    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" />
     <PackageReference Update="Nerdbank.GitVersioning" />
   </ItemGroup>
diff --git a/test/Hyperbee.Json.Benchmark/Config.cs b/test/Hyperbee.Json.Benchmark/Config.cs
@@ -1,6 +1,7 @@
 ﻿using BenchmarkDotNet.Columns;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Environments;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Reports;
@@ -12,7 +13,19 @@ public class Config : ManualConfig
 {
     public Config()
     {
-        AddJob( Job.ShortRun );
+
+        AddJob( Job.ShortRun
+         .WithRuntime( CoreRuntime.Core90 )
+         .WithId( ".NET 8" ) );
+
+        AddJob( Job.ShortRun
+            .WithRuntime( CoreRuntime.Core90 )
+            .WithId( ".NET 9" ) );
+
+        AddJob( Job.ShortRun
+         .WithRuntime( CoreRuntime.Core10_0 )
+         .WithId( ".NET 10" ) );
+
         AddValidator( JitOptimizationsValidator.DontFailOnError );
         AddLogger( ConsoleLogger.Default );
         AddColumnProvider(
diff --git a/test/Hyperbee.Json.Benchmark/Hyperbee.Json.Benchmark.csproj b/test/Hyperbee.Json.Benchmark/Hyperbee.Json.Benchmark.csproj
@@ -14,7 +14,6 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
     <PackageReference Include="JsonCons.JsonPath" />
-    <PackageReference Include="JsonCraft.JsonPath" />
     <PackageReference Include="JsonPatch.Net" />
     <PackageReference Include="JsonPath.Net" />
     <PackageReference Include="Microsoft.AspNetCore.JsonPatch" />
@@ -23,6 +22,11 @@
     <PackageReference Update="Nerdbank.GitVersioning" />
   </ItemGroup>
 
+  <!-- JsonCraft.JsonPath is only available for .NET 9.0 and later -->
+  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
+    <PackageReference Include="JsonCraft.JsonPath" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Hyperbee.Json\Hyperbee.Json.csproj" />
   </ItemGroup>
diff --git a/test/Hyperbee.Json.Benchmark/JsonPathParseAndSelectEvaluator.cs b/test/Hyperbee.Json.Benchmark/JsonPathParseAndSelectEvaluator.cs
@@ -172,6 +172,7 @@ public void JsonCons_JsonElement()
         Consume( select, first );
     }
 
+#if NET9_0_OR_GREATER
     [Benchmark( Description = "JsonCraft.JsonElement" )]
     public void JsonCraft_JsonElement()
     {
@@ -182,4 +183,6 @@ public void JsonCraft_JsonElement()
 
         Consume( select, first );
     }
+#endif
+
 }
diff --git a/test/Hyperbee.Json.Cts.lnk b/test/Hyperbee.Json.Cts.lnk
diff --git a/test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj b/test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Nullable>enable</Nullable>
@@ -11,9 +11,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk"  />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="MSTest.TestAdapter" />
     <PackageReference Include="MSTest.TestFramework" />
-    <PackageReference Include="MSTest.TestAdapter"  />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj b/test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <RootNamespace>Hyperbee.Json.Tests</RootNamespace>
@@ -7,11 +7,11 @@
     <EmbeddedResource Include="TestSupport\Json\BookStore.json" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet"  />
-    <PackageReference Include="Microsoft.NET.Test.Sdk"  />
-    <PackageReference Include="MSTest.TestFramework"  />
-    <PackageReference Include="MSTest.TestAdapter"  />
-    <PackageReference Include="YamlDotNet"/>
+    <PackageReference Include="BenchmarkDotNet" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="MSTest.TestAdapter" />
+    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="YamlDotNet" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Hyperbee.Json\Hyperbee.Json.csproj" />
diff --git a/version.json b/version.json
@@ -1,9 +1,12 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "3.1.2",
+  "version": "3.2-alpha",
   "publicReleaseRefSpec": [
     "^refs/heads/main$",
-    "^refs/heads/hotfix$",
+    "^refs/heads/hotfix\\/.+$",
     "^refs/heads/v\\d+\\.\\d+$"
-  ]
+  ],
+  "release": {
+    "firstUnstableTag": "alpha"
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,7 @@ public void JsonCons_JsonElement()`
`172`	`172`	`Consume( select, first );`
`173`	`173`	`}`
`174`	`174`
	`175`	`+#if NET9_0_OR_GREATER`
`175`	`176`	`[Benchmark( Description = "JsonCraft.JsonElement" )]`
`176`	`177`	`public void JsonCraft_JsonElement()`
`177`	`178`	`{`
`@@ -182,4 +183,6 @@ public void JsonCraft_JsonElement()`
`182`	`183`
`183`	`184`	`Consume( select, first );`
`184`	`185`	`}`
	`186`	`+#endif`
	`187`	`+`
`185`	`188`	`}`