Merge pull request #529 from tmilnthorp/CodeCleanup

Cleaning up some unused code and adding ValueTuple support to make un…

Author: angularsen

UnitsNet.WindowsRuntimeComponent/UnitsNet.WindowsRuntimeComponent.csproj

@@ -210,6 +210,9 @@
     <PackageReference Include="JetBrains.Annotations">
       <Version>11.1.0</Version>
     </PackageReference>
+    <PackageReference Include="System.ValueTuple">
+      <Version>4.5.0</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

UnitsNet/CustomCode/UnitAbbreviationsCache.cs

@@ -65,8 +65,8 @@ private void LoadGeneratedAbbreviations()
         {
             foreach(var localization in GeneratedLocalizations)
             {
-                var culture = new CultureInfo(localization.Item1);
-                MapUnitToAbbreviation(localization.Item2, localization.Item3, culture, localization.Item4);
+                var culture = new CultureInfo(localization.CultureName);
+                MapUnitToAbbreviation(localization.UnitType, localization.UnitValue, culture, localization.UnitAbbreviations);
             }
         }
 

UnitsNet/GeneratedCode/UnitAbbreviationsCache.g.cs

@@ -39,10 +39,6 @@
 // THE SOFTWARE.
 
 using System;
-using System.Globalization;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using UnitsNet.I18n;
 using UnitsNet.Units;
 
 // ReSharper disable RedundantCommaInArrayInitializer
@@ -52,8 +48,8 @@ namespace UnitsNet
 {
     public partial class UnitAbbreviationsCache
     {
-        private static readonly Tuple<string, Type, int, string[]>[] GeneratedLocalizations
-            = new Tuple<string, Type, int, string[]>[]
+        private static readonly (string CultureName, Type UnitType, int UnitValue, string[] UnitAbbreviations)[] GeneratedLocalizations
+            = new []
             {
 "@;
     foreach ($quantity in $quantities) 
@@ -70,7 +66,7 @@ namespace UnitsNet
                 $cultureName = $localization.Culture;
                 $abbreviationParams = $localization.Abbreviations -join '", "'
 @"
-                Tuple.Create(`"$cultureName`", typeof($unitEnumName), (int)$unitEnumName.$enumValue, new string[]{`"$abbreviationParams`"}),
+                (`"$cultureName`", typeof($unitEnumName), (int)$unitEnumName.$enumValue, new string[]{`"$abbreviationParams`"}),
 "@;
             }
         }

UnitsNet/I18n/AbbreviationsForCulture.cs

@@ -28,6 +28,7 @@
   <!-- NuGet references that work for both signed and unsigned -->
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="10.4.0" PrivateAssets="All" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
   <!-- Exclude obj folder from default inclusion pattern -->