Merge v6 release branch into master (#1536)

Branched out `master` to `maintenance/v5` and merging `release/v6` into
`master`.

From now on, v6 code base is the main branch although it is still in
prerelease and still needs a bit more work before the first release.

Author: angularsen

Build/build-pack-nano-nugets.psm1

@@ -8,7 +8,6 @@ function Invoke-BuildNanoNugets {
   & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Duration\UnitsNet.NanoFramework.Duration.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
   & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\ElectricCurrent\UnitsNet.NanoFramework.ElectricCurrent.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
   & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\ElectricPotential\UnitsNet.NanoFramework.ElectricPotential.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
-  & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\ElectricPotentialDc\UnitsNet.NanoFramework.ElectricPotentialDc.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
   & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\ElectricResistance\UnitsNet.NanoFramework.ElectricResistance.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
   & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Frequency\UnitsNet.NanoFramework.Frequency.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
   & $nuget pack "$root\UnitsNet.NanoFramework\GeneratedCode\Illuminance\UnitsNet.NanoFramework.Illuminance.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"

CodeGen/CodeGen.csproj

@@ -2,19 +2,19 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <!-- Allow compile with various nullability warnings until fixed. -->
     <WarningsNotAsErrors>8600,8601,8603,8604,8618,8619,8625</WarningsNotAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NuGet.Protocol" Version="6.12.1" />
-    <PackageReference Include="Serilog" Version="4.2.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-    <PackageReference Include="System.CommandLine.DragonFruit" Version="0.2.0-alpha.19174.3" />
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="NuGet.Protocol" />
+    <PackageReference Include="Serilog" />
+    <PackageReference Include="Serilog.Sinks.Console" />
+    <PackageReference Include="System.CommandLine.DragonFruit" />
   </ItemGroup>
 
 </Project>

CodeGen/Exceptions/UnitsNetCodeGenException.cs

@@ -2,20 +2,11 @@
 // Copyright 2013 Andreas Gullberg Larsen ([email protected]). Maintained at https://github.com/angularsen/UnitsNet.
 
 using System;
-using System.Runtime.Serialization;
 
 namespace CodeGen.Exceptions
 {
     internal class UnitsNetCodeGenException : Exception
     {
-        public UnitsNetCodeGenException()
-        {
-        }
-
-        protected UnitsNetCodeGenException(SerializationInfo info, StreamingContext context) : base(info, context)
-        {
-        }
-
         public UnitsNetCodeGenException(string message) : base(message)
         {
         }

CodeGen/Generators/NanoFrameworkGen/NuspecGenerator.cs

@@ -25,7 +25,7 @@ public string Generate()
 <package xmlns=""http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"">
   <metadata>
     <id>UnitsNet.nanoFramework.{_quantity.Name}</id>
-    <version>5.74.0</version>
+    <version>6.0.0-pre014</version>
     <title>Units.NET {_quantity.Name} - nanoFramework</title>
     <authors>Andreas Gullberg Larsen,nanoframework</authors>
     <owners>UnitsNet</owners>

CodeGen/Generators/NanoFrameworkGen/QuantityGenerator.cs

@@ -43,7 +43,7 @@ public struct  {_quantity.Name}
         /// <summary>
         ///     The numeric value this quantity was constructed with.
         /// </summary>
-        private readonly {_quantity.ValueType} _value;
+        private readonly double _value;
 
         /// <summary>
         ///     The unit this quantity was constructed with.
@@ -53,7 +53,7 @@ public struct  {_quantity.Name}
         /// <summary>
         ///     The numeric value this quantity was constructed with.
         /// </summary>
-        public {_quantity.ValueType} Value => _value;
+        public double Value => _value;
 
         /// <inheritdoc />
         public {_unitEnumName} Unit => _unit;
@@ -65,8 +65,7 @@ public struct  {_quantity.Name}
         /// </summary>
         /// <param name=""value"">The numeric value to construct this quantity with.</param>
         /// <param name=""unit"">The unit representation to construct this quantity with.</param>
-        /// <exception cref=""ArgumentException"">If value is NaN or Infinity.</exception>
-        public {_quantity.Name}({_quantity.ValueType} value, {_unitEnumName} unit)
+        public {_quantity.Name}(double value, {_unitEnumName} unit)
         {{
             _value = value;
             _unit = unit;
@@ -79,29 +78,14 @@ public struct  {_quantity.Name}
 
         /// <summary>
         /// Represents the largest possible value of {_quantity.Name}.
-        /// </summary>");
-
-            // Non decimal
-            Writer.WLCondition(_quantity.ValueType != "decimal", $@"
-        public static {_quantity.Name} MaxValue {{ get; }} = new {_quantity.Name}({_quantity.ValueType}.MaxValue, BaseUnit);
-
-        /// <summary>
-        /// Represents the smallest possible value of {_quantity.Name}.
         /// </summary>
-        public static {_quantity.Name} MinValue {{ get; }} = new {_quantity.Name}({_quantity.ValueType}.MinValue, BaseUnit);
-");
-
-            // Decimal MaxValue = 79228162514264337593543950335M
-            Writer.WLCondition(_quantity.ValueType == "decimal", $@"
-        public static {_quantity.Name} MaxValue {{ get; }} = new {_quantity.Name}(79228162514264337593543950335M, BaseUnit);
+        public static {_quantity.Name} MaxValue {{ get; }} = new {_quantity.Name}(double.MaxValue, BaseUnit);
 
         /// <summary>
         /// Represents the smallest possible value of {_quantity.Name}.
         /// </summary>
-        public static {_quantity.Name} MinValue {{ get; }} = new {_quantity.Name}(-79228162514264337593543950335M, BaseUnit);
-");
+        public static {_quantity.Name} MinValue {{ get; }} = new {_quantity.Name}(double.MinValue, BaseUnit);
 
-            Writer.WL($@"
         /// <summary>
         ///     Gets an instance of this quantity with a value of 0 in the base unit Second.
         /// </summary>
@@ -134,7 +118,7 @@ private void GenerateConversionProperties()
         /// </summary>");
                 Writer.WLIfText(2, GetObsoleteAttributeOrNull(unit));
                 Writer.WL($@"
-        public {_quantity.ValueType} {unit.PluralName} => As({_unitEnumName}.{unit.SingularName});
+        public double {unit.PluralName} => As({_unitEnumName}.{unit.SingularName});
 ");
             }
 
@@ -157,11 +141,10 @@ private void GenerateStaticFactoryMethods()
                 Writer.WL($@"
         /// <summary>
         ///     Creates a <see cref=""{_quantity.Name}""/> from <see cref=""{_unitEnumName}.{unit.SingularName}""/>.
-        /// </summary>
-        /// <exception cref=""ArgumentException"">If value is NaN or Infinity.</exception>");
+        /// </summary>");
                 Writer.WLIfText(2, GetObsoleteAttributeOrNull(unit));
                 Writer.WL($@"
-        public static {_quantity.Name} From{unit.PluralName}({_quantity.ValueType} {valueParamName}) => new {_quantity.Name}({valueParamName}, {_unitEnumName}.{unit.SingularName});
+        public static {_quantity.Name} From{unit.PluralName}(double {valueParamName}) => new {_quantity.Name}({valueParamName}, {_unitEnumName}.{unit.SingularName});
 ");
             }
 
@@ -172,7 +155,7 @@ private void GenerateStaticFactoryMethods()
         /// <param name=""value"">Value to convert from.</param>
         /// <param name=""fromUnit"">Unit to convert from.</param>
         /// <returns>{_quantity.Name} unit value.</returns>
-        public static {_quantity.Name} From({_quantity.ValueType} value, {_unitEnumName} fromUnit)
+        public static {_quantity.Name} From(double value, {_unitEnumName} fromUnit)
         {{
             return new {_quantity.Name}(value, fromUnit);
         }}
@@ -190,7 +173,7 @@ private void GenerateConversionMethods()
                 ///     Convert to the unit representation <paramref name=""unit"" />.
                 /// </summary>
                 /// <returns>Value converted to the specified unit.</returns>
-                public {_quantity.ValueType} As({_unitEnumName} unit) => GetValueAs(unit);
+                public double As({_unitEnumName} unit) => GetValueAs(unit);
 
                 /// <summary>
                 ///     Converts this {_quantity.Name} to another {_quantity.Name} with the unit representation <paramref name=""unit"" />.
@@ -207,7 +190,7 @@ private void GenerateConversionMethods()
                 ///     This is typically the first step in converting from one unit to another.
                 /// </summary>
                 /// <returns>The value in the base unit representation.</returns>
-                private {_quantity.ValueType} GetValueInBaseUnit()
+                private double GetValueInBaseUnit()
                 {{
                     return Unit switch
                     {{");
@@ -223,7 +206,7 @@ private void GenerateConversionMethods()
                     }};
                     }}
 
-                private {_quantity.ValueType} GetValueAs({_unitEnumName} unit)
+                private double GetValueAs({_unitEnumName} unit)
                 {{
                     if (Unit == unit)
                         return _value;

CodeGen/Generators/NanoFrameworkGenerator.cs

@@ -90,20 +90,6 @@ public static void Generate(string rootDir, Quantity[] quantities, QuantityNameT
                 GenerateQuantity(quantity, Path.Combine(outputQuantities, $"{quantity.Name}.g.cs"));
                 GenerateProject(quantity, Path.Combine(projectPath, $"{quantity.Name}.nfproj"), versions);
 
-                // Convert decimal based units to floats; decimals are not supported by nanoFramework
-                if (quantity.ValueType == "decimal")
-                {
-                    var replacements = new Dictionary<string, string>
-                    {
-                        { "(\\d)m", "$1d" },
-                        { "(\\d)M", "$1d" },
-                        { " decimal ", " double " },
-                        { "(decimal ", "(double " }
-                    };
-                    new FileInfo(Path.Combine(outputDir, "Units", $"{quantity.Name}Unit.g.cs")).EditFile(replacements);
-                    new FileInfo(Path.Combine(outputDir, "Quantities", $"{quantity.Name}.g.cs")).EditFile(replacements);
-                }
-
                 Log.Information("✅ {Quantity} (nanoFramework)", quantity.Name);
             }
             Log.Information("");