#636 - Change TargetFramework to .NET 6

sys27 · Jun 6, 2023 · 6c4f028 · 6c4f028
1 parent ff9359a
commit 6c4f028
Show file tree

Hide file tree

Showing 17 changed files with 129 additions and 43 deletions.
diff --git a/CI/azure-pipelines.yml b/CI/azure-pipelines.yml
@@ -71,7 +71,7 @@ jobs:
 
     - task: PublishPipelineArtifact@1
       inputs:
-        path: xFunc.Maths/bin/Release/netstandard2.1
+        path: xFunc.Maths/bin/Release/net6.0
         artifact: xFunc.Maths
 
     - task: PublishPipelineArtifact@1

diff --git a/xFunc.Maths/Expressions/Units/AngleUnits/AngleUnit.cs b/xFunc.Maths/Expressions/Units/AngleUnits/AngleUnit.cs
@@ -50,12 +50,28 @@ private AngleUnit(double factor, params string[] unitNames)
         => !left.Equals(right);
 
     /// <inheritdoc />
-    public bool Equals(AngleUnit other)
-        => Factor.Equals(other.Factor) && UnitNames.SequenceEqual(other.UnitNames);
+    public bool Equals(AngleUnit? other)
+    {
+        if (ReferenceEquals(null, other))
+            return false;
+        if (ReferenceEquals(this, other))
+            return true;
+
+        return Factor.Equals(other.Factor) && UnitNames.Equals(other.UnitNames);
+    }
 
     /// <inheritdoc />
     public override bool Equals(object? obj)
-        => obj is AngleUnit other && Equals(other);
+    {
+        if (ReferenceEquals(null, obj))
+            return false;
+        if (ReferenceEquals(this, obj))
+            return true;
+        if (obj.GetType() != GetType())
+            return false;
+
+        return Equals((AngleUnit)obj);
+    }
 
     /// <inheritdoc />
     [ExcludeFromCodeCoverage]
@@ -116,7 +132,7 @@ static void AddUnits(IDictionary<string, AngleUnit> dictionary, AngleUnit unit)
     /// <param name="unit">When this method returns, the value associated with the specified name, if the unit is found; otherwise, the default value for the type of the value parameter. This parameter is passed uninitialized.</param>
     /// <returns><c>true</c> if area units contain an unit with the specified <paramref name="name"/>; otherwise, <c>false</c>.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="name"/> is <c>null</c>.</exception>
