Merge branch 'main' into dependabot/nuget/Somfic.Common-0.2.1

Somfic · Jan 27, 2024 · f72f2a5 · f72f2a5
2 parents ab71497 + 1770aa0
commit f72f2a5
Show file tree

Hide file tree

Showing 18 changed files with 1,947 additions and 48 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: somfic
diff --git a/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj b/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj
@@ -5,10 +5,10 @@
     <LangVersion>10</LangVersion>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
-    <InformationalVersion>3.0.15+54.Branch.main.Sha.70e812132018e1fd6aed105986a0a4e768ac07a8</InformationalVersion>
+    <InformationalVersion>3.1.3+3.Branch.main.Sha.3f580569f82b353dc898f1e57a776f18dc2a597e</InformationalVersion>
     <Version>3.0.0-alpha5155</Version>
-    <AssemblyVersion>3.0.15.0</AssemblyVersion>
-    <FileVersion>3.0.15.0</FileVersion>
+    <AssemblyVersion>3.1.3.0</AssemblyVersion>
+    <FileVersion>3.1.3.0</FileVersion>
     <PackageProjectUrl>https://github.com/EliteAPI/EliteAPI</PackageProjectUrl>
     <RepositoryUrl>https://github.com/EliteAPI/EliteAPI</RepositoryUrl>
     <PackageIconUrl />
@@ -18,7 +18,7 @@
     <Description>Abstractions for EliteAPI</Description>
     <Copyright>© Somfic 2022</Copyright>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>3.0.15</Version>
+    <Version>3.1.3</Version>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <PackageIcon>icon.png</PackageIcon>
     <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>

diff --git a/EliteAPI.Abstractions/Events/IEvents.cs b/EliteAPI.Abstractions/Events/IEvents.cs
@@ -141,7 +141,7 @@ public interface IEvents
     /// <summary>Converts the JSON to a registered event type and invokes the registered event handlers.</summary>
     /// <param name="json">The event JSON</param>
     /// <param name="context">The context of the event</param>
-    IEvent Invoke(string json, EventContext context);
+    IEvent? Invoke(string json, EventContext context);
 
     /// <summary>Discovers and registers all the events in the specified assembly.</summary>
     /// <param name="assembly">The assembly the events are defined in</param>

diff --git a/EliteAPI.Events/EliteAPI.Events.csproj b/EliteAPI.Events/EliteAPI.Events.csproj
@@ -3,9 +3,9 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>10</LangVersion>
-    <AssemblyVersion>3.0.15.0</AssemblyVersion>
-    <FileVersion>3.0.15.0</FileVersion>
-    <InformationalVersion>3.0.15+54.Branch.main.Sha.70e812132018e1fd6aed105986a0a4e768ac07a8</InformationalVersion>
+    <AssemblyVersion>3.1.3.0</AssemblyVersion>
+    <FileVersion>3.1.3.0</FileVersion>
+    <InformationalVersion>3.1.3+3.Branch.main.Sha.3f580569f82b353dc898f1e57a776f18dc2a597e</InformationalVersion>
     <Version>3.0.0-alpha5167</Version>
     <IsPackable>true</IsPackable>
     <PackageProjectUrl>https://github.com/EliteAPI/EliteAPI</PackageProjectUrl>
@@ -17,7 +17,7 @@
     <Description>Events for EliteAPI</Description>
     <Copyright>© Somfic 2022</Copyright>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>3.0.15</Version>
+    <Version>3.1.3</Version>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <PackageIcon>icon.png</PackageIcon>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/EliteAPI.Events/Status/Ship/LegalState.cs b/EliteAPI.Events/Status/Ship/LegalState.cs
@@ -8,5 +8,6 @@ public enum LegalState
     Wanted,
     Hostile,
     PassengerWanted,
-    Warrant
+    Warrant,
+    Thargoid
 }
diff --git a/EliteAPI.Tests/Bindings.cs b/EliteAPI.Tests/Bindings.cs
@@ -23,6 +23,19 @@ public void Parsing()
     {
         var xml = File.ReadAllText("Bindings.xml");
         var bindings = _parser.Parse(xml);
+        Assert.That(bindings, Is.Not.Null);
+        Assert.That(bindings, Is.Not.Empty);
+        Assert.That(bindings, Has.Count.AtLeast(1));
+    }
+
+    [Test]
+    public void HcsParsing()
+    {
+        var xml = File.ReadAllText("BindingsHCS.xml");
+        var bindings = _parser.Parse(xml);
+        Assert.That(bindings, Is.Not.Null);
+        Assert.That(bindings, Is.Not.Empty);
+        Assert.That(bindings, Has.Count.AtLeast(1));
     }
 
     [Test]