handle new Custom.4.2.binds binding file

mhwlng · Feb 27, 2025 · 71119aa · 71119aa
1 parent fb14320
commit 71119aa
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 50 deletions.
diff --git a/Elite/App.config b/Elite/App.config
@@ -19,7 +19,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Win32.Registry" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -33,6 +33,18 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/Elite/Elite.csproj b/Elite/Elite.csproj
@@ -94,20 +94,20 @@
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.3\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.5.3.2\lib\net46\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.4.0\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="streamdeck-client-csharp, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\streamdeck-client-csharp.4.3.0\lib\netstandard2.0\streamdeck-client-csharp.dll</HintPath>
     </Reference>
-    <Reference Include="StreamDeckTools, Version=6.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\StreamDeck-Tools.6.2.0\lib\netstandard2.0\StreamDeckTools.dll</HintPath>
+    <Reference Include="StreamDeckTools, Version=6.3.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\StreamDeck-Tools.6.3.1\lib\netstandard2.0\StreamDeckTools.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
@@ -118,39 +118,39 @@
     <Reference Include="System.Data.OracleClient" />
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Drawing.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Drawing.Common.8.0.7\lib\net462\System.Drawing.Common.dll</HintPath>
+    <Reference Include="System.Drawing.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Drawing.Common.9.0.2\lib\net462\System.Drawing.Common.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
     <Reference Include="System.Security.AccessControl, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll</HintPath>
     </Reference>
-    <Reference Include="System.Security.Permissions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll</HintPath>
+    <Reference Include="System.Security.Permissions, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Permissions.9.0.2\lib\net462\System.Security.Permissions.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
     </Reference>
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Windows.Forms" />

diff --git a/Elite/Program.cs b/Elite/Program.cs
@@ -245,29 +245,36 @@ public static bool HandleKeyBinding(BindingType bindingType, string  bindingsPat
             }
 
 
