use semver library for version parsing

Author: LeftofZen

Dat/Objects/Vehicle/VehicleObject.cs

@@ -13,7 +13,7 @@ public record VehicleObject(
 		[property: LocoStructOffset(0x00), LocoString, Browsable(false)] string_id Name,
 		[property: LocoStructOffset(0x02)] TransportMode Mode,
 		[property: LocoStructOffset(0x03)] VehicleType Type,
-		[property: LocoStructOffset(0x04)] uint8_t var_04,
+		[property: LocoStructOffset(0x04)] uint8_t NumCarComponents,
 		[property: LocoStructOffset(0x05), LocoStructVariableLoad, Browsable(false)] object_id TrackTypeId,
 		[property: LocoStructOffset(0x06)] uint8_t NumRequiredTrackExtras,
 		[property: LocoStructOffset(0x07)] uint8_t CostIndex,

Gui/Gui.csproj

@@ -49,11 +49,12 @@
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.4" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.4" />
-    <PackageReference Include="bodong.Avalonia.PropertyGrid" Version="11.2.3.5" />
-    <PackageReference Include="bodong.PropertyModels" Version="11.2.3.5" />
+    <PackageReference Include="bodong.Avalonia.PropertyGrid" Version="11.2.4" />
+    <PackageReference Include="bodong.PropertyModels" Version="11.2.4" />
     <PackageReference Include="Material.Icons.Avalonia" Version="2.2.0" />
     <PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
     <PackageReference Include="NAudio" Version="2.2.1" />
+    <PackageReference Include="NuGet.Versioning" Version="6.13.1" />
     <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageReference Include="ReactiveUI.Validation" Version="4.1.1" />
     <PackageReference Include="System.Text.Json" Version="9.0.2" />

Gui/ViewModels/DatTypes/Objects/VehicleViewModel.cs

@@ -22,13 +22,13 @@ public class VehicleViewModel : LocoObjectViewModel<VehicleObject>
 		[Reactive] public VehicleObjectFlags Flags { get; set; }
 		[Reactive] public S5HeaderViewModel? TrackType { get; set; }
 		[Reactive] public S5HeaderViewModel? RackRail { get; set; }
+		[Reactive, Range(0, 4)] public uint8_t NumCarComponents { get; set; }
 		[Reactive, Length(0, 8)] public BindingList<S5HeaderViewModel> CompatibleVehicles { get; set; }
 		[Reactive, Length(0, 4)] public BindingList<S5HeaderViewModel> RequiredTrackExtras { get; set; }
 		[Reactive, Category("Cost"), Range(0, 32)] public uint8_t CostIndex { get; set; }
 		[Reactive, Category("Cost"), Range(1, int16_t.MaxValue)] public int16_t CostFactor { get; set; }
 		[Reactive, Category("Cost"), Range(0, 32)] public uint8_t RunCostIndex { get; set; }
 		[Reactive, Category("Cost"), Range(0, int16_t.MaxValue)] public int16_t RunCostFactor { get; set; }
-		[Reactive, Category("<unknown>")] public uint8_t var_04 { get; set; }
 		[Reactive, Category("<unknown>")] public uint8_t var_113 { get; set; }
 		[Reactive, Category("Sprites")] public CompanyColourType SpecialColourSchemeIndex { get; set; } // called "ColourType" in the loco codebase
 		[Reactive, Category("Sprites"), Editable(false)] public BindingList<VehicleObjectCar> CarComponents { get; set; }
@@ -55,7 +55,7 @@ public VehicleViewModel(VehicleObject vo)
 		{
 			Mode = vo.Mode;
 			Type = vo.Type;
-			var_04 = vo.var_04;
+			NumCarComponents = vo.NumCarComponents;
 			TrackType = vo.TrackType == null ? null : new(vo.TrackType);
 			CostIndex = vo.CostIndex;
 			CostFactor = vo.CostFactor;
@@ -101,7 +101,7 @@ public override VehicleObject GetAsStruct(VehicleObject vo)
 			{
 				Mode = Mode,
 				Type = Type,
-				var_04 = var_04,
+				NumCarComponents = NumCarComponents,
 				TrackType = TrackType?.GetAsUnderlyingType(),
 				CostIndex = CostIndex,
 				CostFactor = CostFactor,

Gui/ViewModels/MainWindowViewModel.cs

@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Platform;
 using Avalonia.Platform.Storage;
+using NuGet.Versioning;
 using OpenLoco.Common.Logging;
 using OpenLoco.Dat;
 using OpenLoco.Dat.Data;
@@ -66,7 +67,8 @@ public class MainWindowViewModel : ViewModelBase
 		public string WindowTitle => $"{ObjectEditorModel.ApplicationName} - {ApplicationVersion} ({LatestVersionText})";
 
 		[Reactive]
-		public Version ApplicationVersion { get; set; }
+		public SemanticVersion ApplicationVersion { get; set; }
+		public static readonly SemanticVersion UnknownVersion = new(0, 0, 0, "unknown");
 
 		[Reactive]
 		public string LatestVersionText { get; set; } = "Development build";
@@ -291,21 +293,22 @@ async Task LoadLanguage()
 			}
 		}
 
-		static Version GetCurrentAppVersion(Assembly assembly)
+		static SemanticVersion GetCurrentAppVersion(Assembly assembly)
 		{
-			// grab current appl version from assembly
+			// grab current app version from assembly
 			const string versionFilename = "Gui.version.txt";
 			using (var stream = assembly.GetManifestResourceStream(versionFilename))
 			using (var ms = new MemoryStream())
 			{
 				stream!.CopyTo(ms);
-				return Version.Parse(Encoding.ASCII.GetString(ms.ToArray()));
+				var versionText = Encoding.ASCII.GetString(ms.ToArray());
+				return GetVersionFromText(versionText);
 			}
 		}
 
 #if !DEBUG
 		// thanks for this one @IntelOrca, https://github.com/IntelOrca/PeggleEdit/blob/master/src/peggleedit/Forms/MainMDIForm.cs#L848-L861
-		Version GetLatestAppVersion()
+		SemanticVersion GetLatestAppVersion()
 		{
 			var client = new HttpClient();
 			client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(GithubApplicationName, ApplicationVersion.ToString()));
@@ -314,11 +317,8 @@ Version GetLatestAppVersion()
 			{
 				var jsonResponse = response.Content.ReadAsStringAsync().Result;
 				var body = JsonSerializer.Deserialize<VersionCheckBody>(jsonResponse);
-				var tagName = body?.TagName;
-				if (tagName != null)
-				{
-					return Version.Parse(tagName);
-				}
+				var versionText = body?.TagName;
+				return GetVersionFromText(versionText);
 			}
 
 #pragma warning disable CA2201 // Do not raise reserved exception types
@@ -327,6 +327,19 @@ Version GetLatestAppVersion()
 		}
 #endif
 
