Skip to content

Commit 2cf54fb

Browse files
authored
Merge branch 'dev' into dependabot/nuget/EliteAPI.Tests/TUnit-1.5.80
2 parents 21149a3 + d64fce4 commit 2cf54fb

File tree

4 files changed

+9
-23
lines changed

4 files changed

+9
-23
lines changed

.claude/settings.local.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ jobs:
228228
files: |
229229
EliteVA-${{ steps.version.outputs.version }}.zip
230230
231-
- name: publish to nuget
232-
if: steps.version.outputs.should_release == 'true'
233-
run: |
234-
dotnet nuget push ./nupkg/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
231+
# - name: publish to nuget
232+
# if: steps.version.outputs.should_release == 'true'
233+
# run: |
234+
# dotnet nuget push ./nupkg/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate

EliteAPI/EliteDangerousApi.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public class EliteDangerousApi
3131
private readonly Dictionary<string, List<Action<(string eventName, string json)>>> _untypedEventHandlers = new(StringComparer.OrdinalIgnoreCase);
3232
private readonly List<Action<IReadOnlyCollection<Control>>> _bindingsHandlers = [];
3333

34+
public Version Version => typeof(EliteDangerousApi).Assembly.GetName().Version!;
35+
3436
public EliteDangerousApi() : this(JournalUtils.GetJournalsDirectory(), BindingsUtils.GetBindingsDirectory())
3537
{
3638
}

EliteVA/EliteVA.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ public override async Task OnStart(IVoiceAttackProxy proxy)
116116
}
117117
});
118118

119+
// set version variable
120+
proxy.Variables.Set("EliteAPI.Version", _api.Version.ToString(), TypeCode.String);
121+
119122
_api.Start();
120123
WriteToLog(VoiceAttackColor.Green, $"EliteAPI started");
121124
}

0 commit comments

Comments
 (0)