From 358eeaed5c0ff5b9755abedd96a60f2e7e7d32ed Mon Sep 17 00:00:00 2001 From: "annette.findley" Date: Tue, 20 Jan 2026 10:14:52 -0500 Subject: [PATCH 1/5] Merge pull request #131 from Stillpoint-Software/dependabot/nuget/test/Hyperbee.Json.Cts/multi-4071af9222 Bump MSTest.TestAdapter to 3.10.1 --- test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj | 8 ++++---- test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj b/test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj index c8d8175..aa31784 100644 --- a/test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj +++ b/test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj @@ -1,4 +1,4 @@ - + enable @@ -11,9 +11,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj b/test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj index f3ad172..c98c93c 100644 --- a/test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj +++ b/test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj @@ -1,4 +1,4 @@ - + false Hyperbee.Json.Tests @@ -7,11 +7,11 @@ - - - - - + + + + + From dc0f8b0f39efa87e4211e2a9c8d1bfa58e9e0f15 Mon Sep 17 00:00:00 2001 From: "annette.findley" Date: Tue, 20 Jan 2026 12:30:08 -0500 Subject: [PATCH 2/5] Set for multi-target for 8,9, and 10 --- Directory.Build.props | 2 +- Directory.Packages.props | 23 +++++++++++++++--- nuget.config | 7 ++++++ src/Hyperbee.Json/Hyperbee.Json.csproj | 1 - test/Hyperbee.Json.Benchmark/Config.cs | 15 +++++++++++- .../Hyperbee.Json.Benchmark.csproj | 6 ++++- .../JsonPathParseAndSelectEvaluator.cs | 3 +++ test/Hyperbee.Json.Cts.lnk | Bin 0 -> 1393 bytes .../Hyperbee.Json.Cts.csproj | 6 ++--- .../Hyperbee.Json.Tests.csproj | 10 ++++---- 10 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 nuget.config create mode 100644 test/Hyperbee.Json.Cts.lnk diff --git a/Directory.Build.props b/Directory.Build.props index 5fe723a..1e7452d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -43,6 +43,6 @@ enable - net10.0 + net10.0;net9.0;net8.0 diff --git a/Directory.Packages.props b/Directory.Packages.props index 5a1423a..8fca60f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -20,13 +20,28 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..3a9f6b3 --- /dev/null +++ b/nuget.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/Hyperbee.Json/Hyperbee.Json.csproj b/src/Hyperbee.Json/Hyperbee.Json.csproj index 3a6111e..de13f7c 100644 --- a/src/Hyperbee.Json/Hyperbee.Json.csproj +++ b/src/Hyperbee.Json/Hyperbee.Json.csproj @@ -33,7 +33,6 @@ - diff --git a/test/Hyperbee.Json.Benchmark/Config.cs b/test/Hyperbee.Json.Benchmark/Config.cs index 433ac8a..652abbd 100644 --- 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 index 198d5cd..1418ef2 100644 --- a/test/Hyperbee.Json.Benchmark/Hyperbee.Json.Benchmark.csproj +++ b/test/Hyperbee.Json.Benchmark/Hyperbee.Json.Benchmark.csproj @@ -14,7 +14,6 @@ - @@ -23,6 +22,11 @@ + + + + + diff --git a/test/Hyperbee.Json.Benchmark/JsonPathParseAndSelectEvaluator.cs b/test/Hyperbee.Json.Benchmark/JsonPathParseAndSelectEvaluator.cs index 875d376..67ee6ec 100644 --- 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 new file mode 100644 index 0000000000000000000000000000000000000000..812447a4dbfc507a9000969bad404bc1283f1882 GIT binary patch literal 1393 zcmb_cUr1A76hG5pP9m>ug{7%Qg&EEbCe%nWH|HF~JGx_PUc%HXPOrOT8wo8v* zX~n77Z(Ths&!!7fR8|n610jM0ejEe1lL;pk?kjbL5(AvO(&=;&w=Kb47dG*%pSX9+ z-0C&l$NDtDK?uCaEF!anGas&ry+vU+@dIH7?6t1)<7E+}-odc|PDP=oCeTUyr0_zU zkNu`K3geMQWa?C+Zot?D&_gQ(QOk$E*-)kE%-2M_7zhbLlsEszKPU5>bi^OO#8r`) zryt`LkdLC)p-w#CCcZZEOVk!O2jEs%Ns0C;>dHfuleIY?Q%{3^UDOUGYCTv`Er{o` z5$(!Ig+l8h1T_(%MI<9GENenkY%B*@CRU+C5GB75;JJ`j6#bId7vftw(a<0W`qrT2 z<0%cieZ}NJlim_SMJ*fapA!l9I2g_0&U_ce@ODj*EgR%m{}SCaw5O2= z1wz-nk!#(Ce(4A(rS7HY1N|UKOMXAZv>9QOpN#-{(2T__;`hcMCY|1bkWW`NE%ofh z-wLg7ASlLbt&RC5{ZkqDW?+JSlR4Ro_8f8`<`TsJOAwz({6?yVVxV>yL4n@h-fkW3 o_1lN-rTSROndmOGw~&J!(e?fA)Y4d%all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj b/test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj index c98c93c..44ba4c8 100644 --- a/test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj +++ b/test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + From 915d1f52d1020159924c99dff9643862a60575d6 Mon Sep 17 00:00:00 2001 From: "annette.findley" Date: Tue, 20 Jan 2026 15:31:38 -0500 Subject: [PATCH 3/5] Cleanup --- Directory.Build.props | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1e7452d..64b88ea 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,9 +1,11 @@ - + + + $(NoWarn);NU1507;MSTEST0001 + $(WarningsNotAsErrors);MSTEST0001 + - - @@ -43,6 +45,7 @@ enable + net10.0;net9.0;net8.0 From 670e49a48d769f715bdcc584e7bd87c83cf130fb Mon Sep 17 00:00:00 2001 From: varndellwagglebee Date: Wed, 21 Jan 2026 12:28:47 +0000 Subject: [PATCH 4/5] chore(nbgv): set version via CI: 3.2-alpha --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 2dc7399..9d5fa6a 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$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$", From 3e487999480c9cd090fa04e49d68b12eda920dc9 Mon Sep 17 00:00:00 2001 From: "annette.findley" Date: Wed, 21 Jan 2026 09:09:42 -0500 Subject: [PATCH 5/5] updated version tags --- version.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/version.json b/version.json index 9d5fa6a..3fb1f9b 100644 --- a/version.json +++ b/version.json @@ -3,7 +3,10 @@ "version": "3.2-alpha", "publicReleaseRefSpec": [ "^refs/heads/main$", - "^refs/heads/hotfix$", + "^refs/heads/hotfix\\/.+$", "^refs/heads/v\\d+\\.\\d+$" - ] + ], + "release": { + "firstUnstableTag": "alpha" + } } \ No newline at end of file