Skip to content
This repository was archived by the owner on Mar 7, 2025. It is now read-only.

Commit 71119aa

Browse files
committed
handle new Custom.4.2.binds binding file
1 parent fb14320 commit 71119aa

File tree

7 files changed

+83
-50
lines changed

7 files changed

+83
-50
lines changed

Elite/App.config

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</dependentAssembly>
2020
<dependentAssembly>
2121
<assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
22-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
22+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
2323
</dependentAssembly>
2424
<dependentAssembly>
2525
<assemblyIdentity name="Microsoft.Win32.Registry" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -33,6 +33,18 @@
3333
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
3434
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
3535
</dependentAssembly>
36+
<dependentAssembly>
37+
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
38+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
39+
</dependentAssembly>
40+
<dependentAssembly>
41+
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
42+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
43+
</dependentAssembly>
44+
<dependentAssembly>
45+
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
46+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
47+
</dependentAssembly>
3648
</assemblyBinding>
3749
</runtime>
3850
</configuration>

Elite/Elite.csproj

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -94,20 +94,20 @@
9494
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
9595
</Reference>
9696
<Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
97-
<HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
97+
<HintPath>..\packages\Newtonsoft.Json.Bson.1.0.3\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
9898
</Reference>
9999
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
100-
<HintPath>..\packages\NLog.5.3.2\lib\net46\NLog.dll</HintPath>
100+
<HintPath>..\packages\NLog.5.4.0\lib\net46\NLog.dll</HintPath>
101101
</Reference>
102102
<Reference Include="streamdeck-client-csharp, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
103103
<HintPath>..\packages\streamdeck-client-csharp.4.3.0\lib\netstandard2.0\streamdeck-client-csharp.dll</HintPath>
104104
</Reference>
105-
<Reference Include="StreamDeckTools, Version=6.2.0.0, Culture=neutral, processorArchitecture=MSIL">
106-
<HintPath>..\packages\StreamDeck-Tools.6.2.0\lib\netstandard2.0\StreamDeckTools.dll</HintPath>
105+
<Reference Include="StreamDeckTools, Version=6.3.1.0, Culture=neutral, processorArchitecture=MSIL">
106+
<HintPath>..\packages\StreamDeck-Tools.6.3.1\lib\netstandard2.0\StreamDeckTools.dll</HintPath>
107107
</Reference>
108108
<Reference Include="System" />
109-
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
110-
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
109+
<Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
110+
<HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
111111
</Reference>
112112
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
113113
<HintPath>..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
@@ -118,39 +118,39 @@
118118
<Reference Include="System.Data.OracleClient" />
119119
<Reference Include="System.DirectoryServices" />
120120
<Reference Include="System.Drawing" />
121-
<Reference Include="System.Drawing.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
122-
<HintPath>..\packages\System.Drawing.Common.8.0.7\lib\net462\System.Drawing.Common.dll</HintPath>
121+
<Reference Include="System.Drawing.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
122+
<HintPath>..\packages\System.Drawing.Common.9.0.2\lib\net462\System.Drawing.Common.dll</HintPath>
123123
</Reference>
124124
<Reference Include="System.IO.Compression" />
125-
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
126-
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
125+
<Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
126+
<HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
127127
</Reference>
128128
<Reference Include="System.Net" />
129129
<Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130130
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
131131
</Reference>
132132
<Reference Include="System.Numerics" />
133-
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
134-
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
133+
<Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
134+
<HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
135135
</Reference>
136-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
137-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
136+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
137+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
138138
</Reference>
139139
<Reference Include="System.Runtime.Serialization" />
140140
<Reference Include="System.Security" />
141141
<Reference Include="System.Security.AccessControl, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
142142
<HintPath>..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll</HintPath>
143143
</Reference>
144-
<Reference Include="System.Security.Permissions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
145-
<HintPath>..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll</HintPath>
144+
<Reference Include="System.Security.Permissions, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
145+
<HintPath>..\packages\System.Security.Permissions.9.0.2\lib\net462\System.Security.Permissions.dll</HintPath>
146146
</Reference>
147147
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
148148
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
149149
</Reference>
150150
<Reference Include="System.ServiceModel" />
151151
<Reference Include="System.ServiceProcess" />
152-
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
153-
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
152+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
153+
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
154154
</Reference>
155155
<Reference Include="System.Transactions" />
156156
<Reference Include="System.Windows.Forms" />

