merged from upstream

Author: lipchev

Build/bump-version-UnitsNet-major.bat

@@ -1,5 +1,5 @@
 @echo off
 SET scriptdir=%~dp0
-call powershell -NoProfile %scriptdir%\set-version-UnitsNet.ps1 -bump major
 call powershell -NoProfile %scriptdir%\set-version-UnitsNet.NumberExtensions.ps1 -bump major
+call powershell -NoProfile %scriptdir%\set-version-UnitsNet.ps1 -bump major
 if %errorlevel% neq 0 exit /b %errorlevel%

Build/bump-version-UnitsNet-minor.bat

@@ -1,5 +1,5 @@
 @echo off
 SET scriptdir=%~dp0
-call powershell -NoProfile %scriptdir%\set-version-UnitsNet.ps1 -bump minor
 call powershell -NoProfile %scriptdir%\set-version-UnitsNet.NumberExtensions.ps1 -bump minor
+call powershell -NoProfile %scriptdir%\set-version-UnitsNet.ps1 -bump minor
 if %errorlevel% neq 0 exit /b %errorlevel%

Build/bump-version-UnitsNet-patch.bat

@@ -1,5 +1,5 @@
 @echo off
 SET scriptdir=%~dp0
-call powershell -NoProfile %scriptdir%\set-version-UnitsNet.ps1 -bump patch
 call powershell -NoProfile %scriptdir%\set-version-UnitsNet.NumberExtensions.ps1 -bump patch
+call powershell -NoProfile %scriptdir%\set-version-UnitsNet.ps1 -bump patch
 if %errorlevel% neq 0 exit /b %errorlevel%

Build/bump-version-UnitsNet-suffix.bat

@@ -1,5 +1,5 @@
 @echo off
 SET scriptdir=%~dp0
-call powershell -NoProfile %scriptdir%\set-version-UnitsNet.ps1 -bump suffix
 call powershell -NoProfile %scriptdir%\set-version-UnitsNet.NumberExtensions.ps1 -bump suffix
+call powershell -NoProfile %scriptdir%\set-version-UnitsNet.ps1 -bump suffix
 if %errorlevel% neq 0 exit /b %errorlevel%

CodeGen/CodeGen.csproj

@@ -5,6 +5,8 @@
     <TargetFramework>netcoreapp2.1</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>

CodeGen/Generators/UnitsNetGen/IQuantityTestClassGenerator.cs

@@ -1,4 +1,4 @@
-// Licensed under MIT No Attribution, see LICENSE file at the root.
+// 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.
 
 using System;

CodeGen/Generators/UnitsNetGen/NumberExtensionsGenerator.cs

@@ -52,9 +52,9 @@ public static class NumberTo{_quantityName}Extensions
             return Writer.ToString();
         }
 
-        private string GetObsoleteAttributeOrNull(string obsoleteText) =>
+        private static string? GetObsoleteAttributeOrNull(string obsoleteText) =>
             string.IsNullOrWhiteSpace(obsoleteText) ?
             null :
-            $"[System.Obsolete({obsoleteText})]";
+            $"[System.Obsolete(\"{obsoleteText}\")]";
     }
 }

CodeGen/Generators/UnitsNetGen/NumberExtensionsTestClassGenerator.cs

@@ -28,7 +28,7 @@ public override string Generate()
 using Xunit;
 
 namespace UnitsNet.Tests
