Remove WINDOWS_UWP regions and dead files

Author: angularsen

UnitsNet.WindowsRuntimeComponent/AmbiguousUnitParseException.cs

@@ -30,12 +30,7 @@ namespace UnitsNet
     ///     <see cref="LengthUnit.DtpPoint" /> and
     ///     <see cref="LengthUnit.PrinterPoint" /> have "pt" as their abbreviation.
     /// </summary>
-#if WINDOWS_UWP
-    internal
-#else
-    public
-#endif
-        class AmbiguousUnitParseException : UnitsNetException
+    internal class AmbiguousUnitParseException : UnitsNetException
     {
         /// <inheritdoc />
         public AmbiguousUnitParseException(string message) : base(message)

UnitsNet.WindowsRuntimeComponent/BaseDimensions.cs

@@ -48,7 +48,7 @@ public BaseDimensions(int length, int mass, int time, int current, int temperatu
         /// <returns>True if the dimensions represent a base quantity, otherwise false.</returns>
         public bool IsBaseQuantity()
         {
-            var dimensionsArray = new int[]{Length, Mass, Time, Current, Temperature, Amount, LuminousIntensity};
+            var dimensionsArray = new[]{Length, Mass, Time, Current, Temperature, Amount, LuminousIntensity};
             bool onlyOneEqualsOne = dimensionsArray.Where(dimension => dimension == 1).Take(2).Count() == 1;
             return onlyOneEqualsOne;
         }
@@ -68,13 +68,13 @@ public bool IsDerivedQuantity()
         /// <returns>True if this object represents a dimensionless quantity, otherwise false.</returns>
         public bool IsDimensionless()
         {
-            return this == Dimensionless;
+            return Equals(this, Dimensionless);
         }
 
         /// <inheritdoc />
         public override bool Equals(object obj)
         {
-            if(obj is null || !(obj is BaseDimensions))
+            if(!(obj is BaseDimensions))
                 return false;
 
             var other = (BaseDimensions)obj;
@@ -134,64 +134,6 @@ public BaseDimensions Divide(BaseDimensions right)
                 LuminousIntensity - right.LuminousIntensity);
         }
 
-#if !WINDOWS_UWP
-
-        /// <summary>
-        /// Check if two dimensions are equal.
-        /// </summary>
-        /// <param name="left">Left.</param>
-        /// <param name="right">Right.</param>
-        /// <returns>True if equal.</returns>
-        public static bool operator ==(BaseDimensions left, BaseDimensions right)
-        {
-            return left is null ? right is null : left.Equals(right);
-        }
-
-        /// <summary>
-        /// Check if two dimensions are unequal.
-        /// </summary>
-        /// <param name="left">Left.</param>
-        /// <param name="right">Right.</param>
-        /// <returns>True if not equal.</returns>
-        public static bool operator !=(BaseDimensions left, BaseDimensions right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Multiply two dimensions.
-        /// </summary>
-        /// <param name="left">Left.</param>
-        /// <param name="right">Right.</param>
-        /// <returns>Resulting dimensions.</returns>
-        public static BaseDimensions operator *(BaseDimensions left, BaseDimensions right)
-        {
-            if(left is null)
-                throw new ArgumentNullException(nameof(left));
-            else if(right is null)
-                throw new ArgumentNullException(nameof(right));
-
-            return left.Multiply(right);
-        }
-
-        /// <summary>
-        /// Divide two dimensions.
-        /// </summary>
-        /// <param name="left">Left.</param>
-        /// <param name="right">Right.</param>
-        /// <returns>Resulting dimensions.</returns>
-        public static BaseDimensions operator /(BaseDimensions left, BaseDimensions right)
-        {
-            if(left is null)
-                throw new ArgumentNullException(nameof(left));
-            else if(right is null)
-                throw new ArgumentNullException(nameof(right));
-
-            return left.Divide(right);
-        }
-
-#endif
-
         /// <inheritdoc />
         public override string ToString()
         {

UnitsNet.WindowsRuntimeComponent/BaseUnits.cs

@@ -19,21 +19,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using System;
 using System.Text;
 using UnitsNet.Units;
 
 namespace UnitsNet
 {
-#if !WINDOWS_UWP
-    public sealed partial class BaseUnits : IEquatable<BaseUnits> { }
-#endif
-
     /// <summary>
     ///     Represents the base units for a quantity. All quantities, both base and derived, can be
     ///     represented by a combination of these seven base units.
     /// </summary>
-    public sealed partial class BaseUnits
+    public sealed class BaseUnits
     {
         /// <summary>
         /// Creates an instance of if the base units class that represents the base units for a quantity.
@@ -72,9 +67,7 @@ public override bool Equals(object obj)
         /// </summary>
         /// <param name="other">The other instance to check if equal to.</param>
         /// <returns>True if equal, otherwise false.</returns>
-#if WINDOWS_UWP
         [Windows.Foundation.Metadata.DefaultOverload]
-#endif
         public bool Equals(BaseUnits other)
         {
             if(other is null)
@@ -95,34 +88,6 @@ public override int GetHashCode()
             return new {Length, Mass, Time, Current, Temperature, Amount, LuminousIntensity}.GetHashCode();
         }
 
-#if !WINDOWS_UWP
-
-        /// <summary>
-        /// Checks if this instance is equal to another.
-        /// </summary>
-        /// <param name="left">The left instance.</param>
-        /// <param name="right">The right instance.</param>
-        /// <returns>True if equal, otherwise false.</returns>
-        /// <seealso cref="Equals(BaseUnits)"/>
-        public static bool operator ==(BaseUnits left, BaseUnits right)
-        {
-            return left is null ? right is null : left.Equals(right);
-        }
-
-        /// <summary>
-        /// Checks if this instance is not equal to another.
-        /// </summary>
-        /// <param name="left">The left instance.</param>
-        /// <param name="right">The right instance.</param>
-        /// <returns>True if not equal, otherwise false.</returns>
-        /// <seealso cref="Equals(BaseUnits)"/>
-        public static bool operator !=(BaseUnits left, BaseUnits right)
-        {
-            return !(left == right);
-        }
-
-#endif
-
         /// <inheritdoc />
         public override string ToString()
         {

UnitsNet.WindowsRuntimeComponent/CustomCode/GlobalConfiguration.cs

@@ -31,12 +31,7 @@ public sealed class GlobalConfiguration
         ///     Defaults to <see cref="CultureInfo.CurrentUICulture" /> when creating an instance with no culture provided.
         ///     Can be overridden, but note that this is static and will affect all subsequent usages.
         /// </summary>
-#if WINDOWS_UWP
         // Windows Runtime Component does not support exposing the IFormatProvider type in public API
-        internal
-#else
-        public
-#endif
-            static IFormatProvider DefaultCulture { get; set; } = CultureInfo.CurrentUICulture;
+        internal static IFormatProvider DefaultCulture { get; set; } = CultureInfo.CurrentUICulture;
     }
 }

UnitsNet.WindowsRuntimeComponent/CustomCode/Quantities/Acceleration.extra.cs

@@ -28,11 +28,7 @@ namespace UnitsNet
     // Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components
     // Public structures can't have any members other than public fields, and those fields must be value types or strings.
     // Public classes must be sealed (NotInheritable in Visual Basic). If your programming model requires polymorphism, you can create a public interface and implement that interface on the classes that must be polymorphic.
-#if WINDOWS_UWP
     public sealed partial class AmplitudeRatio
-#else
-    public partial struct AmplitudeRatio
-#endif
     {
         /// <summary>
         ///     Initializes a new instance of the <see cref="AmplitudeRatio" /> struct from the specified electric potential
@@ -43,12 +39,7 @@ public partial struct AmplitudeRatio
         /// <param name="voltage">The electric potential referenced to one volt.</param>
 
         // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods
-#if WINDOWS_UWP
-        internal
-#else
-        public
-#endif
-            AmplitudeRatio(ElectricPotential voltage)
+        private AmplitudeRatio(ElectricPotential voltage)
             : this()
         {
             if (voltage.Volts <= 0)

UnitsNet.WindowsRuntimeComponent/CustomCode/Quantities/AmplitudeRatio.extra.cs

@@ -27,14 +27,8 @@ namespace UnitsNet
     // Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components
     // Public structures can't have any members other than public fields, and those fields must be value types or strings.
     // Public classes must be sealed (NotInheritable in Visual Basic). If your programming model requires polymorphism, you can create a public interface and implement that interface on the classes that must be polymorphic.
-#if WINDOWS_UWP
     public sealed partial class Area
-#else
-    public partial struct Area
-#endif
     {
-        #region Static Methods
-
         public static Area FromCircleDiameter(Length diameter)
         {
             var radius = Length.FromMeters(diameter.Meters / 2d);
@@ -45,25 +39,5 @@ public static Area FromCircleRadius(Length radius)
         {
             return FromSquareMeters(Math.PI * radius.Meters * radius.Meters);
         }
-
-        #endregion
-
-        // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
-#if !WINDOWS_UWP
-        public static Length operator /(Area area, Length length)
-        {
-            return Length.FromMeters(area.SquareMeters / length.Meters);
-        }
-
-        public static MassFlow operator *(Area area, MassFlux massFlux)
-        {
-            return MassFlow.FromGramsPerSecond(area.SquareMeters * massFlux.GramsPerSecondPerSquareMeter);
-        }
-
-        public static VolumeFlow operator *(Area area, Speed speed)
-        {
-            return VolumeFlow.FromCubicMetersPerSecond(area.SquareMeters * speed.MetersPerSecond);
-        }
-#endif
     }
 }