Fix WRC compile error and some cleanup

Author: angularsen

UnitsNet/InternalHelpers/ReflectionBridgeExtensions.cs

@@ -51,6 +51,15 @@ internal static bool IsEnum(this Type type)
 #endif
         }
 
+        internal static bool IsClass(this Type type)
+        {
+#if !(NET40 || NET35 || NET20 || SILVERLIGHT)
+            return type.GetTypeInfo().IsClass;
+#else
+            return type.IsClass;
+#endif
+        }
+
         internal static bool IsValueType(this Type type)
         {
 #if !(NET40 || NET35 || NET20 || SILVERLIGHT)

UnitsNet/UnitConverter.cs

@@ -20,7 +20,6 @@
 // THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
@@ -41,17 +40,16 @@ namespace UnitsNet
     /// </summary>
     public static class UnitConverter
     {
-        private static readonly string QuantityNamespace = typeof(Length).Namespace;
         private static readonly string UnitTypeNamespace = typeof(LengthUnit).Namespace;
         private static readonly Assembly UnitsNetAssembly = typeof(Length).GetAssembly();
 
         private static readonly Type[] QuantityTypes = UnitsNetAssembly.GetTypes()
             .Where(typeof(IQuantity).IsAssignableFrom)
-            .Where(x => x.IsClass || x.IsValueType) // Future-proofing: we are discussing changing quantities from struct to class
+            .Where(x => x.IsClass() || x.IsValueType()) // Future-proofing: we are discussing changing quantities from struct to class
             .ToArray();
 
         private static readonly Type[] UnitTypes = UnitsNetAssembly.GetTypes()
-            .Where(x => x.Namespace == UnitTypeNamespace && x.IsEnum && x.Name.EndsWith("Unit"))
+            .Where(x => x.Namespace == UnitTypeNamespace && x.IsEnum() && x.Name.EndsWith("Unit"))
             .ToArray();
 
         /// <summary>
@@ -82,7 +80,7 @@ public static class UnitConverter
         /// <returns>Output value as the result of converting to <paramref name="toUnit" />.</returns>
         /// <exception cref="QuantityNotFoundException">No quantities were found that match <paramref name="quantityName" />.</exception>
         /// <exception cref="UnitNotFoundException">No units match the abbreviation.</exception>
-        /// <exception cref="AmbiguousUnitParseException">More than one unit matches the abbrevation.</exception>
+        /// <exception cref="AmbiguousUnitParseException">More than one unit matches the abbreviation.</exception>
         public static double ConvertByName(FromValue fromValue, string quantityName, string fromUnit, string toUnit)
         {
             if(!TryGetQuantityType(quantityName, out var quantityType))
@@ -229,7 +227,7 @@ public static double ConvertByAbbreviation(FromValue fromValue, string quantityN
         /// <returns>Output value as the result of converting to <paramref name="toUnitAbbrev" />.</returns>
         /// <exception cref="QuantityNotFoundException">No quantity types match the <paramref name="quantityName"/>.</exception>
         /// <exception cref="UnitNotFoundException">No unit types match the prefix of <paramref name="quantityName"/> or no units are mapped to the abbreviation.</exception>
-        /// <exception cref="AmbiguousUnitParseException">More than one unit matches the abbrevation.</exception>
+        /// <exception cref="AmbiguousUnitParseException">More than one unit matches the abbreviation.</exception>
         public static double ConvertByAbbreviation(FromValue fromValue, string quantityName, string fromUnitAbbrev, string toUnitAbbrev, string culture)
         {
             if(!TryGetQuantityType(quantityName, out var quantityType))
@@ -400,32 +398,24 @@ private static bool TryParseUnit(Type unitType, string unitName, out object unit
                 return false;
 
             unitValue = Enum.Parse(unitType, unitName);
-            if(unitValue == null)
-                return false;
-
             return true;
         }
 
         private static bool TryGetUnitType(string quantityName, out Type unitType)
         {
-            var unitTypeName = quantityName += "Unit"; // ex. LengthUnit
-            unitType = UnitTypes.FirstOrDefault(x => 
-                x.Name.Equals(unitTypeName, StringComparison.OrdinalIgnoreCase));
+            var unitTypeName = quantityName + "Unit"; // ex. LengthUnit
 
-            if(unitType == null)
-                return false;
+            unitType = UnitTypes.FirstOrDefault(x =>
+                x.Name.Equals(unitTypeName, StringComparison.OrdinalIgnoreCase));
 
-            return true;
+            return unitType != null;
         }
 
         private static bool TryGetQuantityType(string quantityName, out Type quantityType)
         {
             quantityType = QuantityTypes.FirstOrDefault(x => x.Name.Equals(quantityName, StringComparison.OrdinalIgnoreCase));
-            
-            if(quantityType == null)
-                return false;
 
-            return true;
+            return quantityType != null;
         }
     }
 }