-{{    
+{{
     public class NumberTo{_quantityName}ExtensionsTests
     {{");
 

CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs

@@ -69,8 +69,15 @@ namespace UnitsNet
     ///     {_quantity.XmlDocRemarks}
     /// </remarks>");
 
+            Writer.W(@$"
+    public partial struct {_quantity.Name} : IQuantity<{_unitEnumName}>, ");
+            if (_quantity.BaseType == "decimal")
+            {
+                Writer.W("IDecimalQuantity, ");
+            }
+
+            Writer.WL($"IEquatable<{_quantity.Name}>, IComparable, IComparable<{_quantity.Name}>, IConvertible, IFormattable");
             Writer.WL($@"
-    public partial struct {_quantity.Name} : IQuantity<{_unitEnumName}>, IEquatable<{_quantity.Name}>, IComparable, IComparable<{_quantity.Name}>, IConvertible, IFormattable
     {{
         /// <summary>
         ///     The numeric value this quantity was constructed with.
@@ -117,7 +124,7 @@ private void GenerateStaticConstructor()
 ");
 
             Writer.WL($@"
-            Info = new QuantityInfo<{_unitEnumName}>(QuantityType.{_quantity.Name},
+            Info = new QuantityInfo<{_unitEnumName}>(""{_quantity.Name}"",
                 new UnitInfo<{_unitEnumName}>[] {{");
 
             foreach (var unit in _quantity.Units)
@@ -147,10 +154,10 @@ private void GenerateStaticConstructor()
                 }
             }
 
-            Writer.WL(@"
-                },
-                BaseUnit, Zero, BaseDimensions);
-        }
+            Writer.WL($@"
+                }},
+                BaseUnit, Zero, BaseDimensions, QuantityType.{_quantity.Name});
+        }}
 ");
         }
 
@@ -228,16 +235,19 @@ private void GenerateStaticProperties()
         /// <summary>
         /// Represents the largest possible value of {_quantity.Name}
         /// </summary>
+        [Obsolete(""MaxValue and MinValue will be removed. Choose your own value or use nullability for unbounded lower/upper range checks. See discussion in https://github.com/angularsen/UnitsNet/issues/848."")]
         public static {_quantity.Name} MaxValue {{ get; }} = new {_quantity.Name}({_valueType}.MaxValue, BaseUnit);
 
         /// <summary>
         /// Represents the smallest possible value of {_quantity.Name}
         /// </summary>
+        [Obsolete(""MaxValue and MinValue will be removed. Choose your own value or use nullability for unbounded lower/upper range checks. See discussion in https://github.com/angularsen/UnitsNet/issues/848."")]
         public static {_quantity.Name} MinValue {{ get; }} = new {_quantity.Name}({_valueType}.MinValue, BaseUnit);
 
         /// <summary>
         ///     The <see cref=""QuantityType"" /> of this quantity.
         /// </summary>
+        [Obsolete(""QuantityType will be removed in the future. Use Info property instead."")]
         public static QuantityType QuantityType {{ get; }} = QuantityType.{_quantity.Name};
 
         /// <summary>
@@ -270,6 +280,11 @@ private void GenerateProperties()
                 Writer.WL(@"
         double IQuantity.Value => (double) _value;
 ");
+            if (_quantity.BaseType == "decimal")
+                Writer.WL(@"
+        /// <inheritdoc cref=""IDecimalQuantity.Value""/>
+        decimal IDecimalQuantity.Value => _value;
+");
 
             Writer.WL($@"
         Enum IQuantity.Unit => Unit;
@@ -794,7 +809,7 @@ public bool Equals({_quantity.Name} other, double tolerance, ComparisonType comp
         /// <returns>A hash code for the current {_quantity.Name}.</returns>
         public override int GetHashCode()
         {{
-            return new {{ QuantityType, Value, Unit }}.GetHashCode();
+            return new {{ Info.Name, Value, Unit }}.GetHashCode();
         }}
 
         #endregion
@@ -1106,6 +1121,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider)
                 return Unit;
             else if(conversionType == typeof(QuantityType))
                 return {_quantity.Name}.QuantityType;
+            else if(conversionType == typeof(QuantityInfo))
+                return {_quantity.Name}.Info;
             else if(conversionType == typeof(BaseDimensions))
                 return {_quantity.Name}.BaseDimensions;
             else
@@ -1142,6 +1159,6 @@ ulong IConvertible.ToUInt64(IFormatProvider provider)
         /// </summary>
         private static string GetObsoleteAttributeOrNull(string obsoleteText) => string.IsNullOrWhiteSpace(obsoleteText)
             ? null
-            : $"[System.Obsolete({obsoleteText})]";
+            : $"[System.Obsolete(\"{obsoleteText}\")]";
     }
 }

CodeGen/Generators/UnitsNetGen/QuantityTypeGenerator.cs

@@ -1,4 +1,4 @@
-using CodeGen.JsonTypes;
+using CodeGen.JsonTypes;
 
 namespace CodeGen.Generators.UnitsNetGen
 {