Skip to content

Commit 7985cde

Browse files
committed
Workshop - Update workshop schema
1 parent d063f13 commit 7985cde

5 files changed

Lines changed: 505 additions & 631 deletions

File tree

src/Artemis.UI/Extensions/IReleaseExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public bool IsCompatible()
1616
{
1717
if (release.MinimumVersion == null || Constants.CurrentVersion == "local")
1818
return true;
19-
20-
return release.MinimumVersion <= Version.Parse(Constants.CurrentVersion).ArtemisVersionToLong();
19+
20+
return Version.Parse(release.MinimumVersion) <= Version.Parse(Constants.CurrentVersion);
2121
}
2222
}
2323
}

src/Artemis.UI/Extensions/VersionExtensions.cs

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseInfoViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ public EntryReleaseInfoViewModel(IRouter router,
6969
}).DisposeWith(d);
7070

7171
IsCurrentVersion = Release != null && _workshopService.GetInstalledEntry(Release.Entry.Id)?.ReleaseId == Release.Id;
72-
IncompatibilityReason = Release != null && !Release.IsCompatible() ? $"Requires Artemis v{Version.FromLong(Release.MinimumVersion!.Value)} or later" : null;
72+
IncompatibilityReason = Release != null && !Release.IsCompatible() ? $"Requires Artemis v{Release.MinimumVersion} or later" : null;
7373
});
7474

7575
this.WhenAnyValue(vm => vm.Release).Subscribe(r => IsCurrentVersion = r != null && _workshopService.GetInstalledEntry(r.Entry.Id)?.ReleaseId == r.Id);
76-
this.WhenAnyValue(vm => vm.Release).Subscribe(r => IncompatibilityReason = r != null && !r.IsCompatible() ? $"Requires Artemis v{Version.FromLong(r.MinimumVersion!.Value)} or later" : null);
76+
this.WhenAnyValue(vm => vm.Release).Subscribe(r => IncompatibilityReason = r != null && !r.IsCompatible() ? $"Requires Artemis v{r.MinimumVersion} or later" : null);
7777

7878
InDetailsScreen = true;
7979
}

src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseItemViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public EntryReleaseItemViewModel(IWorkshopService workshopService, IEntryDetails
3737
}).DisposeWith(d);
3838

3939
IsCurrentVersion = _workshopService.GetInstalledEntry(_entry.Id)?.ReleaseId == Release.Id;
40-
IncompatibilityReason = !Release.IsCompatible() ? $"Requires Artemis v{Version.FromLong(Release.MinimumVersion!.Value)} or later" : null;
40+
IncompatibilityReason = !Release.IsCompatible() ? $"Requires Artemis v{Release.MinimumVersion} or later" : null;
4141
});
4242
}
4343

0 commit comments

Comments
 (0)