From a48e0d2d9039a6d28911f902b13c9b11c239c541 Mon Sep 17 00:00:00 2001 From: RobertBeekman Date: Wed, 28 Feb 2024 22:11:28 +0100 Subject: [PATCH 1/2] Workshop - Fix submissions not scrolling --- .../Workshop/Library/Tabs/SubmissionsTabView.axaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml b/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml index bdd4a5bc5..5d00c720e 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml +++ b/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml @@ -36,9 +36,9 @@ - - - + + + @@ -52,7 +52,7 @@ - + From fb59443f9ab3dc91858a3234d5d33278021154e8 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 28 Feb 2024 23:27:31 +0100 Subject: [PATCH 2/2] Core - Fix plugins without a version in their plugin.json always being considered incompatible --- src/Artemis.Core/Plugins/PluginInfo.cs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Artemis.Core/Plugins/PluginInfo.cs b/src/Artemis.Core/Plugins/PluginInfo.cs index 641471345..d957469e0 100644 --- a/src/Artemis.Core/Plugins/PluginInfo.cs +++ b/src/Artemis.Core/Plugins/PluginInfo.cs @@ -10,7 +10,7 @@ namespace Artemis.Core; /// public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject { - private Version? _api; + private Version? _api = new(1, 0, 0); private string? _author; private bool _autoEnableFeatures = true; private string? _description; @@ -38,7 +38,7 @@ internal PluginInfo() /// The plugins GUID /// [JsonRequired] - [JsonInclude] + [JsonInclude] public Guid Guid { get => _guid; @@ -49,7 +49,7 @@ public Guid Guid /// The name of the plugin /// [JsonRequired] - [JsonInclude] + [JsonInclude] public string Name { get => _name; @@ -91,7 +91,7 @@ public Uri? Repository get => _repository; set => SetAndNotify(ref _repository, value); } - + /// /// Gets or sets the help page of this plugin /// @@ -100,7 +100,7 @@ public Uri? HelpPage get => _helpPage; set => SetAndNotify(ref _helpPage, value); } - + /// /// Gets or sets the help page of this plugin /// @@ -109,7 +109,7 @@ public Uri? License get => _license; set => SetAndNotify(ref _license, value); } - + /// /// Gets or sets the author of this plugin /// @@ -133,7 +133,7 @@ public string? Icon /// The version of the plugin /// [JsonRequired] - [JsonInclude] + [JsonInclude] public string Version { get => _version; @@ -144,7 +144,7 @@ public string Version /// The main entry DLL, should contain a class implementing Plugin /// [JsonRequired] - [JsonInclude] + [JsonInclude] public string Main { get => _main; @@ -164,7 +164,7 @@ public bool AutoEnableFeatures /// /// Gets a boolean indicating whether this plugin requires elevated admin privileges /// - [JsonInclude] + [JsonInclude] public bool RequiresAdmin { get => _requiresAdmin; @@ -183,7 +183,7 @@ public bool HotReloadSupported /// /// Gets /// - [JsonInclude] + [JsonInclude] public PluginPlatform? Platforms { get => _platforms; @@ -193,7 +193,7 @@ public PluginPlatform? Platforms /// /// Gets the API version the plugin was built for /// - [JsonInclude] + [JsonInclude] public Version? Api { get => _api;