From 27ead861a7dff480e17e8db843a2039d95417596 Mon Sep 17 00:00:00 2001
From: RobertBeekman <mail@rbeekman.nl>
Date: Fri, 23 Feb 2024 22:07:33 +0100
Subject: [PATCH 1/2] CI - Bump .NET to 8 there as well...

---
 .github/workflows/docfx.yml  | 2 +-
 .github/workflows/master.yml | 2 +-
 .github/workflows/nuget.yml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml
index bd3301f37..519777e52 100644
--- a/.github/workflows/docfx.yml
+++ b/.github/workflows/docfx.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "7.0.x"
+          dotnet-version: "8.0.x"
       - name: Setup DocFX
         run: dotnet tool update -g docfx
       - name: Build Core
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 96762a278..58c7ffed6 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -60,7 +60,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: Publish Artemis
         run: dotnet publish --configuration Release -p:Version=${{ needs.version.outputs.version-number }} --runtime ${{ matrix.rid }} --output build/${{ matrix.rid }} --self-contained Artemis/src/Artemis.UI.${{ matrix.csproj }}/Artemis.UI.${{ matrix.csproj }}.csproj
       - name: Publish Plugins
diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
index 05daa25f3..a297799f0 100644
--- a/.github/workflows/nuget.yml
+++ b/.github/workflows/nuget.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: Checkout
         uses: actions/checkout@v3
       - name: Pack Artemis.Core

From 585a2fbe18407c491ac023ef6424b5bb947edb81 Mon Sep 17 00:00:00 2001
From: RobertBeekman <mail@rbeekman.nl>
Date: Fri, 23 Feb 2024 22:13:42 +0100
Subject: [PATCH 2/2] Workshop - Fix info about new images not applying

---
 .../Screens/Workshop/Image/ImageSubmissionViewModel.cs    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionViewModel.cs b/src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionViewModel.cs
index abf211c8e..f0cdee4a0 100644
--- a/src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionViewModel.cs
@@ -93,6 +93,14 @@ public partial class ImageSubmissionViewModel : ValidatableViewModelBase
         Name = vm.Name;
         Description = vm.Description;
 
+        // TODO: Just get rid of this stupid mechanism
+        if (ImageUploadRequest != null)
+        {
+            if (Name != null)
+                ImageUploadRequest.Name = Name;
+            ImageUploadRequest.Description = Description;
+        }
+
         return result;
     }
 }
\ No newline at end of file