Fixing Merge Issues

Author: varndellwagglebee

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>
@@ -46,9 +48,4 @@
     <!-- 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>
-
-  <!-- Suppress common warnings -->
-  <PropertyGroup Condition="'$(IsTestProject)' == 'true'">
-    <NoWarn>$(NoWarn);MSTEST0001</NoWarn>
-  </PropertyGroup>
 </Project>

Directory.Packages.props

@@ -1,11 +1,11 @@
 <Project>
-<!-- Enable Central Package Management -->
-<PropertyGroup>
-  <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-  <!-- Suppress NuGet version constraint warnings -->
-  <NoWarn>$(NoWarn);NU1608</NoWarn>
-</PropertyGroup>
-  
+  <!-- Enable Central Package Management -->
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <!-- Suppress NuGet version constraint warnings -->
+    <NoWarn>$(NoWarn);NU1608</NoWarn>
+  </PropertyGroup>
+
   <!-- Common packages for all frameworks -->
   <ItemGroup>
     <!-- Core Application Dependencies -->
@@ -33,19 +33,21 @@
     <!-- Benchmarking -->
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
   </ItemGroup>
-  
+
   <!-- .NET 8 specific packages (compatibility) -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <!-- JsonCraft.JsonPath doesn't support .NET 8 -->
+    <PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="8.0.23" />
   </ItemGroup>
-  
+
   <!-- .NET 9+ specific packages -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0'">
     <PackageVersion Include="JsonCraft.JsonPath" Version="1.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="9.0.12" />
   </ItemGroup>
-  
+
   <!-- .NET 10 specific packages (primary target) -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-    <!-- Add .NET 10 specific package versions here if needed -->
+    <PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="10.0.2" />
+    <PackageVersion Include="JsonCraft.JsonPath" Version="1.1.0" />
   </ItemGroup>
 </Project>

test/Hyperbee.Json.Benchmark/Helpers/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,18 @@ 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(

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

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-<PropertyGroup>
-  <!-- Override to single target for executables -->
-  <TargetFramework>net10.0</TargetFramework>
-  <OutputType>Exe</OutputType>
-  <IsPackable>false</IsPackable>
-</PropertyGroup>
+  <PropertyGroup>
+    <!-- Override to single target for executables -->
+    <TargetFramework>net10.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
 
   <ItemGroup>
     <Compile Remove="benchmark\**" />
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
     <PackageReference Include="JsonCons.JsonPath" />
-    <PackageReference Include="JsonCraft.JsonPath" Condition="'$(TargetFramework)' == 'net10.0'" />
+    <PackageReference Include="JsonCraft.JsonPath"/>
     <PackageReference Include="JsonPatch.Net" />
     <PackageReference Include="JsonPath.Net" />
     <PackageReference Include="Microsoft.AspNetCore.JsonPatch" />
@@ -25,6 +25,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>

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

@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-<PropertyGroup>
-  <!-- Inherits net10.0;net9.0;net8.0 from Directory.Build.props -->
-  <IsPackable>false</IsPackable>
-  <IsTestProject>true</IsTestProject>
-  <RootNamespace>Hyperbee.Json.Tests</RootNamespace>
-</PropertyGroup>
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <RootNamespace>Hyperbee.Json.Tests</RootNamespace>
+  </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="TestSupport\Json\BookStore.json" />
   </ItemGroup>