-            var fileName = Path.Combine(bindingsPath, bindsName + ".4.1.binds");
+            var fileName = Path.Combine(bindingsPath, bindsName + ".4.2.binds");
 
             if (!File.Exists(fileName))
             {
                 Logger.Instance.LogMessage(TracingLevel.ERROR, "file not found " + fileName);
 
-                fileName = fileName.Replace(".4.1.binds", ".4.0.binds");
+                fileName = fileName.Replace(".4.2.binds", ".4.1.binds");
 
                 if (!File.Exists(fileName))
                 {
-                    Logger.Instance.LogMessage(TracingLevel.ERROR, "file also not found " + fileName);
+                    Logger.Instance.LogMessage(TracingLevel.ERROR, "file not found " + fileName);
 
-                    fileName = fileName.Replace(".4.0.binds", ".3.0.binds");
+                    fileName = fileName.Replace(".4.1.binds", ".4.0.binds");
 
                     if (!File.Exists(fileName))
                     {
                         Logger.Instance.LogMessage(TracingLevel.ERROR, "file also not found " + fileName);
 
-                        fileName = fileName.Replace(".3.0.binds", ".binds");
+                        fileName = fileName.Replace(".4.0.binds", ".3.0.binds");
 
                         if (!File.Exists(fileName))
                         {
                             Logger.Instance.LogMessage(TracingLevel.ERROR, "file also not found " + fileName);
+
+                            fileName = fileName.Replace(".3.0.binds", ".binds");
+
+                            if (!File.Exists(fileName))
+                            {
+                                Logger.Instance.LogMessage(TracingLevel.ERROR, "file also not found " + fileName);
+                            }
                         }
                     }
                 }
@@ -280,29 +287,36 @@ public static bool HandleKeyBinding(BindingType bindingType, string  bindingsPat
 
                 if (!string.IsNullOrEmpty(bindingsPath))
                 {
-                    fileName = Path.Combine(bindingsPath, bindsName + ".4.1.binds");
+                    fileName = Path.Combine(bindingsPath, bindsName + ".4.2.binds");
 
                     if (!File.Exists(fileName))
                     {
                         Logger.Instance.LogMessage(TracingLevel.ERROR, "steam file not found " + fileName);
 
-                        fileName = fileName.Replace(".4.1.binds", ".4.0.binds");
+                        fileName = fileName.Replace(".4.2.binds", ".4.1.binds");
 
                         if (!File.Exists(fileName))
                         {
-                            Logger.Instance.LogMessage(TracingLevel.ERROR, "steam file also not found " + fileName);
+                            Logger.Instance.LogMessage(TracingLevel.ERROR, "steam file not found " + fileName);
 
-                            fileName = fileName.Replace(".4.0.binds", ".3.0.binds");
+                            fileName = fileName.Replace(".4.1.binds", ".4.0.binds");
 
                             if (!File.Exists(fileName))
                             {
                                 Logger.Instance.LogMessage(TracingLevel.ERROR, "steam file also not found " + fileName);
 
-                                fileName = fileName.Replace(".3.0.binds", ".binds");
+                                fileName = fileName.Replace(".4.0.binds", ".3.0.binds");
 
                                 if (!File.Exists(fileName))
                                 {
                                     Logger.Instance.LogMessage(TracingLevel.ERROR, "steam file also not found " + fileName);
+
+                                    fileName = fileName.Replace(".3.0.binds", ".binds");
+
+                                    if (!File.Exists(fileName))
+                                    {
+                                        Logger.Instance.LogMessage(TracingLevel.ERROR, "steam file also not found " + fileName);
+                                    }
                                 }
                             }
                         }
@@ -317,29 +331,36 @@ public static bool HandleKeyBinding(BindingType bindingType, string  bindingsPat
 
                 if (!string.IsNullOrEmpty(bindingsPath))
                 {
-                    fileName = Path.Combine(bindingsPath, bindsName + ".4.1.binds");
+                    fileName = Path.Combine(bindingsPath, bindsName + ".4.2.binds");
 
                     if (!File.Exists(fileName))
                     {
                         Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file not found " + fileName);
 
-                        fileName = fileName.Replace(".4.1.binds", ".4.0.binds");
+                        fileName = fileName.Replace(".4.2.binds", ".4.1.binds");
 
                         if (!File.Exists(fileName))
                         {
-                            Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file also not found " + fileName);
+                            Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file not found " + fileName);
 
-                            fileName = fileName.Replace(".4.0.binds", ".3.0.binds");
+                            fileName = fileName.Replace(".4.1.binds", ".4.0.binds");
 
                             if (!File.Exists(fileName))
                             {
                                 Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file also not found " + fileName);
 
-                                fileName = fileName.Replace(".3.0.binds", ".binds");
+                                fileName = fileName.Replace(".4.0.binds", ".3.0.binds");
 
                                 if (!File.Exists(fileName))
                                 {
-                                    Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file not found " + fileName);
+                                    Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file also not found " + fileName);
+
+                                    fileName = fileName.Replace(".3.0.binds", ".binds");
+
+                                    if (!File.Exists(fileName))
+                                    {
+                                        Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file not found " + fileName);
+                                    }
                                 }
                             }
                         }

diff --git a/Elite/Properties/AssemblyInfo.cs b/Elite/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Elite Dangerous Buttons")]
-[assembly: AssemblyCopyright("Copyright ©  2024")]
+[assembly: AssemblyCopyright("Copyright ©  2025")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.7.3.0")]
-[assembly: AssemblyFileVersion("2.7.3.0")]
+[assembly: AssemblyVersion("2.7.4.0")]
+[assembly: AssemblyFileVersion("2.7.4.0")]
diff --git a/Elite/manifest.json b/Elite/manifest.json
@@ -192,7 +192,7 @@
   "Name": "Elite Dangerous",
   "Icon": "Images/pluginIcon",
   "URL": "/~https://github.com/mhwlng/streamdeck-elite",
-  "Version": "2.7.3",
+  "Version": "2.7.4",
   "CodePath": "com.mhwlng.elite",
   "Category": "Elite Dangerous",
   "CategoryIcon": "Images/categoryIcon",

diff --git a/Elite/packages.config b/Elite/packages.config
@@ -13,18 +13,18 @@
   <package id="NAudio.WinForms" version="2.2.1" targetFramework="net48" />
   <package id="NAudio.WinMM" version="2.2.1" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
-  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net48" />
-  <package id="NLog" version="5.3.2" targetFramework="net48" />
+  <package id="Newtonsoft.Json.Bson" version="1.0.3" targetFramework="net48" />
+  <package id="NLog" version="5.4.0" targetFramework="net48" />
   <package id="streamdeck-client-csharp" version="4.3.0" targetFramework="net472" />
-  <package id="StreamDeck-Tools" version="6.2.0" targetFramework="net48" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
+  <package id="StreamDeck-Tools" version="6.3.1" targetFramework="net48" />
+  <package id="System.Buffers" version="4.6.0" targetFramework="net48" />
   <package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net472" />
-  <package id="System.Drawing.Common" version="8.0.7" targetFramework="net48" />
-  <package id="System.Memory" version="4.5.5" targetFramework="net48" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
+  <package id="System.Drawing.Common" version="9.0.2" targetFramework="net48" />
+  <package id="System.Memory" version="4.6.0" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net48" />
   <package id="System.Security.AccessControl" version="6.0.1" targetFramework="net48" />
-  <package id="System.Security.Permissions" version="8.0.0" targetFramework="net48" />
+  <package id="System.Security.Permissions" version="9.0.2" targetFramework="net48" />
   <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net48" />
 </packages>
diff --git a/README.md b/README.md
@@ -198,7 +198,7 @@ If nothing happens, when pressing streamdeck buttons:
 
 You may see errors like this in the plugin log file :
 
-`file not found C:\Users\xxx\AppData\Local\Frontier Developments\Elite Dangerous\Options\Bindings\Custom.4.1.binds`
+`file not found C:\Users\xxx\AppData\Local\Frontier Developments\Elite Dangerous\Options\Bindings\Custom.4.2.binds`
 
 In that case, the plugin has no access to the bindings directory.