Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Argon.DataSets/Argon.DataSets.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks>net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />
Expand Down
2 changes: 1 addition & 1 deletion src/Argon.FSharp.Tests/Argon.FSharp.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<LangVersion>latest</LangVersion>
<IsPackable>false</IsPackable>
<GenerateProgramFile>false</GenerateProgramFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Argon.FSharp/Argon.FSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Provides serialization support between FSharp and Argon.</Description>
<TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Using Include="Microsoft.FSharp.Core" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks>net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />
Expand Down
2 changes: 1 addition & 1 deletion src/Argon.JsonPath/Argon.JsonPath.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks>net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />
Expand Down
2 changes: 1 addition & 1 deletion src/Argon.NodaTime/Argon.NodaTime.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Provides serialization support between Noda Time and Json.NET.</Description>
<TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
<PackageTags>nodatime;json;Argon</PackageTags>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Argon.Xml/Argon.Xml.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks>net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />
Expand Down
3 changes: 1 addition & 2 deletions src/Argon.Xml/XmlNodeConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/Argon/Argon.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks>net462;net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />
<PackageReference Include="Polyfill" PrivateAssets="all" />
<PackageReference Include="Microsoft.Sbom.Targets" PrivateAssets="all" Condition="'$(CI)' == 'true'" />
<PackageReference Include="System.ValueTuple" Condition="'$(TargetFramework)' == 'net462'" />
<PackageReference Include="System.Collections.Immutable" Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net9.0' AND '$(TargetFramework)' != 'net10.0' " />
<PackageReference Include="System.Collections.Immutable" Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net9.0' AND '$(TargetFramework)' != 'net10.0' AND '$(TargetFramework)' != 'net11.0' " />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net472'">
<PackageReference Include="System.Buffers" />
Expand Down
3 changes: 1 addition & 2 deletions src/ArgonTests/AotCompatibilityTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.103","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}");
Expand Down
2 changes: 1 addition & 1 deletion src/ArgonTests/ArgonTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net48</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
<Nullable>disable</Nullable>
<RootNamespace>Tests</RootNamespace>
<OutputType>Exe</OutputType>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
Type: FormatException,
Message: The input string 'three' was not in a correct format.
}
2 changes: 1 addition & 1 deletion src/Benchmark.Tests/Benchmark.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<!-- Disabled because SourceLink isn't referenced to calculate paths -->
<DeterministicSourcePaths>false</DeterministicSourcePaths>
</PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.300",
"version": "11.0.100-preview.4.26230.115",
"allowPrerelease": true,
"rollForward": "latestFeature"
}
Expand Down
Loading