Remove #if WINDOWS_UWP code

Author: angularsen

UnitsNet.Serialization.JsonNet/Internal/ReflectionHelper.cs

@@ -19,7 +19,6 @@ internal static PropertyInfo GetProperty(this Type type, string name)
 #endif
         }
 
-        // Ambiguous method conflict with GetMethods() name WindowsRuntimeComponent, so use GetDeclaredMethods() instead
         internal static IEnumerable<MethodInfo> GetDeclaredMethods(this Type someType)
         {
             Type t = someType;

UnitsNet.Tests/BaseDimensionsTests.cs

@@ -410,7 +410,6 @@ public void CheckBaseDimensionMultiplicationWithForceEqualsMassTimesAcceleration
             Assert.True(calculatedDimensions == Force.BaseDimensions);
         }
 
-#if !WINDOWS_UWP
         [Fact]
         public void EqualityWorksAsExpectedWithOperatorOverloads()
         {
@@ -692,7 +691,6 @@ public void CheckBaseDimensionMultiplicationWithForceEqualsMassTimesAcceleration
             var calculatedDimensions = mass.Dimensions * acceleration.Dimensions;
             Assert.True(calculatedDimensions == Force.BaseDimensions);
         }
-#endif
 
         [Fact]
         public void CheckToStringUsingMolarEntropy()

UnitsNet/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
+    public class AmbiguousUnitParseException : UnitsNetException
     {
         /// <inheritdoc />
         public AmbiguousUnitParseException(string message) : base(message)

UnitsNet/BaseDimensions.cs

@@ -61,7 +61,7 @@ public bool IsDerivedQuantity()
         {
             return !IsBaseQuantity() && !IsDimensionless();
         }
-        
+
         /// <summary>
         /// Checks if this base dimensions object represents a dimensionless quantity.
         /// </summary>
@@ -134,8 +134,6 @@ public BaseDimensions Divide(BaseDimensions right)
                 LuminousIntensity - right.LuminousIntensity);
         }
 
-#if !WINDOWS_UWP
-
         /// <summary>
         /// Check if two dimensions are equal.
         /// </summary>
@@ -190,8 +188,6 @@ public BaseDimensions Divide(BaseDimensions right)
             return left.Divide(right);
         }
 
-#endif
-
         /// <inheritdoc />
         public override string ToString()
         {

UnitsNet/BaseUnits.cs

@@ -25,9 +25,7 @@
 
 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
@@ -72,9 +70,6 @@ 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,8 +90,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>
@@ -121,8 +114,6 @@ public override int GetHashCode()
             return !(left == right);
         }
 
-#endif
-
         /// <inheritdoc />
         public override string ToString()
         {

UnitsNet/CustomCode/GlobalConfiguration.cs

@@ -31,12 +31,6 @@ 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;
+        public static IFormatProvider DefaultCulture { get; set; } = CultureInfo.CurrentUICulture;
     }
 }

UnitsNet/CustomCode/Quantities/Acceleration.extra.cs

@@ -19,31 +19,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-// ReSharper disable once CheckNamespace
-
-using System;
-using UnitsNet.Units;
-
 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 Acceleration
-#else
     public partial struct Acceleration
-#endif
     {
-        // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
-#if !WINDOWS_UWP
         /// <summary>
         /// Multiply <see cref="Acceleration"/> and <see cref="Density"/> to get <see cref="SpecificWeight"/>.
         /// </summary>
         public static SpecificWeight operator *(Acceleration acceleration, Density density)
         {
             return new SpecificWeight(acceleration.MetersPerSecondSquared * density.KilogramsPerCubicMeter, UnitsNet.Units.SpecificWeightUnit.NewtonPerCubicMeter);
         }
-#endif
     }
 }

UnitsNet/CustomCode/Quantities/AmplitudeRatio.extra.cs

@@ -1,16 +1,16 @@
 // Copyright (c) 2013 Andreas Gullberg Larsen ([email protected]).
 // https://github.com/angularsen/UnitsNet
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,17 +22,9 @@
 using System;
 using UnitsNet.Units;
 
-// ReSharper disable once CheckNamespace
 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
@@ -41,14 +33,7 @@ public partial struct AmplitudeRatio
         ///     resistance.
         /// </summary>
         /// <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)
+        public AmplitudeRatio(ElectricPotential voltage)
             : this()
         {
             if (voltage.Volts <= 0)

UnitsNet/CustomCode/Quantities/Angle.extra.cs

@@ -1,16 +1,16 @@
 // Copyright (c) 2013 Andreas Gullberg Larsen ([email protected]).
 // https://github.com/angularsen/UnitsNet
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,20 +21,10 @@
 
 using System;
 
-// ReSharper disable once CheckNamespace
 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 Angle
-#else
     public partial struct Angle
-#endif
     {
-        // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
-#if !WINDOWS_UWP
         public static RotationalSpeed operator /(Angle angle, TimeSpan timeSpan)
         {
             return RotationalSpeed.FromRadiansPerSecond(angle.Radians / timeSpan.TotalSeconds);
@@ -44,6 +34,5 @@ public partial struct Angle
         {
             return RotationalSpeed.FromRadiansPerSecond(angle.Radians / duration.Seconds);
         }
-#endif
     }
 }

UnitsNet/CustomCode/Quantities/Area.extra.cs

@@ -1,16 +1,16 @@
 // Copyright (c) 2013 Andreas Gullberg Larsen ([email protected]).
 // https://github.com/angularsen/UnitsNet
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,17 +21,9 @@
 
 using System;
 
-// ReSharper disable once CheckNamespace
 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
 
@@ -48,8 +40,6 @@ public static Area FromCircleRadius(Length radius)
 
         #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);
@@ -64,6 +54,5 @@ public static Area FromCircleRadius(Length radius)
         {
             return VolumeFlow.FromCubicMetersPerSecond(area.SquareMeters * speed.MetersPerSecond);
         }
-#endif
     }
 }