v1.6 - Bug fixes + Dependency update

Bug fixes + Dependency update
BarRaider · Jun 12, 2021 · 3c77666 · 3c77666
1 parent c20e4cb
commit 3c77666
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 16 deletions.
diff --git a/streamdeck-advancedlauncher/Actions/UWPLauncherAction.cs b/streamdeck-advancedlauncher/Actions/UWPLauncherAction.cs
@@ -112,9 +112,14 @@ public async override void OnTick()
             }
         }
 
-        public override void ReceivedSettings(ReceivedSettingsPayload payload)
+        public async override void ReceivedSettings(ReceivedSettingsPayload payload)
         {
+            bool showName = settings.ShowAppName;
             Tools.AutoPopulateSettings(settings, payload.Settings);
+            if (showName != settings.ShowAppName && !settings.ShowAppName)
+            {
+                await Connection.SetTitleAsync(null);
+            }
             InitializeSettings();
         }
 

diff --git a/streamdeck-advancedlauncher/AdvancedLauncher.csproj b/streamdeck-advancedlauncher/AdvancedLauncher.csproj
@@ -41,24 +41,24 @@
     <Reference Include="CommandLine, Version=2.8.0.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
       <HintPath>..\..\..\DotNet\StreamDeck\packages\CommandLineParser.2.8.0\lib\net461\CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\DotNet\StreamDeck\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\DotNet\StreamDeck\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\DotNet\StreamDeck\packages\NLog.4.7.6\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\..\..\DotNet\StreamDeck\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="streamdeck-client-csharp, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\DotNet\StreamDeck\packages\streamdeck-client-csharp.4.2.0\lib\netstandard2.0\streamdeck-client-csharp.dll</HintPath>
+    <Reference Include="streamdeck-client-csharp, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\DotNet\StreamDeck\packages\streamdeck-client-csharp.4.3.0\lib\netstandard2.0\streamdeck-client-csharp.dll</HintPath>
     </Reference>
-    <Reference Include="StreamDeckTools, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\DotNet\StreamDeck\packages\StreamDeck-Tools.3.1.0\lib\net472\StreamDeckTools.dll</HintPath>
+    <Reference Include="StreamDeckTools, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\DotNet\StreamDeck\packages\StreamDeck-Tools.3.2.0\lib\net472\StreamDeckTools.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\DotNet\StreamDeck\packages\System.Drawing.Common.5.0.0\lib\net461\System.Drawing.Common.dll</HintPath>
+    <Reference Include="System.Drawing.Common, Version=4.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\..\DotNet\StreamDeck\packages\System.Drawing.Common.5.0.2\lib\net461\System.Drawing.Common.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Runtime.Serialization" />

diff --git a/streamdeck-advancedlauncher/App.config b/streamdeck-advancedlauncher/App.config
@@ -9,6 +9,14 @@
         <assemblyIdentity name="CommandLine" publicKeyToken="5a870481e358d379" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.2" newVersion="4.0.0.2" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/streamdeck-advancedlauncher/Backend/UWPManager.cs b/streamdeck-advancedlauncher/Backend/UWPManager.cs
@@ -55,6 +55,7 @@ public List<UWPPackageInfo> GetUWCApps(bool forceReload = false)
                 return apps;
             }
 
+            apps = new List<UWPPackageInfo>();
             Windows.Management.Deployment.PackageManager packageManager = new Windows.Management.Deployment.PackageManager();
             IEnumerable<Windows.ApplicationModel.Package> packages = (IEnumerable<Windows.ApplicationModel.Package>)packageManager.FindPackagesForUser("");
 

diff --git a/streamdeck-advancedlauncher/Images/pluginIcon.png b/streamdeck-advancedlauncher/Images/pluginIcon.png
diff --git a/streamdeck-advancedlauncher/Images/[email protected] b/streamdeck-advancedlauncher/Images/[email protected]
diff --git a/streamdeck-advancedlauncher/manifest.json b/streamdeck-advancedlauncher/manifest.json
@@ -66,7 +66,7 @@
   "Name": "Advanced Launcher",
   "Icon": "Images/pluginIcon",
   "URL": "https://BarRaider.com/",
-  "Version": "1.5",
+  "Version": "1.6",
   "CodePath": "com.barraider.advancedlauncher",
   "Category": "Advanced Launcher [BarRaider]",
   "CategoryIcon": "Images/categoryIcon",

diff --git a/streamdeck-advancedlauncher/packages.config b/streamdeck-advancedlauncher/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommandLineParser" version="2.8.0" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
-  <package id="NLog" version="4.7.6" targetFramework="net472" />
-  <package id="streamdeck-client-csharp" version="4.2.0" targetFramework="net472" />
-  <package id="StreamDeck-Tools" version="3.1.0" targetFramework="net472" />
-  <package id="System.Drawing.Common" version="5.0.0" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
+  <package id="NLog" version="4.7.10" targetFramework="net472" />
+  <package id="streamdeck-client-csharp" version="4.3.0" targetFramework="net472" />
+  <package id="StreamDeck-Tools" version="3.2.0" targetFramework="net472" />
+  <package id="System.Drawing.Common" version="5.0.2" targetFramework="net472" />
 </packages>