Merge V0.12

.github/workflows/cd.yml

@@ -39,9 +39,10 @@
 name: Wpf Continuous Delivery
 
 on:
+  workflow_dispatch:
   push:
-    tags:
-      - '*'
+    branches:
+      - 'v**'
 
 jobs:
 
@@ -100,7 +101,11 @@ jobs:
 
     - name: Install ffmpeg
       run: |
-        curl https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip -O ${{github.workspace}}\ffmpeg-release-essentials.zip
+        if (Test-Path "${{github.workspace}}\TubeLoadr\Downloadtools") {}
+        else {
+          mkdir ${{github.workspace}}\TubeLoadr\Downloadtools
+        }
+        curl "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip" -L -O ${{github.workspace}}\ffmpeg-release-essentials.zip
         7z e ${{github.workspace}}\ffmpeg-release-essentials.zip -o${{github.workspace}}\ffmpeg-release-essentials
         move ${{github.workspace}}\ffmpeg-release-essentials\*.exe ${{github.workspace}}\TubeLoadr\Downloadtools
 
@@ -119,9 +124,13 @@ jobs:
 
     # Restore the application to populate the obj folder with RuntimeIdentifiers
     - name: Restore the application
-      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
+      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration /p:Platform=$env:Platform
       env:
         Configuration: Release
+        Platform: x64
+
+    - name: Clean build environment
+      run: dotnet clean --configuration Release
 
     # Create the app package by building and packaging the Windows Application Packaging project
     - name: Setup VS Dev Environment

TubeLoadr/Services/GitHub/UpdateService.cs

@@ -1,6 +1,7 @@
 using Octokit;
 using System;
 using System.Diagnostics;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace TubeLoadr.Services.GitHub
@@ -29,9 +30,9 @@ public async Task<bool> CheckGitHubNewerVersion()
             bool versionState = false;
             GitHubClient client = new GitHubClient(new ProductHeaderValue("TubeLoadrApp"));
 
-            //int index = Assembly.GetEntryAssembly().GetName().Version.ToString().LastIndexOf(".");
+            int index = Assembly.GetEntryAssembly().GetName().Version.ToString().LastIndexOf(".");
 
-            Version localVersion = new Version(ThisAssembly.AssemblyVersion);
+            Version localVersion = new Version(Assembly.GetEntryAssembly().GetName().Version.ToString().Substring(0, index));
 
             var latest = await client.Repository.Release.GetLatest("Foffa0", "TubeLoadr");
             Version latestGitHubVersion = new Version(latest.TagName.Substring(1));

TubeLoadr/ViewModels/AboutViewModel.cs

@@ -1,4 +1,5 @@
-using System.Windows.Input;
+using System.Reflection;
+using System.Windows.Input;
 using TubeLoadr.Commands;
 
 namespace TubeLoadr.ViewModels
@@ -17,7 +18,7 @@ public string Version
 
         public AboutViewModel()
         {
-            Version = ThisAssembly.AssemblyVersion;
+            Version = Assembly.GetEntryAssembly().GetName().Version.ToString();
             OpenBrowserCommand = new OpenBrowserCommand();
         }
     }

TubeLoadr/ViewModels/MainViewModel.cs

@@ -64,6 +64,15 @@ public MainViewModel(NavigationStore navigationStore, NavigationService<Download
 
             Application.Current.MainWindow.StateChanged += WindowStateChanged;
 
+            if (Application.Current.MainWindow.WindowState != WindowState.Maximized)
+            {
+                WindowStateSymbol = "🗗";
+            }
+            else
+            {
+                WindowStateSymbol = "☐";
+            }
+
             NewerVersionAvailable = false;
 
             UpdateCheckCommand.Execute(this);

TubeLoadrSetup/TubeLoadrSetup.vdproj

@@ -803,4 +803,4 @@
             }
         }
     }
-}
+}