From 8799cc06bda2722c4195678c99cf0692f9f35cf7 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sun, 17 May 2026 21:21:27 +1000 Subject: [PATCH 1/5] target net11 --- src/Argon.DataSets/Argon.DataSets.csproj | 2 +- src/Argon.FSharp.Tests/Argon.FSharp.Tests.fsproj | 2 +- src/Argon.FSharp/Argon.FSharp.csproj | 2 +- src/Argon.InterfaceCallbacks/Argon.InterfaceCallbacks.csproj | 2 +- src/Argon.JsonPath/Argon.JsonPath.csproj | 2 +- src/Argon.NodaTime/Argon.NodaTime.csproj | 2 +- src/Argon.Xml/Argon.Xml.csproj | 2 +- src/Argon/Argon.csproj | 4 ++-- src/ArgonTests/ArgonTests.csproj | 2 +- src/Benchmark.Tests/Benchmark.Tests.csproj | 2 +- src/global.json | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Argon.DataSets/Argon.DataSets.csproj b/src/Argon.DataSets/Argon.DataSets.csproj index b6410767f..1a0bed32a 100644 --- a/src/Argon.DataSets/Argon.DataSets.csproj +++ b/src/Argon.DataSets/Argon.DataSets.csproj @@ -1,6 +1,6 @@ - net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0 + net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0 diff --git a/src/Argon.FSharp.Tests/Argon.FSharp.Tests.fsproj b/src/Argon.FSharp.Tests/Argon.FSharp.Tests.fsproj index db552991c..39af8f693 100644 --- a/src/Argon.FSharp.Tests/Argon.FSharp.Tests.fsproj +++ b/src/Argon.FSharp.Tests/Argon.FSharp.Tests.fsproj @@ -1,7 +1,7 @@ - net9.0 + net11.0 latest false false diff --git a/src/Argon.FSharp/Argon.FSharp.csproj b/src/Argon.FSharp/Argon.FSharp.csproj index a20894516..4bed808f4 100644 --- a/src/Argon.FSharp/Argon.FSharp.csproj +++ b/src/Argon.FSharp/Argon.FSharp.csproj @@ -2,7 +2,7 @@ Provides serialization support between FSharp and Argon. - net48;net6.0;net7.0;net8.0;net9.0;net10.0 + net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0 diff --git a/src/Argon.InterfaceCallbacks/Argon.InterfaceCallbacks.csproj b/src/Argon.InterfaceCallbacks/Argon.InterfaceCallbacks.csproj index b6410767f..1a0bed32a 100644 --- a/src/Argon.InterfaceCallbacks/Argon.InterfaceCallbacks.csproj +++ b/src/Argon.InterfaceCallbacks/Argon.InterfaceCallbacks.csproj @@ -1,6 +1,6 @@ - net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0 + net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0 diff --git a/src/Argon.JsonPath/Argon.JsonPath.csproj b/src/Argon.JsonPath/Argon.JsonPath.csproj index b6410767f..1a0bed32a 100644 --- a/src/Argon.JsonPath/Argon.JsonPath.csproj +++ b/src/Argon.JsonPath/Argon.JsonPath.csproj @@ -1,6 +1,6 @@ - net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0 + net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0 diff --git a/src/Argon.NodaTime/Argon.NodaTime.csproj b/src/Argon.NodaTime/Argon.NodaTime.csproj index 388fc38f4..89f398a3a 100644 --- a/src/Argon.NodaTime/Argon.NodaTime.csproj +++ b/src/Argon.NodaTime/Argon.NodaTime.csproj @@ -2,7 +2,7 @@ Provides serialization support between Noda Time and Json.NET. - net48;net6.0;net7.0;net8.0;net9.0;net10.0 + net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0 nodatime;json;Argon diff --git a/src/Argon.Xml/Argon.Xml.csproj b/src/Argon.Xml/Argon.Xml.csproj index b6410767f..1a0bed32a 100644 --- a/src/Argon.Xml/Argon.Xml.csproj +++ b/src/Argon.Xml/Argon.Xml.csproj @@ -1,6 +1,6 @@ - net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0 + net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0 diff --git a/src/Argon/Argon.csproj b/src/Argon/Argon.csproj index 36ab963a1..3730f5c79 100644 --- a/src/Argon/Argon.csproj +++ b/src/Argon/Argon.csproj @@ -1,6 +1,6 @@ - net462;net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0 + net462;net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0 true @@ -8,7 +8,7 @@ - + diff --git a/src/ArgonTests/ArgonTests.csproj b/src/ArgonTests/ArgonTests.csproj index d72e2d7e9..662781529 100644 --- a/src/ArgonTests/ArgonTests.csproj +++ b/src/ArgonTests/ArgonTests.csproj @@ -2,7 +2,7 @@ Exe net48 - $(TargetFrameworks);net8.0;net9.0;net10.0 + $(TargetFrameworks);net8.0;net9.0;net10.0;net11.0 disable Tests Exe diff --git a/src/Benchmark.Tests/Benchmark.Tests.csproj b/src/Benchmark.Tests/Benchmark.Tests.csproj index a7a8c969c..15511320b 100644 --- a/src/Benchmark.Tests/Benchmark.Tests.csproj +++ b/src/Benchmark.Tests/Benchmark.Tests.csproj @@ -1,7 +1,7 @@ Exe - net9.0 + net11.0 false diff --git a/src/global.json b/src/global.json index d1c92fb43..8013ae8b8 100644 --- a/src/global.json +++ b/src/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.300", + "version": "11.0.100-preview.4.26230.115", "allowPrerelease": true, "rollForward": "latestFeature" } From f7818c9a93efe56a4c2e0395a6ea0df317f6b0ee Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sun, 17 May 2026 22:20:30 +1000 Subject: [PATCH 2/5] . --- src/ArgonTests/AotCompatibilityTests.cs | 2 +- ...iterTest.WriteTokenDirect_BadValue.DotNet11_0.verified.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 src/ArgonTests/JsonTextWriterTest.WriteTokenDirect_BadValue.DotNet11_0.verified.txt diff --git a/src/ArgonTests/AotCompatibilityTests.cs b/src/ArgonTests/AotCompatibilityTests.cs index bb0f6788b..115127df7 100644 --- a/src/ArgonTests/AotCompatibilityTests.cs +++ b/src/ArgonTests/AotCompatibilityTests.cs @@ -55,7 +55,7 @@ public async Task Serialize_AnonymousObject_UnderAot() // Pin SDK version to avoid .NET 11 preview SDK issues File.WriteAllText( Path.Combine(tempDir, "global.json"), - """{"sdk":{"version":"10.0.103","allowPrerelease":false,"rollForward":"latestFeature"}}"""); + """{"sdk":{"version":"10.0.300","allowPrerelease":false,"rollForward":"latestFeature"}}"""); var (publishSuccess, publishOutput) = await PublishProject(tempDir); Assert.True(publishSuccess, $"Publish failed: {publishOutput}"); diff --git a/src/ArgonTests/JsonTextWriterTest.WriteTokenDirect_BadValue.DotNet11_0.verified.txt b/src/ArgonTests/JsonTextWriterTest.WriteTokenDirect_BadValue.DotNet11_0.verified.txt new file mode 100644 index 000000000..e240343c6 --- /dev/null +++ b/src/ArgonTests/JsonTextWriterTest.WriteTokenDirect_BadValue.DotNet11_0.verified.txt @@ -0,0 +1,4 @@ +{ + Type: FormatException, + Message: The input string 'three' was not in a correct format. +} \ No newline at end of file From b722a49fd429f09bd13d2b8d5847a901000c7dcb Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sun, 17 May 2026 22:21:45 +1000 Subject: [PATCH 3/5] Update XmlNodeConverter.cs --- src/Argon.Xml/XmlNodeConverter.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Argon.Xml/XmlNodeConverter.cs b/src/Argon.Xml/XmlNodeConverter.cs index ca4ce8ffe..9c2cfd8e0 100644 --- a/src/Argon.Xml/XmlNodeConverter.cs +++ b/src/Argon.Xml/XmlNodeConverter.cs @@ -695,8 +695,7 @@ void ReadElement(JsonReader reader, IXmlDocument document, IXmlNode currentNode, case JsonTypeReflector.ArrayValuesPropertyName: propertyName = propertyName[1..]; elementPrefix = manager.LookupPrefix(jsonNamespaceUri); - CreateElement(reader, document, currentNode, propertyName, manager, elementPrefix, attributeNameValues); - return; + break; case JsonTypeReflector.IdPropertyName: case JsonTypeReflector.RefPropertyName: case JsonTypeReflector.TypePropertyName: From 5df483aee8ebb40a1dac5ac557a11ad7a2ab5e5a Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sun, 17 May 2026 22:25:08 +1000 Subject: [PATCH 4/5] Update AotCompatibilityTests.cs --- src/ArgonTests/AotCompatibilityTests.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ArgonTests/AotCompatibilityTests.cs b/src/ArgonTests/AotCompatibilityTests.cs index 115127df7..623e0e5a9 100644 --- a/src/ArgonTests/AotCompatibilityTests.cs +++ b/src/ArgonTests/AotCompatibilityTests.cs @@ -52,10 +52,9 @@ public async Task Serialize_AnonymousObject_UnderAot() File.WriteAllText(Path.Combine(tempDir, "AotTestApp.csproj"), csprojContent); File.WriteAllText(Path.Combine(tempDir, "Program.cs"), programContent); - // Pin SDK version to avoid .NET 11 preview SDK issues File.WriteAllText( Path.Combine(tempDir, "global.json"), - """{"sdk":{"version":"10.0.300","allowPrerelease":false,"rollForward":"latestFeature"}}"""); + """{"sdk":{"version":"11.0.100-preview.4.26230.115","allowPrerelease":true,"rollForward":"latestFeature"}}"""); var (publishSuccess, publishOutput) = await PublishProject(tempDir); Assert.True(publishSuccess, $"Publish failed: {publishOutput}"); From 2e691d6cc2f7c67f0f08e47dbd4af11b8823a36e Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Mon, 18 May 2026 20:06:38 +1000 Subject: [PATCH 5/5] Update appveyor.yml --- src/appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/appveyor.yml b/src/appveyor.yml index dc57c45da..26a851913 100644 --- a/src/appveyor.yml +++ b/src/appveyor.yml @@ -10,12 +10,14 @@ build_script: - pwsh: | if ($isWindows) { Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./dotnet-install.ps1" + ./dotnet-install.ps1 -Version 10.0.300 -Architecture x64 -InstallDir 'C:\Program Files\dotnet' ./dotnet-install.ps1 -JSonFile src/global.json -Architecture x64 -InstallDir 'C:\Program Files\dotnet' } else { Invoke-WebRequest "https://dot.net/v1/dotnet-install.sh" -OutFile "./dotnet-install.sh" sudo chmod u+x dotnet-install.sh if ($isMacOS) { + sudo ./dotnet-install.sh --version 10.0.300 --architecture x64 --install-dir '/usr/local/share/dotnet' sudo ./dotnet-install.sh --jsonfile src/global.json --architecture x64 --install-dir '/usr/local/share/dotnet' } else { sudo ./dotnet-install.sh --jsonfile src/global.json --architecture x64 --install-dir '/usr/share/dotnet'