Elite/Program.cs

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -245,29 +245,36 @@ public static bool HandleKeyBinding(BindingType bindingType, string bindingsPat
245245
}
246246

247247

248-
var fileName = Path.Combine(bindingsPath, bindsName + ".4.1.binds");
248+
var fileName = Path.Combine(bindingsPath, bindsName + ".4.2.binds");
249249

250250
if (!File.Exists(fileName))
251251
{
252252
Logger.Instance.LogMessage(TracingLevel.ERROR, "file not found " + fileName);
253253

254-
fileName = fileName.Replace(".4.1.binds", ".4.0.binds");
254+
fileName = fileName.Replace(".4.2.binds", ".4.1.binds");
255255

256256
if (!File.Exists(fileName))
257257
{
258-
Logger.Instance.LogMessage(TracingLevel.ERROR, "file also not found " + fileName);
258+
Logger.Instance.LogMessage(TracingLevel.ERROR, "file not found " + fileName);
259259

260-
fileName = fileName.Replace(".4.0.binds", ".3.0.binds");
260+
fileName = fileName.Replace(".4.1.binds", ".4.0.binds");
261261

262262
if (!File.Exists(fileName))
263263
{
264264
Logger.Instance.LogMessage(TracingLevel.ERROR, "file also not found " + fileName);
265265

266-
fileName = fileName.Replace(".3.0.binds", ".binds");
266+
fileName = fileName.Replace(".4.0.binds", ".3.0.binds");
267267

268268
if (!File.Exists(fileName))
269269
{
270270
Logger.Instance.LogMessage(TracingLevel.ERROR, "file also not found " + fileName);
271+
272+
fileName = fileName.Replace(".3.0.binds", ".binds");
273+
274+
if (!File.Exists(fileName))
275+
{
276+
Logger.Instance.LogMessage(TracingLevel.ERROR, "file also not found " + fileName);
277+
}
271278
}
272279
}
273280
}
@@ -280,29 +287,36 @@ public static bool HandleKeyBinding(BindingType bindingType, string bindingsPat
280287

281288
if (!string.IsNullOrEmpty(bindingsPath))
282289
{
283-
fileName = Path.Combine(bindingsPath, bindsName + ".4.1.binds");
290+
fileName = Path.Combine(bindingsPath, bindsName + ".4.2.binds");
284291

285292
if (!File.Exists(fileName))
286293
{
287294
Logger.Instance.LogMessage(TracingLevel.ERROR, "steam file not found " + fileName);
288295

289-
fileName = fileName.Replace(".4.1.binds", ".4.0.binds");
296+
fileName = fileName.Replace(".4.2.binds", ".4.1.binds");
290297

291298
if (!File.Exists(fileName))
292299
{
293-
Logger.Instance.LogMessage(TracingLevel.ERROR, "steam file also not found " + fileName);
300+
Logger.Instance.LogMessage(TracingLevel.ERROR, "steam file not found " + fileName);
294301

295-
fileName = fileName.Replace(".4.0.binds", ".3.0.binds");
302+
fileName = fileName.Replace(".4.1.binds", ".4.0.binds");
296303

297304
if (!File.Exists(fileName))
298305
{
299306
Logger.Instance.LogMessage(TracingLevel.ERROR, "steam file also not found " + fileName);
300307

301-
fileName = fileName.Replace(".3.0.binds", ".binds");
308+
fileName = fileName.Replace(".4.0.binds", ".3.0.binds");
302309

303310
if (!File.Exists(fileName))
304311
{
305312
Logger.Instance.LogMessage(TracingLevel.ERROR, "steam file also not found " + fileName);
313+
314+
fileName = fileName.Replace(".3.0.binds", ".binds");
315+
316+
if (!File.Exists(fileName))
317+
{
318+
Logger.Instance.LogMessage(TracingLevel.ERROR, "steam file also not found " + fileName);
319+
}
306320
}
307321
}
308322
}
@@ -317,29 +331,36 @@ public static bool HandleKeyBinding(BindingType bindingType, string bindingsPat
317331

318332
if (!string.IsNullOrEmpty(bindingsPath))
319333
{
320-
fileName = Path.Combine(bindingsPath, bindsName + ".4.1.binds");
334+
fileName = Path.Combine(bindingsPath, bindsName + ".4.2.binds");
321335

322336
if (!File.Exists(fileName))
323337
{
324338
Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file not found " + fileName);
325339

326-
fileName = fileName.Replace(".4.1.binds", ".4.0.binds");
340+
fileName = fileName.Replace(".4.2.binds", ".4.1.binds");
327341

328342
if (!File.Exists(fileName))
329343
{
330-
Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file also not found " + fileName);
344+
Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file not found " + fileName);
331345

332-
fileName = fileName.Replace(".4.0.binds", ".3.0.binds");
346+
fileName = fileName.Replace(".4.1.binds", ".4.0.binds");
333347

334348
if (!File.Exists(fileName))
335349
{
336350
Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file also not found " + fileName);
337351

338-
fileName = fileName.Replace(".3.0.binds", ".binds");
352+
fileName = fileName.Replace(".4.0.binds", ".3.0.binds");
339353

340354
if (!File.Exists(fileName))
341355
{
342-
Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file not found " + fileName);
356+
Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file also not found " + fileName);
357+
358+
fileName = fileName.Replace(".3.0.binds", ".binds");
359+
360+
if (!File.Exists(fileName))
361+
{
362+
Logger.Instance.LogMessage(TracingLevel.ERROR, "epic file not found " + fileName);
363+
}
343364
}
344365
}
345366
}

Elite/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[assembly: AssemblyConfiguration("")]
1010
[assembly: AssemblyCompany("")]
1111
[assembly: AssemblyProduct("Elite Dangerous Buttons")]
12-
[assembly: AssemblyCopyright("Copyright © 2024")]
12+
[assembly: AssemblyCopyright("Copyright © 2025")]
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515

@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("2.7.3.0")]
35-
[assembly: AssemblyFileVersion("2.7.3.0")]
34+
[assembly: AssemblyVersion("2.7.4.0")]
35+
[assembly: AssemblyFileVersion("2.7.4.0")]

Elite/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
"Name": "Elite Dangerous",
193193
"Icon": "Images/pluginIcon",
194194
"URL": "https://github.com/mhwlng/streamdeck-elite",
195-
"Version": "2.7.3",
195+
"Version": "2.7.4",
196196
"CodePath": "com.mhwlng.elite",
197197
"Category": "Elite Dangerous",
198198
"CategoryIcon": "Images/categoryIcon",

Elite/packages.config

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
<package id="NAudio.WinForms" version="2.2.1" targetFramework="net48" />
1414
<package id="NAudio.WinMM" version="2.2.1" targetFramework="net48" />
1515
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
16-
<package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net48" />
17-
<package id="NLog" version="5.3.2" targetFramework="net48" />
16+
<package id="Newtonsoft.Json.Bson" version="1.0.3" targetFramework="net48" />
17+
<package id="NLog" version="5.4.0" targetFramework="net48" />
1818
<package id="streamdeck-client-csharp" version="4.3.0" targetFramework="net472" />
19-
<package id="StreamDeck-Tools" version="6.2.0" targetFramework="net48" />
20-
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
19+
<package id="StreamDeck-Tools" version="6.3.1" targetFramework="net48" />
20+
<package id="System.Buffers" version="4.6.0" targetFramework="net48" />
2121
<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net472" />
22-
<package id="System.Drawing.Common" version="8.0.7" targetFramework="net48" />
23-
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
24-
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
25-
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
22+
<package id="System.Drawing.Common" version="9.0.2" targetFramework="net48" />
23+
<package id="System.Memory" version="4.6.0" targetFramework="net48" />
24+
<package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
25+
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net48" />
2626
<package id="System.Security.AccessControl" version="6.0.1" targetFramework="net48" />
27-
<package id="System.Security.Permissions" version="8.0.0" targetFramework="net48" />
27+
<package id="System.Security.Permissions" version="9.0.2" targetFramework="net48" />
2828
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net472" />
29-
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
29+
<package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net48" />
3030
</packages>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ If nothing happens, when pressing streamdeck buttons:
198198

199199
You may see errors like this in the plugin log file :
200200

201-
`file not found C:\Users\xxx\AppData\Local\Frontier Developments\Elite Dangerous\Options\Bindings\Custom.4.1.binds`
201+
`file not found C:\Users\xxx\AppData\Local\Frontier Developments\Elite Dangerous\Options\Bindings\Custom.4.2.binds`
202202

203203
In that case, the plugin has no access to the bindings directory.
204204

0 commit comments

Comments
 (0)