diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b1d8726..8caadee 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "paket": { - "version": "9.0.2", + "version": "10.3.1", "commands": [ "paket" ], diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4716b72..ce6c67f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '9.0.101' + dotnet-version: '10.0.101' include-prerelease: true - name: NuGet cache @@ -55,7 +55,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '9.0.101' + dotnet-version: '10.0.101' include-prerelease: true - name: Download nupkg @@ -80,7 +80,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '9.0.101' + dotnet-version: '10.0.101' include-prerelease: true - name: Prepare diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index 17aeb63..8f48b93 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -241,8 +241,9 @@ $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[9]) - + %(PaketReferencesFileLinesInfo.PackageVersion) All runtime @@ -251,10 +252,8 @@ %(PaketReferencesFileLinesInfo.Aliases) true true - - - + %(PaketReferencesFileLinesInfo.PackageVersion) @@ -319,7 +318,17 @@ - + + + + + <_DefinedConditionProperties Include="@(_ConditionProperties)" Condition="$(%(Identity)) == 'true'"/> + + + <_ConditionsParameter> + <_ConditionsParameter Condition="@(_DefinedConditionProperties) != ''">--conditions @(_DefinedConditionProperties) + + diff --git a/benchmarks/FSharp.SystemTextJson.Benchmarks/FSharp.SystemTextJson.Benchmarks.fsproj b/benchmarks/FSharp.SystemTextJson.Benchmarks/FSharp.SystemTextJson.Benchmarks.fsproj index ee1426b..5c8aced 100644 --- a/benchmarks/FSharp.SystemTextJson.Benchmarks/FSharp.SystemTextJson.Benchmarks.fsproj +++ b/benchmarks/FSharp.SystemTextJson.Benchmarks/FSharp.SystemTextJson.Benchmarks.fsproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 false diff --git a/build/build.fsproj b/build/build.fsproj index fabea81..a7625ea 100644 --- a/build/build.fsproj +++ b/build/build.fsproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/global.json b/global.json index d3adbc4..e6ae825 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.101", - "rollForward": "latestFeature" + "rollForward": "latestMinor", + "version": "10.0.100" } -} +} \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 923d5af..f4d8e76 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -3,26 +3,26 @@ storage none source https://api.nuget.org/v3/index.json nuget FSharp.Core >= 4.7.0 lowest_matching:true -nuget Microsoft.SourceLink.GitHub prerelease copy_local:true +nuget Microsoft.SourceLink.GitHub copy_local:true nuget Nerdbank.GitVersioning copy_local:true -nuget System.Text.Json >= 6.0.10 lowest_matching: true +nuget System.Text.Json >= 8.0.6 lowest_matching: true group test -framework net9.0 +framework net10.0 storage none source https://api.nuget.org/v3/index.json nuget FSharp.Core >= 5.0 nuget FsCheck.XUnit nuget Microsoft.NET.Test.Sdk -nuget System.Text.Json >= 8.0.5 prerelease +nuget System.Text.Json >= 8.0.5 nuget xunit nuget xunit.runner.visualstudio nuget BenchmarkDotNet nuget Newtonsoft.Json group trimtest -framework net9.0 +framework net10.0 storage none source https://api.nuget.org/v3/index.json @@ -34,7 +34,7 @@ nuget xunit.console nuget Microsoft.NET.Test.Sdk group fake -framework net9.0 +framework net10.0 storage none source https://api.nuget.org/v3/index.json diff --git a/paket.lock b/paket.lock index 3519282..73027e4 100644 --- a/paket.lock +++ b/paket.lock @@ -3,312 +3,299 @@ RESTRICTION: == netstandard2.0 NUGET remote: https://api.nuget.org/v3/index.json FSharp.Core (4.7) - Microsoft.Bcl.AsyncInterfaces (8.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - Microsoft.Build.Tasks.Git (8.0) - copy_local: true - Microsoft.SourceLink.Common (8.0) - copy_local: true - Microsoft.SourceLink.GitHub (8.0) - copy_local: true - Microsoft.Build.Tasks.Git (>= 8.0) - Microsoft.SourceLink.Common (>= 8.0) - Nerdbank.GitVersioning (3.6.133) - copy_local: true - System.Buffers (4.5.1) - System.Memory (4.5.5) - System.Buffers (>= 4.5.1) - System.Numerics.Vectors (>= 4.4) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - System.Numerics.Vectors (4.5) - System.Runtime.CompilerServices.Unsafe (6.0) - System.Text.Encodings.Web (8.0) + Microsoft.Bcl.AsyncInterfaces (10.0.7) + System.Threading.Tasks.Extensions (>= 4.6.3) + Microsoft.SourceLink.GitHub (10.0.203) - copy_local: true + Nerdbank.GitVersioning (3.9.50) - copy_local: true + System.Buffers (4.6.1) + System.Memory (4.6.3) + System.Buffers (>= 4.6.1) + System.Numerics.Vectors (>= 4.6.1) + System.Runtime.CompilerServices.Unsafe (>= 6.1.2) + System.Numerics.Vectors (4.6.1) + System.Runtime.CompilerServices.Unsafe (6.1.2) + System.Text.Encodings.Web (10.0.7) + System.Buffers (>= 4.6.1) + System.Memory (>= 4.6.3) + System.Runtime.CompilerServices.Unsafe (>= 6.1.2) + System.Text.Json (8.0.6) + Microsoft.Bcl.AsyncInterfaces (>= 8.0) System.Buffers (>= 4.5.1) System.Memory (>= 4.5.5) System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Json (6.0.10) - Microsoft.Bcl.AsyncInterfaces (>= 6.0) - System.Buffers (>= 4.5.1) - System.Memory (>= 4.5.4) - System.Numerics.Vectors (>= 4.5) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (>= 6.0) + System.Text.Encodings.Web (>= 8.0) System.Threading.Tasks.Extensions (>= 4.5.4) - System.Threading.Tasks.Extensions (4.5.4) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) + System.Threading.Tasks.Extensions (4.6.3) + System.Runtime.CompilerServices.Unsafe (>= 6.1.2) GROUP fake STORAGE: NONE -RESTRICTION: == net9.0 +RESTRICTION: == net10.0 NUGET remote: https://api.nuget.org/v3/index.json BlackFox.VsWhere (1.1) FSharp.Core (>= 4.2.3) Microsoft.Win32.Registry (>= 4.7) - Fake.Core.CommandLineParsing (6.1.3) + Fake.Core.CommandLineParsing (6.1.4) FParsec (>= 1.1.1) - FSharp.Core (>= 8.0.301) - Fake.Core.Context (6.1.3) - FSharp.Core (>= 8.0.301) - Fake.Core.Environment (6.1.3) - FSharp.Core (>= 8.0.301) - Fake.Core.FakeVar (6.1.3) - Fake.Core.Context (>= 6.1.3) - FSharp.Core (>= 8.0.301) - Fake.Core.Process (6.1.3) - Fake.Core.Environment (>= 6.1.3) - Fake.Core.FakeVar (>= 6.1.3) - Fake.Core.String (>= 6.1.3) - Fake.Core.Trace (>= 6.1.3) - Fake.IO.FileSystem (>= 6.1.3) - FSharp.Core (>= 8.0.301) + FSharp.Core (>= 8.0.400) + Fake.Core.Context (6.1.4) + FSharp.Core (>= 8.0.400) + Fake.Core.Environment (6.1.4) + FSharp.Core (>= 8.0.400) + Fake.Core.FakeVar (6.1.4) + Fake.Core.Context (>= 6.1.4) + FSharp.Core (>= 8.0.400) + Fake.Core.Process (6.1.4) + Fake.Core.Environment (>= 6.1.4) + Fake.Core.FakeVar (>= 6.1.4) + Fake.Core.String (>= 6.1.4) + Fake.Core.Trace (>= 6.1.4) + Fake.IO.FileSystem (>= 6.1.4) + FSharp.Core (>= 8.0.400) System.Collections.Immutable (>= 8.0) - Fake.Core.SemVer (6.1.3) - FSharp.Core (>= 8.0.301) - Fake.Core.String (6.1.3) - FSharp.Core (>= 8.0.301) - Fake.Core.Target (6.1.3) - Fake.Core.CommandLineParsing (>= 6.1.3) - Fake.Core.Context (>= 6.1.3) - Fake.Core.Environment (>= 6.1.3) - Fake.Core.FakeVar (>= 6.1.3) - Fake.Core.Process (>= 6.1.3) - Fake.Core.String (>= 6.1.3) - Fake.Core.Trace (>= 6.1.3) + Fake.Core.SemVer (6.1.4) + FSharp.Core (>= 8.0.400) + Fake.Core.String (6.1.4) + FSharp.Core (>= 8.0.400) + Fake.Core.Target (6.1.4) + Fake.Core.CommandLineParsing (>= 6.1.4) + Fake.Core.Context (>= 6.1.4) + Fake.Core.Environment (>= 6.1.4) + Fake.Core.FakeVar (>= 6.1.4) + Fake.Core.Process (>= 6.1.4) + Fake.Core.String (>= 6.1.4) + Fake.Core.Trace (>= 6.1.4) FSharp.Control.Reactive (>= 5.0.2) - FSharp.Core (>= 8.0.301) - Fake.Core.Tasks (6.1.3) - Fake.Core.Trace (>= 6.1.3) - FSharp.Core (>= 8.0.301) - Fake.Core.Trace (6.1.3) - Fake.Core.Environment (>= 6.1.3) - Fake.Core.FakeVar (>= 6.1.3) - FSharp.Core (>= 8.0.301) - Fake.Core.Xml (6.1.3) - Fake.Core.String (>= 6.1.3) - FSharp.Core (>= 8.0.301) - Fake.DotNet.Cli (6.1.3) - Fake.Core.Environment (>= 6.1.3) - Fake.Core.Process (>= 6.1.3) - Fake.Core.String (>= 6.1.3) - Fake.Core.Trace (>= 6.1.3) - Fake.DotNet.MSBuild (>= 6.1.3) - Fake.DotNet.NuGet (>= 6.1.3) - Fake.IO.FileSystem (>= 6.1.3) - FSharp.Core (>= 8.0.301) + FSharp.Core (>= 8.0.400) + Fake.Core.Tasks (6.1.4) + Fake.Core.Trace (>= 6.1.4) + FSharp.Core (>= 8.0.400) + Fake.Core.Trace (6.1.4) + Fake.Core.Environment (>= 6.1.4) + Fake.Core.FakeVar (>= 6.1.4) + FSharp.Core (>= 8.0.400) + Fake.Core.Xml (6.1.4) + Fake.Core.String (>= 6.1.4) + FSharp.Core (>= 8.0.400) + Fake.DotNet.Cli (6.1.4) + Fake.Core.Environment (>= 6.1.4) + Fake.Core.Process (>= 6.1.4) + Fake.Core.String (>= 6.1.4) + Fake.Core.Trace (>= 6.1.4) + Fake.DotNet.MSBuild (>= 6.1.4) + Fake.DotNet.NuGet (>= 6.1.4) + Fake.IO.FileSystem (>= 6.1.4) + FSharp.Core (>= 8.0.400) Mono.Posix.NETStandard (>= 1.0) - Newtonsoft.Json (>= 13.0.3) - Fake.DotNet.MSBuild (6.1.3) + Fake.DotNet.MSBuild (6.1.4) BlackFox.VsWhere (>= 1.1) - Fake.Core.Environment (>= 6.1.3) - Fake.Core.Process (>= 6.1.3) - Fake.Core.String (>= 6.1.3) - Fake.Core.Trace (>= 6.1.3) - Fake.IO.FileSystem (>= 6.1.3) - FSharp.Core (>= 8.0.301) + Fake.Core.Environment (>= 6.1.4) + Fake.Core.Process (>= 6.1.4) + Fake.Core.String (>= 6.1.4) + Fake.Core.Trace (>= 6.1.4) + Fake.IO.FileSystem (>= 6.1.4) + FSharp.Core (>= 8.0.400) MSBuild.StructuredLogger (>= 2.1.815) - Fake.DotNet.NuGet (6.1.3) - Fake.Core.Environment (>= 6.1.3) - Fake.Core.Process (>= 6.1.3) - Fake.Core.SemVer (>= 6.1.3) - Fake.Core.String (>= 6.1.3) - Fake.Core.Tasks (>= 6.1.3) - Fake.Core.Trace (>= 6.1.3) - Fake.Core.Xml (>= 6.1.3) - Fake.IO.FileSystem (>= 6.1.3) - Fake.Net.Http (>= 6.1.3) - FSharp.Core (>= 8.0.301) + Fake.DotNet.NuGet (6.1.4) + Fake.Core.Environment (>= 6.1.4) + Fake.Core.Process (>= 6.1.4) + Fake.Core.SemVer (>= 6.1.4) + Fake.Core.String (>= 6.1.4) + Fake.Core.Tasks (>= 6.1.4) + Fake.Core.Trace (>= 6.1.4) + Fake.Core.Xml (>= 6.1.4) + Fake.IO.FileSystem (>= 6.1.4) + Fake.Net.Http (>= 6.1.4) + FSharp.Core (>= 8.0.400) Newtonsoft.Json (>= 13.0.3) - NuGet.Protocol (>= 6.10.1) - Fake.IO.FileSystem (6.1.3) - Fake.Core.String (>= 6.1.3) - Fake.Core.Trace (>= 6.1.3) - FSharp.Core (>= 8.0.301) - Fake.Net.Http (6.1.3) - Fake.Core.Trace (>= 6.1.3) - FSharp.Core (>= 8.0.301) + NuGet.Protocol (>= 6.12.4) + Fake.IO.FileSystem (6.1.4) + Fake.Core.String (>= 6.1.4) + Fake.Core.Trace (>= 6.1.4) + FSharp.Core (>= 8.0.400) + Fake.Net.Http (6.1.4) + Fake.Core.Trace (>= 6.1.4) + FSharp.Core (>= 8.0.400) FParsec (1.1.1) FSharp.Core (>= 4.3.4) - FSharp.Control.Reactive (5.0.5) - FSharp.Core (>= 4.7.2) - System.Reactive (>= 5.0 < 6.0) - FSharp.Core (9.0.100) - Microsoft.Build.Framework (17.12.6) - Microsoft.Build.Utilities.Core (17.12.6) - Microsoft.Build.Framework (>= 17.12.6) - Microsoft.NET.StringTools (>= 17.12.6) - System.Collections.Immutable (>= 8.0) - System.Configuration.ConfigurationManager (>= 8.0) - Microsoft.NET.StringTools (17.12.6) + FSharp.Control.Reactive (6.1.2) + FSharp.Core (>= 6.0.7) + System.Reactive (>= 6.0.1) + FSharp.Core (10.1.203) + Microsoft.Build.Framework (18.4) + Microsoft.Build.Utilities.Core (18.4) + Microsoft.Build.Framework (>= 18.4) + Microsoft.NET.StringTools (>= 18.4) + System.Configuration.ConfigurationManager (>= 10.0.1) + System.Diagnostics.EventLog (>= 10.0.1) + System.Security.Cryptography.ProtectedData (>= 10.0.1) + Microsoft.NET.StringTools (18.4) Microsoft.Win32.Registry (5.0) System.Security.AccessControl (>= 5.0) System.Security.Principal.Windows (>= 5.0) Mono.Posix.NETStandard (1.0) - MSBuild.StructuredLogger (2.2.386) + MSBuild.StructuredLogger (2.3.154) Microsoft.Build.Framework (>= 17.5) Microsoft.Build.Utilities.Core (>= 17.5) - System.Collections.Immutable (>= 8.0) - Newtonsoft.Json (13.0.3) - NuGet.Common (6.12.1) - NuGet.Frameworks (>= 6.12.1) - NuGet.Configuration (6.12.1) - NuGet.Common (>= 6.12.1) - System.Security.Cryptography.ProtectedData (>= 4.4) - NuGet.Frameworks (6.12.1) - NuGet.Packaging (6.12.1) + Newtonsoft.Json (13.0.4) + NuGet.Common (7.3.1) + NuGet.Frameworks (>= 7.3.1) + NuGet.Configuration (7.3.1) + NuGet.Common (>= 7.3.1) + System.Security.Cryptography.ProtectedData (>= 8.0) + NuGet.Frameworks (7.3.1) + NuGet.Packaging (7.3.1) Newtonsoft.Json (>= 13.0.3) - NuGet.Configuration (>= 6.12.1) - NuGet.Versioning (>= 6.12.1) - System.Formats.Asn1 (>= 8.0.1) - System.Security.Cryptography.Pkcs (>= 6.0.4) - NuGet.Protocol (6.12.1) - NuGet.Packaging (>= 6.12.1) - NuGet.Versioning (6.12.1) - System.Collections.Immutable (9.0) - System.Configuration.ConfigurationManager (9.0) - System.Diagnostics.EventLog (>= 9.0) - System.Security.Cryptography.ProtectedData (>= 9.0) - System.Diagnostics.EventLog (9.0) - System.Formats.Asn1 (9.0) - System.Reactive (5.0) + NuGet.Configuration (>= 7.3.1) + NuGet.Versioning (>= 7.3.1) + System.Security.Cryptography.Pkcs (>= 8.0.1) + NuGet.Protocol (7.3.1) + NuGet.Packaging (>= 7.3.1) + NuGet.Versioning (7.3.1) + System.Collections.Immutable (10.0.7) + System.Configuration.ConfigurationManager (10.0.7) + System.Diagnostics.EventLog (>= 10.0.7) + System.Security.Cryptography.ProtectedData (>= 10.0.7) + System.Diagnostics.EventLog (10.0.7) + System.Reactive (6.1) System.Security.AccessControl (6.0.1) - System.Security.Cryptography.Pkcs (9.0) - System.Security.Cryptography.ProtectedData (9.0) + System.Security.Cryptography.Pkcs (10.0.7) + System.Security.Cryptography.ProtectedData (10.0.7) System.Security.Principal.Windows (5.0) GROUP test STORAGE: NONE -RESTRICTION: == net9.0 +RESTRICTION: == net10.0 NUGET remote: https://api.nuget.org/v3/index.json - BenchmarkDotNet (0.14) - BenchmarkDotNet.Annotations (>= 0.14) + BenchmarkDotNet (0.15.8) + BenchmarkDotNet.Annotations (>= 0.15.8) CommandLineParser (>= 2.9.1) Gee.External.Capstone (>= 2.3) - Iced (>= 1.17) - Microsoft.CodeAnalysis.CSharp (>= 4.1) - Microsoft.Diagnostics.Runtime (>= 2.2.332302) - Microsoft.Diagnostics.Tracing.TraceEvent (>= 3.1.8) + Iced (>= 1.21) + Microsoft.CodeAnalysis.CSharp (>= 4.14) + Microsoft.Diagnostics.Runtime (>= 3.1.512801) + Microsoft.Diagnostics.Tracing.TraceEvent (>= 3.1.21) Microsoft.DotNet.PlatformAbstractions (>= 3.1.6) - Perfolizer (0.3.17) - System.Management (>= 5.0) - BenchmarkDotNet.Annotations (0.14) + Perfolizer (0.6.1) + System.Management (>= 9.0.5) + BenchmarkDotNet.Annotations (0.15.8) CommandLineParser (2.9.1) - FsCheck (2.16.6) - FSharp.Core (>= 4.2.3) - FsCheck.Xunit (2.16.6) - FsCheck (2.16.6) - xunit.extensibility.execution (>= 2.2 < 3.0) - FSharp.Core (9.0.100) + FsCheck (3.3.2) + FSharp.Core (>= 5.0.2) + FsCheck.Xunit (3.3.2) + FsCheck (3.3.2) + FSharp.Core (>= 5.0.2) + xunit.extensibility.execution (>= 2.4.1 < 3.0) + FSharp.Core (10.1.203) Gee.External.Capstone (2.3) Iced (1.21) - Microsoft.CodeAnalysis.Analyzers (3.3.4) - Microsoft.CodeAnalysis.Common (4.8) - Microsoft.CodeAnalysis.Analyzers (>= 3.3.4) - System.Collections.Immutable (>= 7.0) - System.Reflection.Metadata (>= 7.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - Microsoft.CodeAnalysis.CSharp (4.8) - Microsoft.CodeAnalysis.Common (4.8) - Microsoft.CodeCoverage (17.12) - Microsoft.Diagnostics.NETCore.Client (0.2.510501) - Microsoft.Extensions.Logging (>= 6.0) - Microsoft.Diagnostics.Runtime (3.1.506101) + Microsoft.CodeAnalysis.Analyzers (5.3) + Microsoft.CodeAnalysis.Common (5.3) + Microsoft.CodeAnalysis.Analyzers (>= 5.3.0-2.25625.1) + Microsoft.CodeAnalysis.CSharp (5.3) + Microsoft.CodeAnalysis.Analyzers (>= 5.3.0-2.25625.1) + Microsoft.CodeAnalysis.Common (5.3) + Microsoft.CodeCoverage (18.4) + Microsoft.Diagnostics.NETCore.Client (0.2.661903) + Microsoft.Extensions.Logging.Abstractions (>= 8.0.3) + Microsoft.Diagnostics.Runtime (3.1.512801) Microsoft.Diagnostics.NETCore.Client (>= 0.2.410101) - System.Collections.Immutable (>= 6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - Microsoft.Diagnostics.Tracing.TraceEvent (3.1.8) - Microsoft.Win32.Registry (>= 4.4) - System.Runtime.CompilerServices.Unsafe (>= 5.0) + Microsoft.Diagnostics.Tracing.TraceEvent (3.2.2) + Microsoft.Diagnostics.NETCore.Client (>= 0.2.510501) + Microsoft.Win32.Registry (>= 5.0) + System.Collections.Immutable (>= 9.0.8) + System.Reflection.Metadata (>= 9.0.8) + System.Reflection.TypeExtensions (>= 4.7) + System.Runtime.CompilerServices.Unsafe (>= 6.1.2) + System.Text.Json (>= 9.0.8) Microsoft.DotNet.PlatformAbstractions (3.1.6) - Microsoft.Extensions.DependencyInjection (8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (8.0) - Microsoft.Extensions.Logging (8.0) - Microsoft.Extensions.DependencyInjection (>= 8.0) - Microsoft.Extensions.Logging.Abstractions (>= 8.0) - Microsoft.Extensions.Options (>= 8.0) - Microsoft.Extensions.Logging.Abstractions (8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.Options (8.0.1) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.Primitives (8.0) - Microsoft.NET.Test.Sdk (17.12) - Microsoft.CodeCoverage (>= 17.12) - Microsoft.TestPlatform.TestHost (>= 17.12) - Microsoft.TestPlatform.ObjectModel (17.12) - System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.12) - Microsoft.TestPlatform.ObjectModel (>= 17.12) - Newtonsoft.Json (>= 13.0.1) + Microsoft.Extensions.DependencyInjection.Abstractions (10.0.7) + Microsoft.Extensions.Logging.Abstractions (10.0.7) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.7) + Microsoft.NET.Test.Sdk (18.4) + Microsoft.CodeCoverage (>= 18.4) + Microsoft.TestPlatform.TestHost (>= 18.4) + Microsoft.TestPlatform.ObjectModel (18.4) + System.Reflection.Metadata (>= 8.0) + Microsoft.TestPlatform.TestHost (18.4) + Microsoft.TestPlatform.ObjectModel (>= 18.4) + Newtonsoft.Json (>= 13.0.3) Microsoft.Win32.Registry (5.0) System.Security.AccessControl (>= 5.0) System.Security.Principal.Windows (>= 5.0) - Newtonsoft.Json (13.0.3) - Perfolizer (0.3.17) - System.CodeDom (8.0) - System.Collections.Immutable (8.0) - System.Management (8.0) - System.CodeDom (>= 8.0) - System.Reflection.Metadata (8.0) - System.Collections.Immutable (>= 8.0) - System.Runtime.CompilerServices.Unsafe (6.0) - System.Security.AccessControl (6.0) + Newtonsoft.Json (13.0.4) + Perfolizer (0.6.1) + Pragmastat (>= 3.2.4) + Pragmastat (12.1) + System.CodeDom (10.0.7) + System.Collections.Immutable (10.0.7) + System.Management (10.0.7) + System.CodeDom (>= 10.0.7) + System.Reflection.Metadata (10.0.7) + System.Reflection.TypeExtensions (4.7) + System.Runtime.CompilerServices.Unsafe (6.1.2) + System.Security.AccessControl (6.0.1) System.Security.Principal.Windows (5.0) - System.Text.Json (9.0) - xunit (2.9.2) - xunit.analyzers (>= 1.16) - xunit.assert (>= 2.9.2) - xunit.core (2.9.2) + System.Text.Json (10.0.7) + xunit (2.9.3) + xunit.analyzers (>= 1.18) + xunit.assert (>= 2.9.3) + xunit.core (2.9.3) xunit.abstractions (2.0.3) - xunit.analyzers (1.18) - xunit.assert (2.9.2) - xunit.core (2.9.2) - xunit.extensibility.core (2.9.2) - xunit.extensibility.execution (2.9.2) - xunit.extensibility.core (2.9.2) + xunit.analyzers (1.27) + xunit.assert (2.9.3) + xunit.core (2.9.3) + xunit.extensibility.core (2.9.3) + xunit.extensibility.execution (2.9.3) + xunit.extensibility.core (2.9.3) xunit.abstractions (>= 2.0.3) - xunit.extensibility.execution (2.9.2) - xunit.extensibility.core (2.9.2) - xunit.runner.visualstudio (3.0) + xunit.extensibility.execution (2.9.3) + xunit.extensibility.core (2.9.3) + xunit.runner.visualstudio (3.1.5) GROUP trimtest STORAGE: NONE -RESTRICTION: == net9.0 +RESTRICTION: == net10.0 NUGET remote: https://api.nuget.org/v3/index.json - FsCheck (2.16.6) - FSharp.Core (>= 4.2.3) - FsCheck.Xunit (2.16.6) - FsCheck (2.16.6) - xunit.extensibility.execution (>= 2.2 < 3.0) - FSharp.Core (9.0.100) - Microsoft.CodeCoverage (17.12) - Microsoft.NET.Test.Sdk (17.12) - Microsoft.CodeCoverage (>= 17.12) - Microsoft.TestPlatform.TestHost (>= 17.12) - Microsoft.TestPlatform.ObjectModel (17.12) - System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.12) - Microsoft.TestPlatform.ObjectModel (>= 17.12) - Newtonsoft.Json (>= 13.0.1) - Newtonsoft.Json (13.0.3) - System.Reflection.Metadata (9.0) - System.Text.Json (9.0) - xunit (2.9.2) - xunit.analyzers (>= 1.16) - xunit.assert (>= 2.9.2) - xunit.core (2.9.2) + FsCheck (3.3.2) + FSharp.Core (>= 5.0.2) + FsCheck.Xunit (3.3.2) + FsCheck (3.3.2) + FSharp.Core (>= 5.0.2) + xunit.extensibility.execution (>= 2.4.1 < 3.0) + FSharp.Core (10.1.203) + Microsoft.CodeCoverage (18.4) + Microsoft.NET.Test.Sdk (18.4) + Microsoft.CodeCoverage (>= 18.4) + Microsoft.TestPlatform.TestHost (>= 18.4) + Microsoft.TestPlatform.ObjectModel (18.4) + System.Reflection.Metadata (>= 8.0) + Microsoft.TestPlatform.TestHost (18.4) + Microsoft.TestPlatform.ObjectModel (>= 18.4) + Newtonsoft.Json (>= 13.0.3) + Newtonsoft.Json (13.0.4) + System.Reflection.Metadata (10.0.7) + System.Text.Json (10.0.7) + xunit (2.9.3) + xunit.analyzers (>= 1.18) + xunit.assert (>= 2.9.3) + xunit.core (2.9.3) xunit.abstractions (2.0.3) - xunit.analyzers (1.18) - xunit.assert (2.9.2) - xunit.console (2.9.2) - xunit.runner.reporters (2.9.2) - xunit.core (2.9.2) - xunit.extensibility.core (2.9.2) - xunit.extensibility.execution (2.9.2) - xunit.extensibility.core (2.9.2) + xunit.analyzers (1.27) + xunit.assert (2.9.3) + xunit.console (2.9.3) + xunit.runner.reporters (2.9.3) + xunit.core (2.9.3) + xunit.extensibility.core (2.9.3) + xunit.extensibility.execution (2.9.3) + xunit.extensibility.core (2.9.3) xunit.abstractions (>= 2.0.3) - xunit.extensibility.execution (2.9.2) - xunit.extensibility.core (2.9.2) - xunit.runner.reporters (2.9.2) - xunit.runner.utility (2.9.2) - xunit.runner.utility (2.9.2) + xunit.extensibility.execution (2.9.3) + xunit.extensibility.core (2.9.3) + xunit.runner.reporters (2.9.3) + xunit.runner.utility (2.9.3) + xunit.runner.utility (2.9.3) xunit.abstractions (>= 2.0.3) diff --git a/src/FSharp.SystemTextJson/FSharp.SystemTextJson.fsproj b/src/FSharp.SystemTextJson/FSharp.SystemTextJson.fsproj index 46a9409..e3ee491 100644 --- a/src/FSharp.SystemTextJson/FSharp.SystemTextJson.fsproj +++ b/src/FSharp.SystemTextJson/FSharp.SystemTextJson.fsproj @@ -25,6 +25,7 @@ + diff --git a/src/FSharp.SystemTextJson/paket.references b/src/FSharp.SystemTextJson/paket.references index efb08d8..7a42892 100644 --- a/src/FSharp.SystemTextJson/paket.references +++ b/src/FSharp.SystemTextJson/paket.references @@ -1,4 +1,4 @@ FSharp.Core -System.Text.Json restriction: == netstandard2.0 +System.Text.Json Microsoft.SourceLink.GitHub Nerdbank.GitVersioning \ No newline at end of file diff --git a/tests/FSharp.SystemTextJson.Tests/FSharp.SystemTextJson.Tests.fsproj b/tests/FSharp.SystemTextJson.Tests/FSharp.SystemTextJson.Tests.fsproj index fa99936..4c6f66b 100644 --- a/tests/FSharp.SystemTextJson.Tests/FSharp.SystemTextJson.Tests.fsproj +++ b/tests/FSharp.SystemTextJson.Tests/FSharp.SystemTextJson.Tests.fsproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 false false diff --git a/tests/FSharp.SystemTextJson.TrimTest/FSharp.SystemTextJson.TrimTest.fsproj b/tests/FSharp.SystemTextJson.TrimTest/FSharp.SystemTextJson.TrimTest.fsproj index feb5f93..c956961 100644 --- a/tests/FSharp.SystemTextJson.TrimTest/FSharp.SystemTextJson.TrimTest.fsproj +++ b/tests/FSharp.SystemTextJson.TrimTest/FSharp.SystemTextJson.TrimTest.fsproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 true Link