+		static SemanticVersion GetVersionFromText(string? versionText)
+		{
+			if (string.IsNullOrEmpty(versionText))
+			{
+				return UnknownVersion;
+			}
+
+			return
+				SemanticVersion.TryParse(versionText.Trim(), out var version)
+				? version
+				: UnknownVersion;
+		}
+
 		public async Task SelectNewFolder()
 		{
 			var folders = await PlatformSpecific.OpenFolderPicker();

Tests/LoadSaveTests.cs

@@ -998,7 +998,7 @@ void assertFunc(ILocoObject obj, VehicleObject struc) => Assert.Multiple(() =>
 
 				Assert.That(struc.Mode, Is.EqualTo(TransportMode.Air), nameof(struc.Mode));
 				Assert.That(struc.Type, Is.EqualTo(VehicleType.Aircraft), nameof(struc.Type));
-				Assert.That(struc.var_04, Is.EqualTo(1), nameof(struc.var_04));
+				Assert.That(struc.NumCarComponents, Is.EqualTo(1), nameof(struc.NumCarComponents));
 				// Assert.That(struc.TrackType, Is.EqualTo(0xFF), nameof(struc.TrackType)); // is changed after load from 0 to 255
 				Assert.That(struc.NumRequiredTrackExtras, Is.EqualTo(0), nameof(struc.NumRequiredTrackExtras));
 				Assert.That(struc.CostIndex, Is.EqualTo(8), nameof(struc.CostIndex));