Merge branch 'develop' into fix-left-function-compare

Author: varndellwagglebee

.github/workflows/create_release.yml

@@ -44,12 +44,12 @@ jobs:
           VERSION='${{ inputs.version }}'
           INCR='${{ inputs.increment }}'
           if [[ "$MODE" == "explicit" && -z "$VERSION" ]]; then
-            echo "❌ mode=explicit requires 'version' (e.g., 1.3-alpha)."; exit 1
+            echo "? mode=explicit requires 'version' (e.g., 1.3-alpha)."; exit 1
           fi
           if [[ "$MODE" == "bump" && -z "$INCR" ]]; then
-            echo "❌ mode=bump requires 'increment' (major|minor|patch)."; exit 1
+            echo "? mode=bump requires 'increment' (major|minor|patch)."; exit 1
           fi
-          echo "✅ inputs look good."
+          echo "? inputs look good."
 
   set-version:
     needs: validate-inputs

.github/workflows/format.yml

@@ -8,7 +8,7 @@ on:
     branches: [main, develop]
 
   workflow_run:
-    workflows: [Create Prerelease, Create Release]
+    workflows: [Create Release]
     types: [requested]
 
 permissions:

.github/workflows/pack_publish.yml

@@ -8,8 +8,8 @@ permissions:
   contents: write
   pull-requests: write
   packages: write
-  statuses: write 
-  
+  statuses: write
+
 jobs:
   set-config:
     uses: Stillpoint-Software/shared-workflows/.github/workflows/determine_build_configuration.yml@main
@@ -18,17 +18,26 @@ jobs:
       target_branch: ${{ github.event.release.target_commitish }}
       override_build_configuration: ''                 
       prerelease: ${{ github.event.release.prerelease }} # true/false from the release
-
-  publish:
+  
+  tests:
     needs: set-config
+    uses: Stillpoint-Software/shared-workflows/.github/workflows/run_tests.yml@main
+    with:
+      branch: ${{ github.event.release.target_commitish }}
+      solution_name: ${{ vars.SOLUTION_NAME }}
+  
+  publish:
+    needs: [set-config, tests]
     uses: Stillpoint-Software/shared-workflows/.github/workflows/pack_and_publish.yml@main
     with:
       build_configuration: ${{ needs.set-config.outputs.build_configuration }}
     secrets:
       NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+
   result:
-    needs: [publish]
+    needs: [publish, tests]
     if: always()
     runs-on: ubuntu-latest
     steps:
+       - run: echo "Tests result = ${{ needs.tests.result }}"
        - run: echo "Pack & Publish result = ${{ needs.publish.result }}"

.github/workflows/run_tests.yml

@@ -2,7 +2,7 @@ name: Run Tests
 
 on:
   workflow_run:
-    workflows: [Create Prerelease, Create Release]
+    workflows: [Create Release]
     types: [requested]
     branches: [main, develop]        
   workflow_dispatch:

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>

src/Hyperbee.Json/Hyperbee.Json.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <IsPackable>true</IsPackable>
 <Authors>Stillpoint Software, Inc.</Authors>
@@ -32,8 +32,7 @@
     <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 Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="Nerdbank.GitVersioning" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" />
+    <PackageReference Update="Nerdbank.GitVersioning" />
   </ItemGroup>
 </Project>

test/Hyperbee.Json.Benchmark/Helpers/Config.cs

@@ -1,4 +1,4 @@
-using BenchmarkDotNet.Columns;
+using BenchmarkDotNet.Columns;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
 using BenchmarkDotNet.Environments;
@@ -13,17 +13,18 @@ public class Config : ManualConfig
 {
     public Config()
     {
+
         AddJob( Job.ShortRun
-            .WithRuntime( CoreRuntime.Core90 )
-            .WithId( ".NET 8" ) );
+         .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" ) );
+         .WithRuntime( CoreRuntime.Core10_0 )
+         .WithId( ".NET 10" ) );
 
         AddValidator( JitOptimizationsValidator.DontFailOnError );
         AddLogger( ConsoleLogger.Default );

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

@@ -27,6 +27,11 @@
     <PackageReference Include="JsonCraft.JsonPath" />
   </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.Benchmark/JsonPathBenchmark.cs

@@ -1,4 +1,4 @@
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Engines;
@@ -195,4 +195,18 @@ public void JsonCons_JsonElement()
 
         Consume( select, first );
     }
+
+#if NET9_0_OR_GREATER
+    [Benchmark( Description = "JsonCraft.JsonElement" )]
+    public void JsonCraft_JsonElement()
+    {
+        var (filter, first) = GetFilter();
+
+        var element = JsonDocument.Parse( Document ).RootElement;
+        var select = JsonCraft.JsonPath.JsonExtensions.SelectElements( element, filter );
+
+        Consume( select, first );
+    }
+#endif
+
 }