Except for the tests, it compiles again

Author: pgrawehr

CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs

@@ -912,6 +912,16 @@ double IQuantity.As(Enum unit)
             return ToUnit(unit, DefaultConversionFunctions);
         }}
 
+        /// <summary>
+        ///     Converts this {_quantity.Name} to another {_quantity.Name} with the unit representation <paramref name=""unit"" /> and returns its see <cref name=""QuantityValue"" />.
+        /// </summary>
+        /// <param name=""unit"">The unit to convert to.</param>
+        /// <returns>A {_quantity.Name} with the specified unit.</returns>
+        public QuantityValue ToQuantity({_unitEnumName} unit)
+        {{
+            return ((IQuantity)ToUnit(unit, DefaultConversionFunctions)).Value;
+        }}
+
         /// <summary>
         ///     Converts this {_quantity.Name} to another {_quantity.Name} using the given <paramref name=""unitConverter""/> with the unit representation <paramref name=""unit"" />.
         /// </summary>

UnitsNet.Serialization.JsonNet.Tests/UnitsNetBaseJsonConverterTest.cs

@@ -54,7 +54,7 @@ public void UnitsNetBaseJsonConverter_ConvertValueUnit_works_as_expected()
 
             Assert.NotNull(result);
             Assert.IsType<Power>(result);
-            Assert.True(Power.FromWatts(10.2365m).Equals((Power)result, 1E-5, ComparisonType.Absolute));
+            Assert.True(Power.FromWatts(10.2365m).Equals((Power)result, 1E-5M, ComparisonType.Absolute));
 
         }
 

UnitsNet.Serialization.JsonNet.Tests/UnitsNetIComparableJsonConverterTest.cs

@@ -117,7 +117,7 @@ public void UnitsNetIComparableJsonConverter_ReadJson_works_as_expected()
 
             Assert.NotNull(result);
             Assert.IsType<Power>(result);
-            Assert.Equal(120D, ((Power)result).Watts);
+            Assert.Equal(120M, ((Power)result).Watts);
         }
     }
 }

UnitsNet.Serialization.JsonNet.Tests/UnitsNetIQuantityJsonConverterTest.cs

@@ -135,7 +135,7 @@ public void UnitsNetIQuantityJsonConverter_ReadJson_works_as_expected()
 
             Assert.NotNull(result);
             Assert.IsType<Power>(result);
-            Assert.Equal(10.3654D, ((Power)result).Watts);
+            Assert.Equal(10.3654M, ((Power)result).Watts);
         }
     }
 }

UnitsNet/CustomCode/Quantities/BrakeSpecificFuelConsumption.extra.cs

@@ -1,14 +1,16 @@
 // 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 UnitsNet.Units;
