Remove conditional compilation

angularsen · Mar 3, 2024 · 6fd3a85 · 6fd3a85
1 parent 40bbd6f
commit 6fd3a85
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 49 deletions.
diff --git a/CodeGen/Generators/UnitsNetGen/NumberExtensionsGenerator.cs b/CodeGen/Generators/UnitsNetGen/NumberExtensionsGenerator.cs
@@ -24,10 +24,7 @@ public string Generate()
             Writer.WL(
 $@"
 using System;
-
-#if NET7_0_OR_GREATER
 using System.Numerics;
-#endif
 
 #nullable enable
 
@@ -50,10 +47,7 @@ public static class NumberTo{_quantityName}Extensions
                 Writer.WLIfText(2, GetObsoleteAttributeOrNull(unit.ObsoleteText));
 
                 Writer.WL(2, $@"public static {_quantityName} {unit.PluralName}<T>(this T value)
-            where T : notnull
-#if NET7_0_OR_GREATER
-            , INumber<T>
-#endif
+            where T : notnull, INumber<T>
             => {_quantityName}.From{unit.PluralName}(Convert.ToDouble(value));
 ");
             }

diff --git a/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs b/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs
@@ -38,10 +38,8 @@ public string Generate()
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;");
-            if (_quantity.Relations.Any(r => r.Operator is "*" or "/"))
-                Writer.WL(@"#if NET7_0_OR_GREATER
-using System.Numerics;
-#endif");
+            Writer.WLCondition(_quantity.Relations.Any(r => r.Operator is "*" or "/"),
+                @"using System.Numerics;");
             Writer.WL(@"using System.Runtime.Serialization;
 using UnitsNet.InternalHelpers;
 using UnitsNet.Units;
@@ -69,33 +67,25 @@ namespace UnitsNet
     public readonly partial struct {_quantity.Name} :
         {(_quantity.GenerateArithmetic ? "IArithmeticQuantity" : "IQuantity")}<{_quantity.Name}, {_unitEnumName}>,");
 
-            if (_quantity.Relations.Any(r => r.Operator is "*" or "/"))
+            foreach (var relation in _quantity.Relations)
             {
-                Writer.WL(@$"
-#if NET7_0_OR_GREATER");
-                foreach (var relation in _quantity.Relations)
+                if (relation.LeftQuantity == _quantity)
                 {
-                    if (relation.LeftQuantity == _quantity)
+                    switch (relation.Operator)
                     {
-                        switch (relation.Operator)
-                        {
-                            case "*":
-                                Writer.W(@"
+                        case "*":
+                            Writer.W(@"
         IMultiplyOperators");
-                                break;
-                            case "/":
-                                Writer.W(@"
+                            break;
+                        case "/":
+                            Writer.W(@"
         IDivisionOperators");
-                                break;
-                            default:
-                                continue;
-                        }
-                        Writer.WL($"<{relation.LeftQuantity.Name}, {relation.RightQuantity.Name}, {relation.ResultQuantity.Name}>,");
+                            break;
+                        default:
+                            continue;
                     }
+                    Writer.WL($"<{relation.LeftQuantity.Name}, {relation.RightQuantity.Name}, {relation.ResultQuantity.Name}>,");
                 }
-
-                Writer.WL(@$"
-#endif");
             }
 
             Writer.WL(@$"

diff --git a/UnitsNet.Tests/GenericMathExtensionsTests.cs b/UnitsNet.Tests/GenericMathExtensionsTests.cs
@@ -1,7 +1,6 @@
 // Licensed under MIT No Attribution, see LICENSE file at the root.
 // Copyright 2013 Andreas Gullberg Larsen ([email protected]). Maintained at https://github.com/angularsen/UnitsNet.
 
-#if NET7_0_OR_GREATER
 using UnitsNet.GenericMath;
 using Xunit;
 
@@ -25,5 +24,3 @@ public void CanCalcAverage_ForQuantitiesWithDoubleValueType()
         Assert.Equal(Length.FromCentimeters(150), values.Average());
     }
 }
-
-#endif
diff --git a/UnitsNet.Tests/Serialization/CustomSerializationTests.cs b/UnitsNet.Tests/Serialization/CustomSerializationTests.cs
@@ -8,7 +8,6 @@ namespace UnitsNet.Tests.Serialization;
 
 public class CustomSerializationTests
 {
-#if NET7_0_OR_GREATER
     private record QuantityDto(double Value, string QuantityName, string UnitName);
 
     /// <summary>
@@ -48,5 +47,4 @@ public void CanMapToJsonAndBackViaCustomDto()
         Assert.Equal(5, deserializedQuantity!.Value);
         Assert.Equal(LengthUnit.Centimeter, deserializedQuantity.Unit);
     }
-#endif
 }
diff --git a/UnitsNet/GenericMath/GenericMathExtensions.cs b/UnitsNet/GenericMath/GenericMathExtensions.cs
@@ -1,7 +1,6 @@
 // Licensed under MIT No Attribution, see LICENSE file at the root.
 // Copyright 2013 Andreas Gullberg Larsen ([email protected]). Maintained at https://github.com/angularsen/UnitsNet.
 
-#if NET7_0_OR_GREATER
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
@@ -65,4 +64,3 @@ public static T Average<T>(this IEnumerable<T> source)
         return result.value / result.count;
     }
 }
-#endif
diff --git a/UnitsNet/IArithmeticQuantity.cs b/UnitsNet/IArithmeticQuantity.cs
@@ -12,21 +12,17 @@ namespace UnitsNet;
 /// <typeparam name="TSelf">The type itself, for the CRT pattern.</typeparam>
 /// <typeparam name="TUnitType">The underlying unit enum type.</typeparam>
 public interface IArithmeticQuantity<TSelf, TUnitType> : IQuantity<TSelf, TUnitType>
-#if NET7_0_OR_GREATER
     , IAdditionOperators<TSelf, TSelf, TSelf>
     , IAdditiveIdentity<TSelf, TSelf>
     , ISubtractionOperators<TSelf, TSelf, TSelf>
     , IMultiplyOperators<TSelf, double, TSelf>
     , IDivisionOperators<TSelf, double, TSelf>
     , IUnaryNegationOperators<TSelf, TSelf>
-#endif
     where TSelf : IArithmeticQuantity<TSelf, TUnitType>
     where TUnitType : Enum
 {
-#if NET7_0_OR_GREATER
     /// <summary>
     ///     The zero value of this quantity.
     /// </summary>
     static abstract TSelf Zero { get; }
-#endif
 }
diff --git a/UnitsNet/IQuantity.cs b/UnitsNet/IQuantity.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Globalization;
-#if NET7_0_OR_GREATER
 using System.Numerics;
-#endif
 using UnitsNet.Units;
 
 namespace UnitsNet
@@ -147,15 +145,10 @@ public interface IQuantity<TUnitType> : IQuantity
     /// </summary>
     /// <typeparam name="TSelf">The type itself, for the CRT pattern.</typeparam>
     /// <typeparam name="TUnitType">The underlying unit enum type.</typeparam>
-#if NET7_0_OR_GREATER
     public interface IQuantity<TSelf, TUnitType>
         : IQuantity<TUnitType>
         , IComparisonOperators<TSelf, TSelf, bool>
         , IParsable<TSelf>
-#else
-    public interface IQuantity<in TSelf, TUnitType>
-        : IQuantity<TUnitType>
-#endif
         where TSelf : IQuantity<TSelf, TUnitType>
         where TUnitType : Enum
     {