diff --git a/Directory.Build.props b/Directory.Build.props index 5fe723a..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 + + 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 0000000..812447a Binary files /dev/null and b/test/Hyperbee.Json.Cts.lnk differ diff --git a/test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj b/test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj index c8d8175..e4530c9 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..44ba4c8 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 @@ - - - - - + + + + + diff --git a/version.json b/version.json index 2dc7399..3fb1f9b 100644 --- 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" + } } \ No newline at end of file