Add conversion properties that return a quantity

CodeGen/Generators/Common/QuantityGenerator.cs

@@ -0,0 +1,67 @@
+// 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 CodeGen.Helpers;
+using CodeGen.JsonTypes;
+
+namespace CodeGen.Generators.Common
+{
+    internal static class QuantityGenerator
+    {
+        internal static void GenerateConversionProperties(Quantity quantity, MyTextWriter Writer)
+        {
+            Writer.WL(@"
+        #region Conversion Properties
+");
+            foreach (var unit in quantity.Units)
+            {
+                if (unit.SkipConversionGeneration)
+                    continue;
+
+                Writer.WL($@"
+        /// <summary>
+        ///     Gets this <see cref=""{quantity.Name}""/> converted into <see cref=""{quantity.Name}Unit.{unit.SingularName}"">{unit.PluralName}</see> as a <see cref=""double""/>.
+        /// </summary>
+        [Obsolete(""Use the To{unit.PluralName} property."")]");
+                Writer.WLIfText(2, GetObsoleteAttributeOrNull(unit));
+                Writer.WL($@"
+        public double {unit.PluralName} => As({quantity.Name}Unit.{unit.SingularName});
+");
+            }
+
+            foreach (var unit in quantity.Units)
+            {
+                if (unit.SkipConversionGeneration)
+                    continue;
+
+                Writer.WL($@"
+        /// <summary>
+        ///     Gets this <see cref=""{quantity.Name}""/> converted into <see cref=""{quantity.Name}Unit.{unit.SingularName}"">{unit.PluralName}</see>.
+        /// </summary>");
+                Writer.WLIfText(2, GetObsoleteAttributeOrNull(unit));
+                Writer.WL($@"
+        public {quantity.Name} To{unit.PluralName} => ToUnit({quantity.Name}Unit.{unit.SingularName});
+");
+            }
+
+            Writer.WL(@"
+
+        #endregion
+");
+        }
+
+        /// <inheritdoc cref="GetObsoleteAttributeOrNull(string)"/>
+        internal static string? GetObsoleteAttributeOrNull(Quantity quantity) => GetObsoleteAttributeOrNull(quantity.ObsoleteText);
+
+        /// <inheritdoc cref="GetObsoleteAttributeOrNull(string)"/>
+        internal static string? GetObsoleteAttributeOrNull(Unit unit) => GetObsoleteAttributeOrNull(unit.ObsoleteText);
+
+        /// <summary>
+        /// Returns the Obsolete attribute if ObsoleteText has been defined on the JSON input - otherwise returns empty string
+        /// It is up to the consumer to wrap any padding/new lines in order to keep to correct indentation formats
+        /// </summary>
+        private static string? GetObsoleteAttributeOrNull(string obsoleteText) => string.IsNullOrWhiteSpace(obsoleteText)
+            ? null
+            : $"[Obsolete(\"{obsoleteText}\")]";
+    }
+}

CodeGen/Generators/NanoFrameworkGen/QuantityGenerator.cs

@@ -108,7 +108,7 @@ public struct  {_quantity.Name}
         /// </summary>
         public static {_quantity.Name} Zero {{ get; }} = new {_quantity.Name}(0, BaseUnit);");
 
-            GenerateConversionProperties();
+            Common.QuantityGenerator.GenerateConversionProperties(_quantity, Writer);
             GenerateStaticFactoryMethods();
             GenerateConversionMethods();
 
@@ -120,32 +120,6 @@ public struct  {_quantity.Name}
             return Writer.ToString();
         }
 
-        private void GenerateConversionProperties()
-        {
-            Writer.WL(@"
-        #region Conversion Properties
-");
-            foreach (var unit in _quantity.Units)
-            {
-                if (unit.SkipConversionGeneration)
-                    continue;
-
-                Writer.WL($@"
-        /// <summary>
-        ///     Gets a <see cref=""double""/> value of this quantity converted into <see cref=""{_unitEnumName}.{unit.SingularName}""/>
-        /// </summary>");
-                Writer.WLIfText(2, GetObsoleteAttributeOrNull(unit));
-                Writer.WL($@"
-        public {_quantity.BaseType} {unit.PluralName} => As({_unitEnumName}.{unit.SingularName});
-");
-            }
-
-            Writer.WL(@"
-
-        #endregion
-");
-        }
-
         private void GenerateStaticFactoryMethods()
         {
             Writer.WL(@"

CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs

@@ -97,7 +97,7 @@ public partial struct {_quantity.Name} : IQuantity<{_unitEnumName}>, ");
             GenerateInstanceConstructors();
             GenerateStaticProperties();
             GenerateProperties();
-            GenerateConversionProperties();
+            Common.QuantityGenerator.GenerateConversionProperties(_quantity, Writer);
             GenerateStaticMethods();
             GenerateStaticFactoryMethods();
             GenerateStaticParseMethods();
@@ -326,32 +326,6 @@ private void GenerateProperties()
 ");
         }
 
-        private void GenerateConversionProperties()
-        {
-            Writer.WL(@"
-        #region Conversion Properties
-");
-            foreach (var unit in _quantity.Units)
-            {
-                if (unit.SkipConversionGeneration)
-                    continue;
-
-                Writer.WL($@"
-        /// <summary>
-        ///     Gets a <see cref=""double""/> value of this quantity converted into <see cref=""{_unitEnumName}.{unit.SingularName}""/>
-        /// </summary>");
-                Writer.WLIfText(2, GetObsoleteAttributeOrNull(unit));
-                Writer.WL($@"
-        public double {unit.PluralName} => As({_unitEnumName}.{unit.SingularName});
-");
-            }
-
-            Writer.WL(@"
-
-        #endregion
-");
-        }
-
         private void GenerateStaticMethods()
         {
             Writer.WL($@"

CodeGen/Generators/UnitsNetWrcGen/QuantityGenerator.cs

@@ -86,7 +86,7 @@ public sealed partial class {_quantity.Name} : IQuantity
             GenerateInstanceConstructors();
             GenerateStaticProperties();
             GenerateProperties();
-            GenerateConversionProperties();
+            Common.QuantityGenerator.GenerateConversionProperties(_quantity, Writer);
             GenerateStaticMethods();
             GenerateStaticFactoryMethods();
             GenerateStaticParseMethods();
@@ -252,32 +252,6 @@ private void GenerateProperties()
 ");
         }
 
-        private void GenerateConversionProperties()
-        {
-            Writer.WL(@"
-        #region Conversion Properties
-");
-            foreach (var unit in _quantity.Units)
-            {
-                if (unit.SkipConversionGeneration)
-                    continue;
-
-                Writer.WL($@"
-        /// <summary>
-        ///     Gets a <see cref=""double""/> value of this quantity converted into <see cref=""{_unitEnumName}.{unit.SingularName}""/>
-        /// </summary>");
-                Writer.WLIfText(2, GetObsoleteAttributeOrNull(unit));
-                Writer.WL($@"
-        public double {unit.PluralName} => As({_unitEnumName}.{unit.SingularName});
-");
-            }
-
-            Writer.WL(@"
-
-        #endregion
-");
-        }
-
         private void GenerateStaticMethods()
         {
             Writer.WL($@"