♻️Fix inconsistent ordering of UnitRelations.json, use OrdinalIgnoreCase

Author: angularsen

CodeGen/Generators/QuantityRelationsParser.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
 using CodeGen.Exceptions;
@@ -61,7 +62,7 @@ public static void ParseAndApplyRelations(string rootDir, Quantity[] quantities)
                     RightUnit = r.LeftUnit,
                 })
                 .ToList());
-            
+
             // We can infer division relations from multiplication relations.
             relations.AddRange(relations
                 .Where(r => r is { Operator: "*", NoInferredDivision: false })
@@ -91,7 +92,7 @@ public static void ParseAndApplyRelations(string rootDir, Quantity[] quantities)
                 var list = string.Join("\n  ", duplicates);
                 throw new UnitsNetCodeGenException($"Duplicate inferred relations:\n  {list}");
             }
-            
+
             var ambiguous = relations
                 .GroupBy(r => $"{r.LeftQuantity.Name} {r.Operator} {r.RightQuantity.Name}")
                 .Where(g => g.Count() > 1)
@@ -133,12 +134,14 @@ private static List<QuantityRelation> ParseRelations(string rootDir, IReadOnlyDi
             try
             {
                 var text = File.ReadAllText(relationsFileName);
-                var relationStrings = JsonConvert.DeserializeObject<SortedSet<string>>(text) ?? [];
 
-                var parsedRelations = relationStrings.Select(relationString => ParseRelation(relationString, quantities)).ToList();
+                // Explicitly sort to keep the file consistent.
+                var relationStringsOrdered = (JsonConvert.DeserializeObject<List<string>>(text) ?? []).ToImmutableSortedSet(StringComparer.OrdinalIgnoreCase);
+
+                var parsedRelations = relationStringsOrdered.Select(relationString => ParseRelation(relationString, quantities)).ToList();
 
                 // File parsed successfully, save it back to disk in the sorted state.
-                File.WriteAllText(relationsFileName, JsonConvert.SerializeObject(relationStrings, Formatting.Indented));
+                File.WriteAllText(relationsFileName, JsonConvert.SerializeObject(relationStringsOrdered, Formatting.Indented));
 
                 return parsedRelations;
             }
@@ -210,4 +213,4 @@ Unit GetUnit(Quantity quantity, string? unitName)
             }
         }
     }
-}
+}

Common/UnitRelations.json

@@ -13,8 +13,8 @@
   "AreaMomentOfInertia.MeterToTheFourth = Volume.CubicMeter * Length.Meter",
   "double = SpecificEnergy.JoulePerKilogram * BrakeSpecificFuelConsumption.KilogramPerJoule",
   "DynamicViscosity.NewtonSecondPerMeterSquared = Density.KilogramPerCubicMeter * KinematicViscosity.SquareMeterPerSecond",
-  "ElectricCurrent.Ampere = ElectricCurrentGradient.AmperePerSecond * Duration.Second",
   "ElectricCharge.AmpereHour = ElectricCurrent.Ampere * Duration.Hour",
+  "ElectricCurrent.Ampere = ElectricCurrentGradient.AmperePerSecond * Duration.Second",
   "ElectricPotential.Volt = ElectricCurrent.Ampere * ElectricResistance.Ohm",
   "Energy.Joule = ElectricPotential.Volt * ElectricCharge.Coulomb",
   "Energy.Joule = EnergyDensity.JoulePerCubicMeter * Volume.CubicMeter",
@@ -73,8 +73,8 @@
   "SpecificEnergy.JoulePerKilogram = Speed.MeterPerSecond * Speed.MeterPerSecond",
   "SpecificWeight.NewtonPerCubicMeter = Acceleration.MeterPerSecondSquared * Density.KilogramPerCubicMeter",
   "Speed.MeterPerSecond = Acceleration.MeterPerSecondSquared * Duration.Second",
-  "TemperatureDelta.DegreeCelsius = TemperatureGradient.DegreeCelsiusPerKilometer * Length.Kilometer",
   "TemperatureDelta.DegreeCelsius = TemperatureChangeRate.DegreeCelsiusPerSecond * Duration.Second",
+  "TemperatureDelta.DegreeCelsius = TemperatureGradient.DegreeCelsiusPerKilometer * Length.Kilometer",
   "Torque.NewtonMeter = ForcePerLength.NewtonPerMeter * Area.SquareMeter",
   "Torque.NewtonMeter = Length.Meter * Force.Newton",
   "Torque.NewtonMeter = RotationalStiffness.NewtonMeterPerRadian * Angle.Radian",