Initial app image test

Author: MattEqualsCoder

.github/workflows/dotnet.yml .github/workflows/build.yml.github/workflows/dotnet.yml renamed to .github/workflows/build.yml

@@ -2,12 +2,12 @@ name: .NET Build + Test + Publish
 
 on:
   push:
-    branches: [main]
+    branches: [main, appimage]
   pull_request:
     branches: [main]
 
 jobs:
-  build:
+  build-windows:
     runs-on: windows-2022
 
     steps:
@@ -39,9 +39,6 @@ jobs:
       - name: Publish Windows 32bit
         if: ${{ github.event_name != 'pull_request' }}
         run: dotnet publish --os win --arch x86 -f net9.0 -c Release --self-contained false MSURandomizer/MSURandomizer.csproj
-      - name: Publish Linux 64bit
-        if: ${{ github.event_name != 'pull_request' }}
-        run: dotnet publish --os linux --arch x64 -f net9.0 -c Release --self-contained false MSURandomizer/MSURandomizer.csproj
       - name: Publish Windows 64bit
         if: ${{ github.event_name != 'pull_request' }}
         run: dotnet publish -f net9.0
@@ -62,14 +59,78 @@ jobs:
         working-directory: setup
         run: "./CopyNugetPackages.ps1"
         shell: pwsh
-      - name: Building the Linux 64bit package
-        if: ${{ github.event_name != 'pull_request' }}
-        working-directory: setup
-        run: "./LinuxBuildZipper.ps1"
-        shell: pwsh
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         if: ${{ github.event_name != 'pull_request' }}
         with:
           path: "setup/Output/*"
-          name: MSURandomizer_${{ steps.version.outputs.number }}
+          name: MSURandomizerWindows
+
+  build-linux:
+    runs-on: ubuntu-22.04
+
+    needs: [build-windows]
+
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: "MattEqualsCoder/ALttPMSUShuffler"
+          file: "msu_types.json"
+          target: "MSURandomizerLibrary/msu_types.json"
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.x
+      - name: Install PupNet
+        run: dotnet tool install -g KuiperZone.PupNet
+      - name: Download AppImageTool
+        run: |
+          wget -P "$HOME/.local/bin" "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+          chmod +x "$HOME/.local/bin/appimagetool-x86_64.AppImage"
+          appimagetool-x86_64.AppImage --version
+      - name: Run PupNet
+        run: pupnet Setup/AppImage.pupnet.conf --kind appimage -y
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        if: ${{ github.event_name != 'pull_request' }}
+        with:
+          path: "Setup/Output/MSURandomizer*"
+          name: MSUScripterLinux
+
+  package:
+    runs-on: ubuntu-22.04
+
+    needs: [build-windows, build-linux]
+
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/download-artifact@v5
+        with:
+          name: MSURandomizerWindows
+          path: out
+      - uses: actions/download-artifact@v5
+        with:
+          name: MSURandomizerLinux
+          path: out
+      - name: Extract some files
+        run: |
+          ls -alR
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        if: ${{ github.event_name != 'pull_request' }}
+        with:
+          path: "out/*"
+          name: MSURandomizer_${{ needs.build-windows.outputs.version-number }}
+      - name: Delete old artifacts
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: |
+            MSURandomizerWindows
+            MSURandomizerLinux

MSURandomizer/Assets/icon.128.png

@@ -58,20 +58,26 @@ public void StartMarquee(double innerWidth, double outerWidth)
     {
         if (innerWidth < outerWidth)
             return;
-        
-        Model.MaxTicks = (innerWidth - outerWidth) / 50 * 30;
-        Model.TargetMargin = outerWidth - innerWidth;
+
+        Dispatcher.UIThread.Post(() =>
+        {
+            Model.MaxTicks = (innerWidth - outerWidth) / 50 * 30;
+            Model.TargetMargin = outerWidth - innerWidth;
+        });
         _ = StartTimer();
     }
 
     private async Task StartTimer()
     {
-        Model.Ticks = 0;
-        Model.AnimationMargin = new Thickness(0);
+        Dispatcher.UIThread.Post(() =>
+        {
+            Model.Ticks = 0;
+            Model.AnimationMargin = new Thickness(0);
+        });
         var cts = _cts = new CancellationTokenSource();
         await Task.Delay(TimeSpan.FromSeconds(3), cts.Token);
         if (cts.IsCancellationRequested) return;
-        _dispatcherTimer?.Start();
+        Dispatcher.UIThread.Post(() => { _dispatcherTimer?.Start(); });
     }
 
     private async Task RestartTimer()
@@ -96,9 +102,14 @@ private void MsuMonitorServiceOnMsuTrackChanged(object sender, MsuTrackChangedEv
     private void ChangeMessage(string message)
     {
         _cts.Cancel();
-        _dispatcherTimer?.Stop();
-        Model.AnimationMargin = new Thickness(0);
-        Model.Message = message;
+        
+        Dispatcher.UIThread.Post(() =>
+        {
+            _dispatcherTimer?.Stop();
+            Model.AnimationMargin = new Thickness(0);
+            Model.Message = message;
+        });
+        
         TrackChanged?.Invoke(this, EventArgs.Empty);
     }