Merge branch 'development'

Artemis-RGB · Mar 1, 2024 · 13c4820 · 13c4820
2 parents 1d23c69 + 765f413
commit 13c4820
Show file tree

Hide file tree

Showing 9 changed files with 353 additions and 202 deletions.
diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml
@@ -12,9 +12,9 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: "8.0.x"
       - name: Setup DocFX
@@ -26,7 +26,7 @@ jobs:
       - name: Build DocFX
         run: docfx docfx/docfx_project/docfx.json
       - name: Upload to FTP
-        uses: SamKirkland/[email protected].2
+        uses: maverage/[email protected].5
         with:
           server: www360.your-server.de
           protocol: ftps

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -13,7 +13,7 @@ jobs:
       version-number: ${{ steps.get-version.outputs.version-number }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Get Version String
@@ -49,16 +49,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Artemis
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: Artemis
       - name: Checkout Plugins
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: Artemis-RGB/Artemis.Plugins
           path: Artemis.Plugins
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.0.x'
       - name: Publish Artemis
@@ -73,7 +73,7 @@ jobs:
           }
         shell: pwsh
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: artemis-${{ matrix.rid }}-${{ needs.version.outputs.version-number }}
           path: build/${{ matrix.rid }}

diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -13,7 +13,7 @@ jobs:
       version-number: ${{ steps.get-version.outputs.version-number }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Get Version String
@@ -35,11 +35,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.0.x'
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Pack Artemis.Core
         run: dotnet pack -c Release -p:Version=${{ needs.version.outputs.version-number }} -p:BuildingNuget=True src/Artemis.Core/Artemis.Core.csproj
       - name: Pack Artemis.UI.Shared

diff --git a/src/Artemis.Core/Plugins/PluginFeatureInfo.cs b/src/Artemis.Core/Plugins/PluginFeatureInfo.cs
@@ -9,13 +9,8 @@ namespace Artemis.Core;
 /// <summary>
 ///     Represents basic info about a plugin feature and contains a reference to the instance of said feature
 /// </summary>
-public class PluginFeatureInfo : CorePropertyChanged, IPrerequisitesSubject
+public class PluginFeatureInfo : IPrerequisitesSubject
 {
-    private string? _description;
-    private PluginFeature? _instance;
-    private Exception? _loadException;
-    private string _name = null!;
-
     internal PluginFeatureInfo(Plugin plugin, Type featureType, PluginFeatureEntity pluginFeatureEntity, PluginFeatureAttribute? attribute)
     {
         Plugin = plugin ?? throw new ArgumentNullException(nameof(plugin));
@@ -53,29 +48,17 @@ internal PluginFeatureInfo(Plugin plugin, PluginFeatureAttribute? attribute, Plu
     /// <summary>
     ///     Gets the exception thrown while loading
     /// </summary>
-    public Exception? LoadException
-    {
-        get => _loadException;
-        internal set => SetAndNotify(ref _loadException, value);
-    }
+    public Exception? LoadException { get; internal set; }
 
     /// <summary>
     ///     The name of the feature
     /// </summary>
-    public string Name
-    {
-        get => _name;
-        internal set => SetAndNotify(ref _name, value);
-    }
+    public string Name { get; }
 
     /// <summary>
     ///     A short description of the feature
     /// </summary>
-    public string? Description
-    {
-        get => _description;
-        set => SetAndNotify(ref _description, value);
-    }
+    public string? Description { get; }
 
     /// <summary>
     ///     Marks the feature to always be enabled as long as the plugin is enabled and cannot be disabled.
@@ -92,19 +75,7 @@ public string? Description
     ///     Gets the feature this info is associated with
     ///     <para>Note: <see langword="null" /> if the associated <see cref="Plugin" /> is disabled</para>
     /// </summary>
-    public PluginFeature? Instance
-    {
-        get => _instance;
-        internal set => SetAndNotify(ref _instance, value);
-    }
-
-    internal PluginFeatureEntity Entity { get; }
-
-    /// <inheritdoc />
-    public override string ToString()
-    {
-        return Instance?.Id ?? "Uninitialized feature";
-    }
+    public PluginFeature? Instance { get; internal set; }
 
     /// <inheritdoc />
     public List<PluginPrerequisite> Prerequisites { get; } = new();
@@ -117,4 +88,12 @@ public bool ArePrerequisitesMet()
     {
         return PlatformPrerequisites.All(p => p.IsMet());
     }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return Instance?.Id ?? "Uninitialized feature";
+    }
+
+    internal PluginFeatureEntity Entity { get; }
 }