+
 namespace UnitsNet
 {
     public partial struct BrakeSpecificFuelConsumption
     {
         /// <summary>Get <see cref="MassFlow"/> from <see cref="BrakeSpecificFuelConsumption"/> times <see cref="Power"/>.</summary>
         public static MassFlow operator *(BrakeSpecificFuelConsumption bsfc, Power power)
         {
-            return MassFlow.FromKilogramsPerSecond(bsfc.KilogramsPerJoule*power.Watts);
+            return MassFlow.FromKilogramsPerSecond(bsfc.KilogramsPerJoule * power.ToQuantity(PowerUnit.Watt));
         }
 
         /// <summary>Get <see cref="SpecificEnergy"/> from <paramref name="value"/> divided by <see cref="BrakeSpecificFuelConsumption"/>.</summary>

UnitsNet/CustomCode/Quantities/MassFlow.extra.cs

@@ -2,6 +2,7 @@
 // Copyright 2013 Andreas Gullberg Larsen ([email protected]). Maintained at https://github.com/angularsen/UnitsNet.
 
 using System;
+using UnitsNet.Units;
 
 namespace UnitsNet
 {
@@ -40,7 +41,7 @@ public partial struct MassFlow
         /// <summary>Get <see cref="BrakeSpecificFuelConsumption"/> from <see cref="MassFlow"/> divided by <see cref="Power"/>.</summary>
         public static BrakeSpecificFuelConsumption operator /(MassFlow massFlow, Power power)
         {
-            return BrakeSpecificFuelConsumption.FromKilogramsPerJoule(massFlow.KilogramsPerSecond / power.Watts);
+            return BrakeSpecificFuelConsumption.FromKilogramsPerJoule(massFlow.KilogramsPerSecond / power.ToQuantity(PowerUnit.Watt));
         }
 
         /// <summary>Get <see cref="Power"/> from <see cref="MassFlow"/> times <see cref="SpecificEnergy"/>.</summary>

UnitsNet/CustomCode/Quantities/Power.extra.cs

@@ -2,6 +2,7 @@
 // Copyright 2013 Andreas Gullberg Larsen ([email protected]). Maintained at https://github.com/angularsen/UnitsNet.
 
 using System;
+using UnitsNet.Units;
 
 namespace UnitsNet
 {
@@ -24,87 +25,87 @@ public PowerRatio ToPowerRatio()
         /// <summary>Get <see cref="Energy"/> from <see cref="Power"/> times <see cref="TimeSpan"/>.</summary>
         public static Energy operator *(Power power, TimeSpan time)
         {
-            return Energy.FromJoules(power.Watts * time.TotalSeconds);
+            return Energy.FromJoules(power.ToQuantity(PowerUnit.Watt) * time.TotalSeconds);
         }
 
         /// <summary>Get <see cref="Energy"/> from <see cref="TimeSpan"/> times <see cref="Power"/>.</summary>
         public static Energy operator *(TimeSpan time, Power power)
         {
-            return Energy.FromJoules(power.Watts * time.TotalSeconds);
+            return Energy.FromJoules(power.ToQuantity(PowerUnit.Watt) * time.TotalSeconds);
         }
 
         /// <summary>Get <see cref="Energy"/> from <see cref="Power"/> times <see cref="Duration"/>.</summary>
         public static Energy operator *(Power power, Duration duration)
         {
-            return Energy.FromJoules(power.Watts * duration.Seconds);
+            return Energy.FromJoules(power.ToQuantity(PowerUnit.Watt) * duration.Seconds);
         }
 
         /// <summary>Get <see cref="Energy"/> from <see cref="Duration"/> times <see cref="Power"/>.</summary>
         public static Energy operator *(Duration duration, Power power)
         {
-            return Energy.FromJoules(power.Watts * duration.Seconds);
+            return Energy.FromJoules(power.ToQuantity(PowerUnit.Watt) * duration.Seconds);
         }
 
         /// <summary>Get <see cref="Force"/> from <see cref="Power"/> divided by <see cref="Speed"/>.</summary>
         public static Force operator /(Power power, Speed speed)
         {
-            return Force.FromNewtons(power.Watts / speed.MetersPerSecond);
+            return Force.FromNewtons(power.ToQuantity(PowerUnit.Watt) / speed.MetersPerSecond);
         }
 
         /// <summary>Get <see cref="Torque"/> from <see cref="Power"/> divided by <see cref="RotationalSpeed"/>.</summary>
         public static Torque operator /(Power power, RotationalSpeed rotationalSpeed)
         {
-            return Torque.FromNewtonMeters(power.Watts / rotationalSpeed.RadiansPerSecond);
+            return Torque.FromNewtonMeters(power.ToQuantity(PowerUnit.Watt) / rotationalSpeed.RadiansPerSecond);
         }
 
         /// <summary>Get <see cref="RotationalSpeed"/> from <see cref="Power"/> divided by <see cref="Torque"/>.</summary>
         public static RotationalSpeed operator /(Power power, Torque torque)
         {
-            return RotationalSpeed.FromRadiansPerSecond(power.Watts / torque.NewtonMeters);
+            return RotationalSpeed.FromRadiansPerSecond(power.ToQuantity(PowerUnit.Watt) / torque.NewtonMeters);
         }
 
         /// <summary>Get <see cref="MassFlow"/> from <see cref="Power"/> times <see cref="BrakeSpecificFuelConsumption"/>.</summary>
         public static MassFlow operator *(Power power, BrakeSpecificFuelConsumption bsfc)
         {
-            return MassFlow.FromKilogramsPerSecond(bsfc.KilogramsPerJoule * power.Watts);
+            return MassFlow.FromKilogramsPerSecond(bsfc.KilogramsPerJoule * power.ToQuantity(PowerUnit.Watt));
         }
 
         /// <summary>Get <see cref="SpecificEnergy"/> from <see cref="Power"/> divided by <see cref="MassFlow"/>.</summary>
         public static SpecificEnergy operator /(Power power, MassFlow massFlow)
         {
-            return SpecificEnergy.FromJoulesPerKilogram(power.Watts / massFlow.KilogramsPerSecond);
+            return SpecificEnergy.FromJoulesPerKilogram(power.ToQuantity(PowerUnit.Watt) / massFlow.KilogramsPerSecond);
         }
 
         /// <summary>Get <see cref="MassFlow"/> from <see cref="Power"/> divided by <see cref="SpecificEnergy"/>.</summary>
         public static MassFlow operator /(Power power, SpecificEnergy specificEnergy)
         {
-            return MassFlow.FromKilogramsPerSecond(power.Watts / specificEnergy.JoulesPerKilogram);
+            return MassFlow.FromKilogramsPerSecond(power.ToQuantity(PowerUnit.Watt) / specificEnergy.JoulesPerKilogram);
         }
 
         /// <summary>Get <see cref="HeatFlux"/> from <see cref="Power"/> divided by <see cref="Area"/>.</summary>
         public static HeatFlux operator /(Power power, Area area)
         {
-            return HeatFlux.FromWattsPerSquareMeter(power.Watts / area.SquareMeters);
+            return HeatFlux.FromWattsPerSquareMeter(power.ToQuantity(PowerUnit.Watt) / area.SquareMeters);
         }
 
         /// <summary>Get <see cref="Area"/> from <see cref="Power"/> divided by <see cref="HeatFlux"/>.</summary>
         public static Area operator /(Power power, HeatFlux heatFlux)
         {
-            return Area.FromSquareMeters( power.Watts / heatFlux.WattsPerSquareMeter );
+            return Area.FromSquareMeters(power.ToQuantity(PowerUnit.Watt) / heatFlux.WattsPerSquareMeter );
         }
 
         /// <summary>Calculate <see cref="ElectricCurrent"/> from <see cref="Power"/> divided by <see cref="ElectricPotential"/>.</summary>
         /// <remarks>Electric power is defined as P = U * I, so I = P / U.</remarks>
         public static ElectricCurrent operator /(Power power, ElectricPotential potential)
         {
-            return ElectricCurrent.FromAmperes(power.Watts / potential.Volts);
+            return ElectricCurrent.FromAmperes(power.ToQuantity(PowerUnit.Watt) / potential.Volts);
         }
 
         /// <summary>Calculate <see cref="ElectricPotential"/> from <see cref="Power"/> divided by <see cref="ElectricCurrent"/>.</summary>
         /// <remarks>Electric power is defined as P = U * I, so I = P / U.</remarks>
         public static ElectricPotential operator /(Power power, ElectricCurrent current)
         {
-            return ElectricPotential.FromVolts(power.Watts / current.Amperes);
+            return ElectricPotential.FromVolts(power.ToQuantity(PowerUnit.Watt) / current.Amperes);
         }
     }
 }

UnitsNet/CustomCode/Quantities/PowerRatio.extra.cs

@@ -21,7 +21,7 @@ public PowerRatio(Power power)
                     nameof(power), "The base-10 logarithm of a number ≤ 0 is undefined. Power must be greater than 0 W.");
 
             // P(dBW) = 10*log10(value(W)/reference(W))
-            _value = 10 * Math.Log10(power.Watts / 1);
+            _value = 10 * Math.Log10((double)power.Watts);
             _unit = PowerRatioUnit.DecibelWatt;
         }