Merge pull request #899 from sys27/feature/dotnet-10

sys27 · web-flow · commit f6e1ce541610 · 2025-12-11T12:37:04.000+02:00
Upgrade to .NET 10.
diff --git a/CI/azure-pipelines.yml b/CI/azure-pipelines.yml
@@ -18,15 +18,15 @@ jobs:
       vmImage: 'ubuntu-latest'
 
     variables:
-      solution: 'xFunc.sln'
+      solution: 'xFunc.slnx'
       buildConfiguration: 'Release'
 
     steps:
     - task: UseDotNet@2
-      displayName: 'Install .NET 9'
+      displayName: 'Install .NET 10'
       inputs:
         packageType: 'sdk'
-        version: '9.0.x'
+        version: '10.0.x'
 
     - task: DotNetCoreCLI@2
       displayName: 'dotnet restore'
@@ -71,10 +71,10 @@ jobs:
 
     - task: PublishPipelineArtifact@1
       inputs:
-        path: xFunc.Maths/bin/Release/net8.0
+        path: xFunc.Maths/bin/Release/net10.0
         artifact: xFunc.Maths
 
     - task: PublishPipelineArtifact@1
       inputs:
         path: nupkgs
-        artifact: NuGet Packages
+        artifact: NuGet Packages
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,11 +7,11 @@
     <PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
     <PackageVersion Include="NUnit3TestAdapter" Version="6.0.0" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <PackageVersion Include="System.Collections.Immutable" Version="9.0.10" />
+    <PackageVersion Include="System.Collections.Immutable" Version="10.0.1" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="ReportGenerator" Version="5.5.1" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
 ﻿The MIT License (MIT)
-Copyright © 2012-2024 Dmytro Kyshchenko
+Copyright © 2012-2025 Dmytro Kyshchenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/xFunc.Benchmark/Program.cs b/xFunc.Benchmark/Program.cs
@@ -21,7 +21,7 @@ public static void Main(string[] args)
             .Run(args,
                 ManualConfig.Create(DefaultConfig.Instance)
                     .AddJob(Job.MediumRun
-                        .WithToolchain(CsProjCoreToolchain.NetCoreApp90))
+                        .WithToolchain(CsProjCoreToolchain.NetCoreApp10_0))
                     .AddDiagnoser(MemoryDiagnoser.Default)
                     .StopOnFirstError());
     }
diff --git a/xFunc.Benchmark/xFunc.Benchmark.csproj b/xFunc.Benchmark/xFunc.Benchmark.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/xFunc.Cli/xFunc.Cli.csproj b/xFunc.Cli/xFunc.Cli.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <PackAsTool>true</PackAsTool>
-    <ToolCommandName>xfunc</ToolCommandName>    
+    <ToolCommandName>xfunc</ToolCommandName>
     <PackageId>xFunc.Cli</PackageId>
     <Version>4.5.0</Version>
     <Product>xFunc.Maths</Product>
     <Authors>Dmytro Kyshchenko</Authors>
     <Company />
-    <Copyright>Copyright ©2012-2024 Dmytro Kyshchenko</Copyright>
+    <Copyright>Copyright © 2012-2025 Dmytro Kyshchenko</Copyright>
     <Description>xFunc provides a powerful parser and analyzer for mathematical expressions. It excels at calculating derivatives, simplifying expressions, and achieving high performance.</Description>
     <PackageProjectUrl>https://github.com/sys27/xFunc</PackageProjectUrl>
     <PackageIcon>xFunc.png</PackageIcon>