-    public static bool FromName(string name, out AngleUnit unit)
+    public static bool FromName(string name, [NotNullWhen(true)] out AngleUnit? unit)
     {
         if (string.IsNullOrWhiteSpace(name))
             throw new ArgumentNullException(nameof(name));

diff --git a/xFunc.Maths/Expressions/Units/AreaUnits/AreaUnit.cs b/xFunc.Maths/Expressions/Units/AreaUnits/AreaUnit.cs
@@ -85,12 +85,31 @@ private AreaUnit(double factor, string unitName)
         => !left.Equals(right);
 
     /// <inheritdoc />
-    public bool Equals(AreaUnit other)
-        => Factor.Equals(other.Factor) && UnitName == other.UnitName;
+    public bool Equals(AreaUnit? other)
+    {
+        if (ReferenceEquals(null, other))
+            return false;
+
+        if (ReferenceEquals(this, other))
+            return true;
+
+        return Factor.Equals(other.Factor) && UnitName == other.UnitName;
+    }
 
     /// <inheritdoc />
     public override bool Equals(object? obj)
-        => obj is AreaUnit other && Equals(other);
+    {
+        if (ReferenceEquals(null, obj))
+            return false;
+
+        if (ReferenceEquals(this, obj))
+            return true;
+
+        if (obj.GetType() != GetType())
+            return false;
+
+        return Equals((AreaUnit)obj);
+    }
 
     /// <inheritdoc />
     [ExcludeFromCodeCoverage]
@@ -173,7 +192,7 @@ private static IDictionary<string, AreaUnit> GetUnits()
     /// <param name="unit">When this method returns, the value associated with the specified name, if the unit is found; otherwise, the default value for the type of the value parameter. This parameter is passed uninitialized.</param>
     /// <returns><c>true</c> if area units contain an unit with the specified <paramref name="name"/>; otherwise, <c>false</c>.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="name"/> is <c>null</c>.</exception>
-    public static bool FromName(string name, out AreaUnit unit)
+    public static bool FromName(string name, [NotNullWhen(true)] out AreaUnit? unit)
     {
         if (string.IsNullOrWhiteSpace(name))
             throw new ArgumentNullException(nameof(name));

diff --git a/xFunc.Maths/Expressions/Units/AreaUnits/AreaValue.cs b/xFunc.Maths/Expressions/Units/AreaUnits/AreaValue.cs
@@ -204,7 +204,7 @@ public int CompareTo(AreaValue other)
     }
 
     /// <inheritdoc />
-    public int CompareTo(object obj)
+    public int CompareTo(object? obj)
         => obj switch
         {
             null => 1,

diff --git a/xFunc.Maths/Expressions/Units/LengthUnits/LengthValue.cs b/xFunc.Maths/Expressions/Units/LengthUnits/LengthValue.cs
@@ -316,7 +316,7 @@ public int CompareTo(LengthValue other)
     }
 
     /// <inheritdoc />
-    public int CompareTo(object obj)
+    public int CompareTo(object? obj)
         => obj switch
         {
             null => 1,

diff --git a/xFunc.Maths/Expressions/Units/MassUnits/MassValue.cs b/xFunc.Maths/Expressions/Units/MassUnits/MassValue.cs
@@ -140,7 +140,7 @@ public int CompareTo(MassValue other)
     }
 
     /// <inheritdoc />
-    public int CompareTo(object obj)
+    public int CompareTo(object? obj)
         => obj switch
         {
             null => 1,

diff --git a/xFunc.Maths/Expressions/Units/PowerUnits/PowerValue.cs b/xFunc.Maths/Expressions/Units/PowerUnits/PowerValue.cs
@@ -92,7 +92,7 @@ public int CompareTo(PowerValue other)
     }
 
     /// <inheritdoc />
-    public int CompareTo(object obj)
+    public int CompareTo(object? obj)
         => obj switch
         {
             null => 1,

diff --git a/xFunc.Maths/Expressions/Units/TimeUnits/TimeValue.cs b/xFunc.Maths/Expressions/Units/TimeUnits/TimeValue.cs
@@ -188,7 +188,7 @@ public int CompareTo(TimeValue other)
     }
 
     /// <inheritdoc />
-    public int CompareTo(object obj)
+    public int CompareTo(object? obj)
         => obj switch
         {
             null => 1,

diff --git a/xFunc.Maths/Expressions/Units/VolumeUnits/VolumeUnit.cs b/xFunc.Maths/Expressions/Units/VolumeUnits/VolumeUnit.cs
@@ -70,17 +70,38 @@ private VolumeUnit(double factor, string unitName)
         => !left.Equals(right);
 
     /// <inheritdoc />
-    public bool Equals(VolumeUnit other)
-        => Factor.Equals(other.Factor) && UnitName == other.UnitName;
+    public bool Equals(VolumeUnit? other)
+    {
+        if (ReferenceEquals(null, other))
+            return false;
+
+        if (ReferenceEquals(this, other))
+            return true;
+
+        return Factor.Equals(other.Factor) && UnitName == other.UnitName;
+    }
 
     /// <inheritdoc />
     public override bool Equals(object? obj)
-        => obj is VolumeUnit other && Equals(other);
+    {
+        if (ReferenceEquals(null, obj))
+            return false;
+
+        if (ReferenceEquals(this, obj))
+            return true;
+
+        if (obj.GetType() != GetType())
+            return false;
+
+        return Equals((VolumeUnit)obj);
+    }
 
     /// <inheritdoc />
     [ExcludeFromCodeCoverage]
     public override int GetHashCode()
-        => HashCode.Combine(Factor, UnitName);
+    {
+        return HashCode.Combine(Factor, UnitName);
+    }
 
     /// <inheritdoc />
     public override string ToString()
@@ -129,7 +150,7 @@ private static IDictionary<string, VolumeUnit> GetUnits()
     /// <param name="unit">When this method returns, the value associated with the specified name, if the unit is found; otherwise, the default value for the type of the value parameter. This parameter is passed uninitialized.</param>
     /// <returns><c>true</c> if volume units contain an unit with the specified <paramref name="name"/>; otherwise, <c>false</c>.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="name"/> is <c>null</c>.</exception>
-    public static bool FromName(string name, out VolumeUnit unit)
+    public static bool FromName(string name, [NotNullWhen(true)] out VolumeUnit? unit)
     {
         if (string.IsNullOrWhiteSpace(name))
             throw new ArgumentNullException(nameof(name));

diff --git a/xFunc.Maths/Expressions/Units/VolumeUnits/VolumeValue.cs b/xFunc.Maths/Expressions/Units/VolumeUnits/VolumeValue.cs
@@ -156,7 +156,7 @@ public int CompareTo(VolumeValue other)
     }
 
     /// <inheritdoc />
-    public int CompareTo(object obj)
+    public int CompareTo(object? obj)
         => obj switch
         {
             null => 1,

diff --git a/xFunc.Maths/Parser.ExpressionFactory.cs b/xFunc.Maths/Parser.ExpressionFactory.cs
@@ -15,7 +15,7 @@ public partial class Parser
 {
     private IExpression CreateFunction(in Token token, ImmutableArray<IExpression> arguments)
     {
-        Debug.Assert(token.IsId(), "Token should be Id.");
+        Debug.Assert(token.Is(Id), "Token should be Id.");
         Debug.Assert(!string.IsNullOrWhiteSpace(token.StringValue), "Id is empty.");
 
         return token.StringValue.ToLowerInvariant() switch

diff --git a/xFunc.Maths/Results/ExpressionResult.cs b/xFunc.Maths/Results/ExpressionResult.cs
@@ -16,7 +16,7 @@ public ExpressionResult(IExpression exp)
         => Result = exp ?? throw new ArgumentNullException(nameof(exp));
 
     /// <inheritdoc />
-    public override string ToString() => Result.ToString();
+    public override string ToString() => Result.ToString()!;
 
     /// <inheritdoc cref="IResult.Result" />
     public IExpression Result { get; }

diff --git a/xFunc.Maths/Tokenization/Token.cs b/xFunc.Maths/Tokenization/Token.cs
@@ -77,10 +77,10 @@ public static Token Create(TokenKind kind)
     [ExcludeFromCodeCoverage]
     public override string ToString()
     {
-        if (IsId() || Is(TokenKind.String))
+        if (Is(TokenKind.Id) || Is(TokenKind.String))
             return $"String: {StringValue}";
 
-        if (IsNumber())
+        if (Is(TokenKind.Number))
             return $"Number: {NumberValue}";
 
         return $"Kind: {Kind}";
@@ -161,24 +161,6 @@ public override string ToString()
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public bool IsNotEmpty() => !Is(TokenKind.Empty);
 
-    /// <summary>
-    /// Determines whether the current token is <c>Id</c> token.
-    /// </summary>
-    /// <returns>
-    /// <c>true</c> if the current token is <c>Id</c> token; otherwise, <c>false</c>.
-    /// </returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool IsId() => Is(TokenKind.Id);
-
-    /// <summary>
-    /// Determines whether the current token is <c>Number</c> token.
-    /// </summary>
-    /// <returns>
-    /// <c>true</c> if the current token is <c>Number</c> token; otherwise, <c>false</c>.
-    /// </returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool IsNumber() => Is(TokenKind.Number);
-
     /// <summary>
     /// Gets a token kind.
     /// </summary>

diff --git a/xFunc.Maths/xFunc.Maths.csproj b/xFunc.Maths/xFunc.Maths.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <RootNamespace>xFunc.Maths</RootNamespace>
     <PackageId>xFunc.Maths</PackageId>

diff --git a/xFunc.Tests/Expressions/Units/AngleUnits/AngleUnitTest.cs b/xFunc.Tests/Expressions/Units/AngleUnits/AngleUnitTest.cs
@@ -2,6 +2,14 @@ namespace xFunc.Tests.Expressions.Units.AngleUnits;
 
 public class AngleUnitTest
 {
+    [Fact]
+    public void EqualsNullTest()
+    {
+        var a = AngleUnit.Degree;
+
+        Assert.False(a.Equals(null));
+    }
+
     [Fact]
     public void EqualsTest()
     {
@@ -20,6 +28,14 @@ public void NotEqualsTest()
         Assert.False(a.Equals(b));
     }
 
+    [Fact]
+    public void ObjectEqualsNullTest()
+    {
+        var a = AngleUnit.Degree;
+
+        Assert.False(a.Equals(null as object));
+    }
+
     [Fact]
     public void ObjectEqualsTest()
     {

diff --git a/xFunc.Tests/Expressions/Units/AreaUnits/AreaUnitTest.cs b/xFunc.Tests/Expressions/Units/AreaUnits/AreaUnitTest.cs
@@ -5,6 +5,14 @@ namespace xFunc.Tests.Expressions.Units.AreaUnits;
 
 public class AreaUnitTest
 {
+    [Fact]
+    public void EqualsNullTest()
+    {
+        var a = AreaUnit.Meter;
+
+        Assert.False(a.Equals(null));
+    }
+
     [Fact]
     public void EqualsTest()
     {
@@ -23,6 +31,14 @@ public void NotEqualsTest()
         Assert.False(a.Equals(b));
     }
 
+    [Fact]
+    public void ObjectEqualsNullTest()
+    {
+        var a = AreaUnit.Meter;
+
+        Assert.False(a.Equals(null as object));
+    }
+
     [Fact]
     public void ObjectEqualsTest()
     {

diff --git a/xFunc.Tests/Expressions/Units/VolumeUnits/VolumeUnitTest.cs b/xFunc.Tests/Expressions/Units/VolumeUnits/VolumeUnitTest.cs
@@ -5,6 +5,14 @@ namespace xFunc.Tests.Expressions.Units.VolumeUnits;
 
 public class VolumeUnitTest
 {
+    [Fact]
+    public void EqualsNullTest()
+    {
+        var a = VolumeUnit.Meter;
+
+        Assert.False(a.Equals(null));
+    }
+
     [Fact]
     public void EqualsTest()
     {
@@ -23,6 +31,14 @@ public void NotEqualsTest()
         Assert.False(a.Equals(b));
     }
 
+    [Fact]
+    public void ObjectEqualsNullTest()
+    {
+        var a = VolumeUnit.Meter;
+
+        Assert.False(a.Equals(null as object));
+    }
+
     [Fact]
     public void ObjectEqualsTest()
     {