diff --git a/xFunc.Maths/Expressions/BinaryExpression.cs b/xFunc.Maths/Expressions/BinaryExpression.cs
@@ -30,7 +30,7 @@ protected BinaryExpression(IExpression left, IExpression right)
     /// <exception cref="ParseException">The <paramref name="arguments"/> collection should have only two arguments.</exception>
     protected BinaryExpression(ImmutableArray<IExpression> arguments)
     {
-        if (arguments == null)
+        if (arguments.IsDefault)
             throw new ArgumentNullException(nameof(arguments));
 
         if (arguments.Length < 2)
diff --git a/xFunc.Maths/Expressions/Curry.cs b/xFunc.Maths/Expressions/Curry.cs
@@ -75,7 +75,7 @@ public Curry(IExpression function, ImmutableArray<IExpression> parameters)
     /// <exception cref="ArgumentException">The amount of argument in the <paramref name="arguments"/> collection is less than 1.</exception>
     internal Curry(ImmutableArray<IExpression> arguments)
     {
-        Debug.Assert(arguments != null, "arguments == null");
+        Debug.Assert(!arguments.IsDefault, "arguments == null");
 
         if (arguments.Length < 1)
             throw new ArgumentException(Resource.LessParams, nameof(arguments));
diff --git a/xFunc.Maths/Expressions/DifferentParametersExpression.cs b/xFunc.Maths/Expressions/DifferentParametersExpression.cs
@@ -27,7 +27,7 @@ protected DifferentParametersExpression(IEnumerable<IExpression> arguments)
     /// <exception cref="ArgumentException">The amount of argument in the <paramref name="arguments"/> collection is less than <c>MinParametersCount</c> or greater than <c>MaxParametersCount</c>.</exception>
     protected DifferentParametersExpression(ImmutableArray<IExpression> arguments)
     {
-        if (arguments == null)
+        if (arguments.IsDefault)
             throw new ArgumentNullException(nameof(arguments));
 
         if (arguments.Length < MinParametersCount)
diff --git a/xFunc.Maths/Expressions/Matrices/Matrix.cs b/xFunc.Maths/Expressions/Matrices/Matrix.cs
@@ -19,7 +19,7 @@ public class Matrix : IExpression
     /// <param name="vectors">The vectors.</param>
     /// <exception cref="ArgumentNullException"><paramref name="vectors"/> is null.</exception>
     public Matrix(Vector[] vectors)
-        : this(vectors.ToImmutableArray())
+        : this(vectors is null ? default : vectors.ToImmutableArray())
     {
     }
 
@@ -30,7 +30,7 @@ public Matrix(Vector[] vectors)
     /// <exception cref="ArgumentNullException"><paramref name="vectors"/> is null.</exception>
     public Matrix(ImmutableArray<Vector> vectors)
     {
-        if (vectors == null)
+        if (vectors.IsDefault)
             throw new ArgumentNullException(nameof(vectors));
 
         if (vectors.Length < MinParametersCount)
diff --git a/xFunc.Maths/Expressions/UnaryExpression.cs b/xFunc.Maths/Expressions/UnaryExpression.cs
@@ -26,7 +26,7 @@ protected UnaryExpression(IExpression argument)
     /// <exception cref="ParseException">The <paramref name="arguments"/> collection should have only one argument.</exception>
     protected UnaryExpression(ImmutableArray<IExpression> arguments)
     {
-        if (arguments == null)
+        if (arguments.IsDefault)
             throw new ArgumentNullException(nameof(arguments));
 
         if (arguments.Length < 1)
diff --git a/xFunc.Maths/Parser.ExpressionFactory.cs b/xFunc.Maths/Parser.ExpressionFactory.cs
@@ -82,8 +82,7 @@ private IExpression CreateFunction(in Token token, ImmutableArray<IExpression> a
             "deriv" or "derivative" => new Derivative(differentiator, simplifier, arguments),
             "simplify" => new Simplify(simplifier, arguments),
 
-            "del" => new Del(differentiator, simplifier, arguments),
-            "nabla" => new Del(differentiator, simplifier, arguments),
+            "del" or "nabla" => new Del(differentiator, simplifier, arguments),
 
             "transpose" => new Transpose(arguments),
             "det" or "determinant" => new Determinant(arguments),
diff --git a/xFunc.Maths/Parser.cs b/xFunc.Maths/Parser.cs
@@ -143,7 +143,7 @@ public IExpression Parse(string expression)
            ParseTernary(ref tokenReader);
 
     private IExpression? ParseAssignOperators(ref TokenReader tokenReader)
-        => tokenReader.Scoped(this, static (Parser parser, ref TokenReader reader) =>
+        => tokenReader.Scoped(this, static (parser, ref reader) =>
         {
             var variable = parser.ParseVariable(ref reader);
             if (variable is null)
@@ -167,7 +167,7 @@ public IExpression Parse(string expression)
         });
 
     private IExpression? ParseTernary(ref TokenReader tokenReader)
-        => tokenReader.Scoped(this, static (Parser parser, ref TokenReader reader) =>
+        => tokenReader.Scoped(this, static (parser, ref reader) =>
         {
             var condition = parser.ParseConditionalOrOperator(ref reader);
             if (condition is null)
@@ -425,7 +425,7 @@ public IExpression Parse(string expression)
            ParseLeftUnary(ref tokenReader);
 
     private IExpression? ParseMulImplicitLeftUnary(ref TokenReader tokenReader)
-        => tokenReader.Scoped(this, static (Parser parser, ref TokenReader reader) =>
+        => tokenReader.Scoped(this, static (parser, ref reader) =>
         {
             var minusOperator = reader.GetCurrentAndAdvance(MinusOperator);
             var number = parser.ParseNumberAndUnit(ref reader);
@@ -500,7 +500,7 @@ public IExpression Parse(string expression)
            ParseFactorialOrCallExpression(ref tokenReader);
 
     private IExpression? ParseIncDec(ref TokenReader tokenReader)
-        => tokenReader.Scoped(this, static (Parser parser, ref TokenReader reader) =>
+        => tokenReader.Scoped(this, static (parser, ref reader) =>
         {
             var variable = parser.ParseVariable(ref reader);
             if (variable is null)
@@ -623,7 +623,7 @@ public IExpression Parse(string expression)
     }
 
     private IExpression? ParseParenthesesExpression(ref TokenReader tokenReader)
-        => tokenReader.Scoped(this, static (Parser parser, ref TokenReader reader) =>
+        => tokenReader.Scoped(this, static (parser, ref reader) =>
         {
             if (!reader.CheckAndAdvance(OpenParenthesisSymbol))
                 return null;
@@ -869,7 +869,7 @@ public IExpression Parse(string expression)
         };
 
     private IExpression? ParsePolarComplexNumber(ref TokenReader tokenReader)
-        => tokenReader.Scoped(this, static (Parser _, ref TokenReader reader) =>
+        => tokenReader.Scoped(this, static (_, ref reader) =>
         {
             // plus symbol can be ignored
             reader.GetCurrentAndAdvance(PlusOperator);
@@ -953,7 +953,7 @@ public IExpression Parse(string expression)
     }
 
     private IExpression? ParseMatrix(ref TokenReader tokenReader)
-        => tokenReader.Scoped(this, static (Parser parser, ref TokenReader reader) =>
+        => tokenReader.Scoped(this, static (parser, ref reader) =>
         {
             if (!reader.CheckAndAdvance(OpenBraceSymbol))
                 return null;
diff --git a/xFunc.Maths/xFunc.Maths.csproj b/xFunc.Maths/xFunc.Maths.csproj
@@ -1,15 +1,15 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <RootNamespace>xFunc.Maths</RootNamespace>
     <PackageId>xFunc.Maths</PackageId>
     <Version>4.5.0</Version>
     <Product>xFunc.Maths</Product>
     <Authors>Dmytro Kyshchenko</Authors>
     <Company />
-    <Copyright>Copyright © 2012-2024 Dmytro Kyshchenko</Copyright>
+    <Copyright>Copyright © 2012-2025 Dmytro Kyshchenko</Copyright>
     <Description>xFunc provides a powerful parser and analyzer for mathematical expressions. It excels at calculating derivatives, simplifying expressions, and achieving high performance.</Description>
     <PackageProjectUrl>https://github.com/sys27/xFunc</PackageProjectUrl>
     <PackageIcon>xFunc.png</PackageIcon>
@@ -40,8 +40,9 @@ https://sys27.github.io/xFunc/articles/breaking-changes.html</PackageReleaseNote
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     <EnablePackageValidation>true</EnablePackageValidation>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <Using Include="xFunc.Maths" />
     <Using Include="xFunc.Maths.Analyzers" />
diff --git a/xFunc.Tests/xFunc.Tests.csproj b/xFunc.Tests/xFunc.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
     <RootNamespace>xFunc.Tests</RootNamespace>
@@ -46,7 +46,7 @@
     <Using Include="xFunc.Maths.Tokenization" />
     <Using Include="NUnit.Framework" />
   </ItemGroup>
-  
+
   <Target Name="GenerateHtmlCoverageReport" AfterTargets="GenerateCoverageResultAfterTest" Condition="'$(CollectCoverage)' == 'true'">
     <ReportGenerator ReportFiles="$(CoverletOutput)/coverage.cobertura.xml" TargetDirectory="$(CoverletOutput)" ReportTypes="HtmlInline_AzurePipelines" />
   </Target>
diff --git a/xFunc.sln b/xFunc.sln
diff --git a/xFunc.slnx b/xFunc.slnx
@@ -0,0 +1,15 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path=".stylecop.json" />
+    <File Path="Directory.Build.targets" />
+    <File Path="Directory.Packages.props" />
+    <File Path="version.json" />
+    <File Path="xFunc Grammar.txt" />
+    <File Path="xFunc.ruleset" />
+  </Folder>
+  <Project Path="xFunc.Benchmark/xFunc.Benchmark.csproj" />
+  <Project Path="xFunc.Cli/xFunc.Cli.csproj" />
+  <Project Path="xFunc.Maths/xFunc.Maths.csproj" />
+  <Project Path="xFunc.Tests/xFunc.Tests.csproj" />
+</Solution>

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public static void Main(string[] args)`
`21`	`21`	`.Run(args,`
`22`	`22`	`ManualConfig.Create(DefaultConfig.Instance)`
`23`	`23`	`.AddJob(Job.MediumRun`
`24`		`- .WithToolchain(CsProjCoreToolchain.NetCoreApp90))`
	`24`	`+ .WithToolchain(CsProjCoreToolchain.NetCoreApp10_0))`
`25`	`25`	`.AddDiagnoser(MemoryDiagnoser.Default)`
`26`	`26`	`.StopOnFirstError());`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ protected BinaryExpression(IExpression left, IExpression right)`
`30`	`30`	`/// <exception cref="ParseException">The <paramref name="arguments"/> collection should have only two arguments.</exception>`
`31`	`31`	`protected BinaryExpression(ImmutableArray<IExpression> arguments)`
`32`	`32`	`{`
`33`		`- if (arguments == null)`
	`33`	`+ if (arguments.IsDefault)`
`34`	`34`	`throw new ArgumentNullException(nameof(arguments));`
`35`	`35`
`36`	`36`	`if (arguments.Length < 2)`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public Curry(IExpression function, ImmutableArray<IExpression> parameters)`
`75`	`75`	`/// <exception cref="ArgumentException">The amount of argument in the <paramref name="arguments"/> collection is less than 1.</exception>`
`76`	`76`	`internal Curry(ImmutableArray<IExpression> arguments)`
`77`	`77`	`{`
`78`		`- Debug.Assert(arguments != null, "arguments == null");`
	`78`	`+ Debug.Assert(!arguments.IsDefault, "arguments == null");`
`79`	`79`
`80`	`80`	`if (arguments.Length < 1)`
`81`	`81`	`throw new ArgumentException(Resource.LessParams, nameof(arguments));`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ protected DifferentParametersExpression(IEnumerable<IExpression> arguments)`
`27`	`27`	`/// <exception cref="ArgumentException">The amount of argument in the <paramref name="arguments"/> collection is less than <c>MinParametersCount</c> or greater than <c>MaxParametersCount</c>.</exception>`
`28`	`28`	`protected DifferentParametersExpression(ImmutableArray<IExpression> arguments)`
`29`	`29`	`{`
`30`		`- if (arguments == null)`
	`30`	`+ if (arguments.IsDefault)`
`31`	`31`	`throw new ArgumentNullException(nameof(arguments));`
`32`	`32`
`33`	`33`	`if (arguments.Length < MinParametersCount)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class Matrix : IExpression`
`19`	`19`	`/// <param name="vectors">The vectors.</param>`
`20`	`20`	`/// <exception cref="ArgumentNullException"><paramref name="vectors"/> is null.</exception>`
`21`	`21`	`public Matrix(Vector[] vectors)`
`22`		`- : this(vectors.ToImmutableArray())`
	`22`	`+ : this(vectors is null ? default : vectors.ToImmutableArray())`
`23`	`23`	`{`
`24`	`24`	`}`
`25`	`25`
`@@ -30,7 +30,7 @@ public Matrix(Vector[] vectors)`
`30`	`30`	`/// <exception cref="ArgumentNullException"><paramref name="vectors"/> is null.</exception>`
`31`	`31`	`public Matrix(ImmutableArray<Vector> vectors)`
`32`	`32`	`{`
`33`		`- if (vectors == null)`
	`33`	`+ if (vectors.IsDefault)`
`34`	`34`	`throw new ArgumentNullException(nameof(vectors));`
`35`	`35`
`36`	`36`	`if (vectors.Length < MinParametersCount)`