From 5eb93aaea1f26150aed95f868db4ee7f721a0455 Mon Sep 17 00:00:00 2001 From: Lucas <29230467+Somfic@users.noreply.github.com> Date: Fri, 13 Oct 2023 12:46:11 +0200 Subject: [PATCH 01/14] Updated example project references --- Examples/Example/Example.csproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/Examples/Example/Example.csproj b/Examples/Example/Example.csproj index 3bebecc2..8cf2ac49 100644 --- a/Examples/Example/Example.csproj +++ b/Examples/Example/Example.csproj @@ -17,8 +17,6 @@ - - From 2ef07e32cc558371cd4affa6bc85f01a7c38f1fc Mon Sep 17 00:00:00 2001 From: Lucas <29230467+Somfic@users.noreply.github.com> Date: Fri, 13 Oct 2023 12:46:41 +0200 Subject: [PATCH 02/14] Removed BuyMicroResources from blacklisted tests --- EliteAPI.Tests/JournalManual.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EliteAPI.Tests/JournalManual.cs b/EliteAPI.Tests/JournalManual.cs index 268e4421..2a427b1a 100644 --- a/EliteAPI.Tests/JournalManual.cs +++ b/EliteAPI.Tests/JournalManual.cs @@ -17,7 +17,7 @@ namespace EliteAPI.Tests; public class JournalManual { private static IEvents _events; - private static string[] _legacyEvents = { "BackpackMaterials", "BuyMicroResources", "ShipTargetted", "CarrierNameChanged" }; + private static string[] _legacyEvents = { "BackpackMaterials", "ShipTargetted", "CarrierNameChanged" }; private static string[] _legacyExamples = { "\"timestamp\":\"2020-04-27T08:02:52Z\", \"event\":\"Route\"", From 351ecb372b0784b68adba02aa1a104f169a0e662 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 13 Oct 2023 10:48:52 +0000 Subject: [PATCH 03/14] Bumped version to 3.1.0 --- EliteAPI.Abstractions/EliteAPI.Abstractions.csproj | 8 ++++---- EliteAPI.Events/EliteAPI.Events.csproj | 8 ++++---- EliteAPI.Tests/EliteAPI.Tests.csproj | 8 ++++---- EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj | 8 ++++---- EliteAPI.Web/EliteAPI.Web.csproj | 8 ++++---- EliteAPI/EliteAPI.csproj | 8 ++++---- Examples/Example.Web/Example.Web.csproj | 8 ++++---- Examples/Example/Example.csproj | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj b/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj index 7a390c20..5b322b27 100644 --- a/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj +++ b/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj @@ -5,10 +5,10 @@ 10 3.0.0.0 3.0.0.0 - 3.0.15+54.Branch.main.Sha.70e812132018e1fd6aed105986a0a4e768ac07a8 + 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc 3.0.0-alpha5155 - 3.0.15.0 - 3.0.15.0 + 3.1.0.0 + 3.1.0.0 https://github.com/EliteAPI/EliteAPI https://github.com/EliteAPI/EliteAPI @@ -18,7 +18,7 @@ Abstractions for EliteAPI © Somfic 2022 false - 3.0.15 + 3.1.0 true icon.png true diff --git a/EliteAPI.Events/EliteAPI.Events.csproj b/EliteAPI.Events/EliteAPI.Events.csproj index db261b38..3eb83b20 100644 --- a/EliteAPI.Events/EliteAPI.Events.csproj +++ b/EliteAPI.Events/EliteAPI.Events.csproj @@ -3,9 +3,9 @@ enable enable 10 - 3.0.15.0 - 3.0.15.0 - 3.0.15+54.Branch.main.Sha.70e812132018e1fd6aed105986a0a4e768ac07a8 + 3.1.0.0 + 3.1.0.0 + 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc 3.0.0-alpha5167 true https://github.com/EliteAPI/EliteAPI @@ -17,7 +17,7 @@ Events for EliteAPI © Somfic 2022 false - 3.0.15 + 3.1.0 true icon.png netstandard2.0 diff --git a/EliteAPI.Tests/EliteAPI.Tests.csproj b/EliteAPI.Tests/EliteAPI.Tests.csproj index e79a1bcc..5b58cabf 100644 --- a/EliteAPI.Tests/EliteAPI.Tests.csproj +++ b/EliteAPI.Tests/EliteAPI.Tests.csproj @@ -5,10 +5,10 @@ enable false true - 3.0.15.0 - 3.0.15.0 - 3.0.15+54.Branch.main.Sha.70e812132018e1fd6aed105986a0a4e768ac07a8 - 3.0.15 + 3.1.0.0 + 3.1.0.0 + 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0 diff --git a/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj b/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj index 815f427c..0f1288ea 100644 --- a/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj +++ b/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj @@ -4,10 +4,10 @@ enable enable default - 3.0.15.0 - 3.0.15.0 - 3.0.15+54.Branch.main.Sha.70e812132018e1fd6aed105986a0a4e768ac07a8 - 3.0.15 + 3.1.0.0 + 3.1.0.0 + 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0 diff --git a/EliteAPI.Web/EliteAPI.Web.csproj b/EliteAPI.Web/EliteAPI.Web.csproj index 7d0f7128..abd05f0a 100644 --- a/EliteAPI.Web/EliteAPI.Web.csproj +++ b/EliteAPI.Web/EliteAPI.Web.csproj @@ -4,10 +4,10 @@ enable default netstandard2.0 - 3.0.15.0 - 3.0.15.0 - 3.0.15+54.Branch.main.Sha.70e812132018e1fd6aed105986a0a4e768ac07a8 - 3.0.15 + 3.1.0.0 + 3.1.0.0 + 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0 diff --git a/EliteAPI/EliteAPI.csproj b/EliteAPI/EliteAPI.csproj index 7a9997d1..24fde2f0 100644 --- a/EliteAPI/EliteAPI.csproj +++ b/EliteAPI/EliteAPI.csproj @@ -1,7 +1,7 @@  - 3.0.15.0 - 3.0.15.0 + 3.1.0.0 + 3.1.0.0 https://github.com/EliteAPI/EliteAPI https://github.com/EliteAPI/EliteAPI @@ -11,14 +11,14 @@ A powerful event based .NET API for Elite: Dangerous © Somfic 2022 false - 3.0.15 + 3.1.0 true icon.png true 10 true Somfic - 3.0.15+54.Branch.main.Sha.70e812132018e1fd6aed105986a0a4e768ac07a8 + 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc enable netstandard2.0 diff --git a/Examples/Example.Web/Example.Web.csproj b/Examples/Example.Web/Example.Web.csproj index 0599b6d5..a26e8969 100644 --- a/Examples/Example.Web/Example.Web.csproj +++ b/Examples/Example.Web/Example.Web.csproj @@ -5,10 +5,10 @@ enable enable false - 3.0.15.0 - 3.0.15.0 - 3.0.15+54.Branch.main.Sha.70e812132018e1fd6aed105986a0a4e768ac07a8 - 3.0.15 + 3.1.0.0 + 3.1.0.0 + 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0 diff --git a/Examples/Example/Example.csproj b/Examples/Example/Example.csproj index 8cf2ac49..b09e9352 100644 --- a/Examples/Example/Example.csproj +++ b/Examples/Example/Example.csproj @@ -2,10 +2,10 @@ enable enable - 3.0.15.0 - 3.0.15.0 - 3.0.15+54.Branch.main.Sha.70e812132018e1fd6aed105986a0a4e768ac07a8 - 3.0.15 + 3.1.0.0 + 3.1.0.0 + 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0 false 10 Exe From 138e8e5746f245bfb2ce05d4d3fb02eeba66eb32 Mon Sep 17 00:00:00 2001 From: Lucas <29230467+Somfic@users.noreply.github.com> Date: Fri, 13 Oct 2023 12:55:58 +0200 Subject: [PATCH 04/14] Do not throw error when event is not registered --- EliteAPI.Abstractions/Events/IEvents.cs | 2 +- EliteAPI.Tests/JournalManual.cs | 2 +- EliteAPI/Events/Events.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EliteAPI.Abstractions/Events/IEvents.cs b/EliteAPI.Abstractions/Events/IEvents.cs index 4f9df52c..8e00ccb6 100644 --- a/EliteAPI.Abstractions/Events/IEvents.cs +++ b/EliteAPI.Abstractions/Events/IEvents.cs @@ -141,7 +141,7 @@ public interface IEvents /// Converts the JSON to a registered event type and invokes the registered event handlers. /// The event JSON /// The context of the event - IEvent Invoke(string json, EventContext context); + IEvent? Invoke(string json, EventContext context); /// Discovers and registers all the events in the specified assembly. /// The assembly the events are defined in diff --git a/EliteAPI.Tests/JournalManual.cs b/EliteAPI.Tests/JournalManual.cs index 2a427b1a..682c9ccf 100644 --- a/EliteAPI.Tests/JournalManual.cs +++ b/EliteAPI.Tests/JournalManual.cs @@ -69,7 +69,7 @@ public void Json(string json) var invokedEvent = _events.Invoke(json, new EventContext()); - Assert.That(invokedEvent, Is.Not.Null, $"Event is null"); + Assert.That(invokedEvent, Is.Not.Null, $"Event is not registered: {json}"); // Check if the event is the correct type var eventType = invokedEvent.GetType(); diff --git a/EliteAPI/Events/Events.cs b/EliteAPI/Events/Events.cs index 02e1515a..e6282387 100644 --- a/EliteAPI/Events/Events.cs +++ b/EliteAPI/Events/Events.cs @@ -206,7 +206,7 @@ public IEvent Invoke(TEvent @event, EventContext context) where TEvent : } /// - public IEvent Invoke(string json, EventContext context) + public IEvent? Invoke(string json, EventContext context) { try { @@ -241,7 +241,7 @@ public IEvent Invoke(string json, EventContext context) InvokeAnyHandlers(eventType, json, context); if (eventType == null) - throw new Exception($"The {eventName} event is not registered"); // todo: better exception type + return null; var parsedEvent = _eventParser.FromJson(eventType, json); From 6f380f7e241bac3a2c3ce74b1d3550320f10db49 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 13 Oct 2023 10:58:20 +0000 Subject: [PATCH 05/14] Bumped version to 3.1.0 --- EliteAPI.Abstractions/EliteAPI.Abstractions.csproj | 2 +- EliteAPI.Events/EliteAPI.Events.csproj | 2 +- EliteAPI.Tests/EliteAPI.Tests.csproj | 2 +- EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj | 2 +- EliteAPI.Web/EliteAPI.Web.csproj | 2 +- EliteAPI/EliteAPI.csproj | 2 +- Examples/Example.Web/Example.Web.csproj | 2 +- Examples/Example/Example.csproj | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj b/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj index 5b322b27..6029ab6b 100644 --- a/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj +++ b/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj @@ -5,7 +5,7 @@ 10 3.0.0.0 3.0.0.0 - 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a 3.0.0-alpha5155 3.1.0.0 3.1.0.0 diff --git a/EliteAPI.Events/EliteAPI.Events.csproj b/EliteAPI.Events/EliteAPI.Events.csproj index 3eb83b20..63d01a14 100644 --- a/EliteAPI.Events/EliteAPI.Events.csproj +++ b/EliteAPI.Events/EliteAPI.Events.csproj @@ -5,7 +5,7 @@ 10 3.1.0.0 3.1.0.0 - 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a 3.0.0-alpha5167 true https://github.com/EliteAPI/EliteAPI diff --git a/EliteAPI.Tests/EliteAPI.Tests.csproj b/EliteAPI.Tests/EliteAPI.Tests.csproj index 5b58cabf..51fb88bd 100644 --- a/EliteAPI.Tests/EliteAPI.Tests.csproj +++ b/EliteAPI.Tests/EliteAPI.Tests.csproj @@ -7,7 +7,7 @@ true 3.1.0.0 3.1.0.0 - 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a 3.1.0 diff --git a/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj b/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj index 0f1288ea..f59c8149 100644 --- a/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj +++ b/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj @@ -6,7 +6,7 @@ default 3.1.0.0 3.1.0.0 - 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a 3.1.0 diff --git a/EliteAPI.Web/EliteAPI.Web.csproj b/EliteAPI.Web/EliteAPI.Web.csproj index abd05f0a..d9f4c691 100644 --- a/EliteAPI.Web/EliteAPI.Web.csproj +++ b/EliteAPI.Web/EliteAPI.Web.csproj @@ -6,7 +6,7 @@ netstandard2.0 3.1.0.0 3.1.0.0 - 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a 3.1.0 diff --git a/EliteAPI/EliteAPI.csproj b/EliteAPI/EliteAPI.csproj index 24fde2f0..f3f432c8 100644 --- a/EliteAPI/EliteAPI.csproj +++ b/EliteAPI/EliteAPI.csproj @@ -18,7 +18,7 @@ 10 true Somfic - 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a enable netstandard2.0 diff --git a/Examples/Example.Web/Example.Web.csproj b/Examples/Example.Web/Example.Web.csproj index a26e8969..ae27dfd5 100644 --- a/Examples/Example.Web/Example.Web.csproj +++ b/Examples/Example.Web/Example.Web.csproj @@ -7,7 +7,7 @@ false 3.1.0.0 3.1.0.0 - 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a 3.1.0 diff --git a/Examples/Example/Example.csproj b/Examples/Example/Example.csproj index b09e9352..2f7d8194 100644 --- a/Examples/Example/Example.csproj +++ b/Examples/Example/Example.csproj @@ -4,7 +4,7 @@ enable 3.1.0.0 3.1.0.0 - 3.1.0+2.Branch.main.Sha.2ef07e32cc558371cd4affa6bc85f01a7c38f1fc + 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a 3.1.0 false 10 From fc1663c60e27f1e5a7f37ea160559c71631aad61 Mon Sep 17 00:00:00 2001 From: Lucas <29230467+Somfic@users.noreply.github.com> Date: Fri, 13 Oct 2023 13:00:31 +0200 Subject: [PATCH 06/14] +semver: patch --- Examples/Example.Web/Program.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Examples/Example.Web/Program.cs b/Examples/Example.Web/Program.cs index ef77edd9..e569e360 100644 --- a/Examples/Example.Web/Program.cs +++ b/Examples/Example.Web/Program.cs @@ -38,4 +38,5 @@ { Console.WriteLine(string.Join(", ", r.Bodies.Select(x => x.SystemName))); }, - error: e => Console.WriteLine(e.Message)); \ No newline at end of file + error: e => Console.WriteLine(e.Message)); + \ No newline at end of file From e30b34da9815588232ef2782b6dbe5c0128b5248 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 13 Oct 2023 11:02:37 +0000 Subject: [PATCH 07/14] Bumped version to 3.1.1 --- EliteAPI.Abstractions/EliteAPI.Abstractions.csproj | 8 ++++---- EliteAPI.Events/EliteAPI.Events.csproj | 8 ++++---- EliteAPI.Tests/EliteAPI.Tests.csproj | 8 ++++---- EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj | 8 ++++---- EliteAPI.Web/EliteAPI.Web.csproj | 8 ++++---- EliteAPI/EliteAPI.csproj | 8 ++++---- Examples/Example.Web/Example.Web.csproj | 8 ++++---- Examples/Example/Example.csproj | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj b/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj index 6029ab6b..ebe73725 100644 --- a/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj +++ b/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj @@ -5,10 +5,10 @@ 10 3.0.0.0 3.0.0.0 - 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a + 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 3.0.0-alpha5155 - 3.1.0.0 - 3.1.0.0 + 3.1.1.0 + 3.1.1.0 https://github.com/EliteAPI/EliteAPI https://github.com/EliteAPI/EliteAPI @@ -18,7 +18,7 @@ Abstractions for EliteAPI © Somfic 2022 false - 3.1.0 + 3.1.1 true icon.png true diff --git a/EliteAPI.Events/EliteAPI.Events.csproj b/EliteAPI.Events/EliteAPI.Events.csproj index 63d01a14..15ae6b9d 100644 --- a/EliteAPI.Events/EliteAPI.Events.csproj +++ b/EliteAPI.Events/EliteAPI.Events.csproj @@ -3,9 +3,9 @@ enable enable 10 - 3.1.0.0 - 3.1.0.0 - 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a + 3.1.1.0 + 3.1.1.0 + 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 3.0.0-alpha5167 true https://github.com/EliteAPI/EliteAPI @@ -17,7 +17,7 @@ Events for EliteAPI © Somfic 2022 false - 3.1.0 + 3.1.1 true icon.png netstandard2.0 diff --git a/EliteAPI.Tests/EliteAPI.Tests.csproj b/EliteAPI.Tests/EliteAPI.Tests.csproj index 51fb88bd..ba81978f 100644 --- a/EliteAPI.Tests/EliteAPI.Tests.csproj +++ b/EliteAPI.Tests/EliteAPI.Tests.csproj @@ -5,10 +5,10 @@ enable false true - 3.1.0.0 - 3.1.0.0 - 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a - 3.1.0 + 3.1.1.0 + 3.1.1.0 + 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 + 3.1.1 diff --git a/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj b/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj index f59c8149..3d9fa26b 100644 --- a/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj +++ b/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj @@ -4,10 +4,10 @@ enable enable default - 3.1.0.0 - 3.1.0.0 - 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a - 3.1.0 + 3.1.1.0 + 3.1.1.0 + 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 + 3.1.1 diff --git a/EliteAPI.Web/EliteAPI.Web.csproj b/EliteAPI.Web/EliteAPI.Web.csproj index d9f4c691..38a576b7 100644 --- a/EliteAPI.Web/EliteAPI.Web.csproj +++ b/EliteAPI.Web/EliteAPI.Web.csproj @@ -4,10 +4,10 @@ enable default netstandard2.0 - 3.1.0.0 - 3.1.0.0 - 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a - 3.1.0 + 3.1.1.0 + 3.1.1.0 + 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 + 3.1.1 diff --git a/EliteAPI/EliteAPI.csproj b/EliteAPI/EliteAPI.csproj index f3f432c8..0f77a862 100644 --- a/EliteAPI/EliteAPI.csproj +++ b/EliteAPI/EliteAPI.csproj @@ -1,7 +1,7 @@  - 3.1.0.0 - 3.1.0.0 + 3.1.1.0 + 3.1.1.0 https://github.com/EliteAPI/EliteAPI https://github.com/EliteAPI/EliteAPI @@ -11,14 +11,14 @@ A powerful event based .NET API for Elite: Dangerous © Somfic 2022 false - 3.1.0 + 3.1.1 true icon.png true 10 true Somfic - 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a + 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 enable netstandard2.0 diff --git a/Examples/Example.Web/Example.Web.csproj b/Examples/Example.Web/Example.Web.csproj index ae27dfd5..a40c652d 100644 --- a/Examples/Example.Web/Example.Web.csproj +++ b/Examples/Example.Web/Example.Web.csproj @@ -5,10 +5,10 @@ enable enable false - 3.1.0.0 - 3.1.0.0 - 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a - 3.1.0 + 3.1.1.0 + 3.1.1.0 + 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 + 3.1.1 diff --git a/Examples/Example/Example.csproj b/Examples/Example/Example.csproj index 2f7d8194..2550b70b 100644 --- a/Examples/Example/Example.csproj +++ b/Examples/Example/Example.csproj @@ -2,10 +2,10 @@ enable enable - 3.1.0.0 - 3.1.0.0 - 3.1.0+5.Branch.main.Sha.a29c70b027785e9b1b8805176284f05ff06f9e6a - 3.1.0 + 3.1.1.0 + 3.1.1.0 + 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 + 3.1.1 false 10 Exe From 23e1eba6b9339a6aaf5fac9f3d1d9727dd5a9bac Mon Sep 17 00:00:00 2001 From: Lucas <29230467+Somfic@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:10:39 +0200 Subject: [PATCH 08/14] Added better error handling with HCS keybindings --- EliteAPI/Bindings/BindingsParser.cs | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/EliteAPI/Bindings/BindingsParser.cs b/EliteAPI/Bindings/BindingsParser.cs index d02302a4..777f57ac 100644 --- a/EliteAPI/Bindings/BindingsParser.cs +++ b/EliteAPI/Bindings/BindingsParser.cs @@ -27,21 +27,30 @@ public IReadOnlyCollection Parse(string xml) var document = new XmlDocument(); document.LoadXml(xml); var root = document.DocumentElement; + + if(root == null) + throw new Exception("Could not find root"); var bindings = new List(); for (var i = 0; i < root?.ChildNodes.Count; i++) { - var node = root.ChildNodes.Item(i); - - bindings.Add(ParseNode(node)); + var node = root.ChildNodes.Item(i)!; + + try + { + bindings.Add(ParseNode(node)); + } catch (Exception ex) + { + _log?.LogWarning(ex, "Failed to parse binding {NodeName}", node.Name); + } } return bindings; } catch (Exception ex) { - _log?.LogError(ex, "Failed to parse bindings"); + _log?.LogWarning(ex, "Failed to parse bindings"); return Array.Empty(); } } @@ -97,8 +106,8 @@ private Binding ParseNode(XmlNode node) var modifiers = modifierNodes.Any() ? modifierNodes.Select(modifierNode => new ModifierBinding(modifierNode.Attributes?["Key"].Value,modifierNode.Attributes?["Device"].Value)) : Array.Empty(); return ( - node.Attributes["Key"].Value, - node.Attributes["Device"].Value, + node.Attributes?["Key"]?.Value ?? "", + node.Attributes?["Device"]?.Value ?? "", modifiers.ToArray() ); } From a4588e4dbc525085b9934270dbfd7f92d8a34a85 Mon Sep 17 00:00:00 2001 From: Lucas <29230467+Somfic@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:10:51 +0200 Subject: [PATCH 09/14] Added HCS keybinding test --- EliteAPI.Tests/Bindings.cs | 13 + EliteAPI.Tests/BindingsHCS.xml | 1871 ++++++++++++++++++++++++++ EliteAPI.Tests/EliteAPI.Tests.csproj | 3 + 3 files changed, 1887 insertions(+) create mode 100644 EliteAPI.Tests/BindingsHCS.xml diff --git a/EliteAPI.Tests/Bindings.cs b/EliteAPI.Tests/Bindings.cs index 91a3a746..3005a599 100644 --- 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] diff --git a/EliteAPI.Tests/BindingsHCS.xml b/EliteAPI.Tests/BindingsHCS.xml new file mode 100644 index 00000000..bf4a0633 --- /dev/null +++ b/EliteAPI.Tests/BindingsHCS.xml @@ -0,0 +1,1871 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EliteAPI.Tests/EliteAPI.Tests.csproj b/EliteAPI.Tests/EliteAPI.Tests.csproj index 51fb88bd..fe6dba23 100644 --- a/EliteAPI.Tests/EliteAPI.Tests.csproj +++ b/EliteAPI.Tests/EliteAPI.Tests.csproj @@ -33,5 +33,8 @@ Always + + Always + \ No newline at end of file From e8ee425f8dab89f03eb2086b71e4975d026f228b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 18 Oct 2023 17:15:01 +0000 Subject: [PATCH 10/14] Bumped version to 3.1.2 --- EliteAPI.Abstractions/EliteAPI.Abstractions.csproj | 8 ++++---- EliteAPI.Events/EliteAPI.Events.csproj | 8 ++++---- EliteAPI.Tests/EliteAPI.Tests.csproj | 8 ++++---- EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj | 8 ++++---- EliteAPI.Web/EliteAPI.Web.csproj | 8 ++++---- EliteAPI/EliteAPI.csproj | 8 ++++---- Examples/Example.Web/Example.Web.csproj | 8 ++++---- Examples/Example/Example.csproj | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj b/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj index ebe73725..d6de996d 100644 --- a/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj +++ b/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj @@ -5,10 +5,10 @@ 10 3.0.0.0 3.0.0.0 - 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 + 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace 3.0.0-alpha5155 - 3.1.1.0 - 3.1.1.0 + 3.1.2.0 + 3.1.2.0 https://github.com/EliteAPI/EliteAPI https://github.com/EliteAPI/EliteAPI @@ -18,7 +18,7 @@ Abstractions for EliteAPI © Somfic 2022 false - 3.1.1 + 3.1.2 true icon.png true diff --git a/EliteAPI.Events/EliteAPI.Events.csproj b/EliteAPI.Events/EliteAPI.Events.csproj index 15ae6b9d..6b8f76b1 100644 --- a/EliteAPI.Events/EliteAPI.Events.csproj +++ b/EliteAPI.Events/EliteAPI.Events.csproj @@ -3,9 +3,9 @@ enable enable 10 - 3.1.1.0 - 3.1.1.0 - 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 + 3.1.2.0 + 3.1.2.0 + 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace 3.0.0-alpha5167 true https://github.com/EliteAPI/EliteAPI @@ -17,7 +17,7 @@ Events for EliteAPI © Somfic 2022 false - 3.1.1 + 3.1.2 true icon.png netstandard2.0 diff --git a/EliteAPI.Tests/EliteAPI.Tests.csproj b/EliteAPI.Tests/EliteAPI.Tests.csproj index 36b4c1f5..98f21045 100644 --- a/EliteAPI.Tests/EliteAPI.Tests.csproj +++ b/EliteAPI.Tests/EliteAPI.Tests.csproj @@ -5,10 +5,10 @@ enable false true - 3.1.1.0 - 3.1.1.0 - 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 - 3.1.1 + 3.1.2.0 + 3.1.2.0 + 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace + 3.1.2 diff --git a/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj b/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj index 3d9fa26b..8fe0b8c7 100644 --- a/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj +++ b/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj @@ -4,10 +4,10 @@ enable enable default - 3.1.1.0 - 3.1.1.0 - 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 - 3.1.1 + 3.1.2.0 + 3.1.2.0 + 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace + 3.1.2 diff --git a/EliteAPI.Web/EliteAPI.Web.csproj b/EliteAPI.Web/EliteAPI.Web.csproj index 38a576b7..9dade673 100644 --- a/EliteAPI.Web/EliteAPI.Web.csproj +++ b/EliteAPI.Web/EliteAPI.Web.csproj @@ -4,10 +4,10 @@ enable default netstandard2.0 - 3.1.1.0 - 3.1.1.0 - 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 - 3.1.1 + 3.1.2.0 + 3.1.2.0 + 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace + 3.1.2 diff --git a/EliteAPI/EliteAPI.csproj b/EliteAPI/EliteAPI.csproj index 0f77a862..cf0b4749 100644 --- a/EliteAPI/EliteAPI.csproj +++ b/EliteAPI/EliteAPI.csproj @@ -1,7 +1,7 @@  - 3.1.1.0 - 3.1.1.0 + 3.1.2.0 + 3.1.2.0 https://github.com/EliteAPI/EliteAPI https://github.com/EliteAPI/EliteAPI @@ -11,14 +11,14 @@ A powerful event based .NET API for Elite: Dangerous © Somfic 2022 false - 3.1.1 + 3.1.2 true icon.png true 10 true Somfic - 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 + 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace enable netstandard2.0 diff --git a/Examples/Example.Web/Example.Web.csproj b/Examples/Example.Web/Example.Web.csproj index a40c652d..7ecd077d 100644 --- a/Examples/Example.Web/Example.Web.csproj +++ b/Examples/Example.Web/Example.Web.csproj @@ -5,10 +5,10 @@ enable enable false - 3.1.1.0 - 3.1.1.0 - 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 - 3.1.1 + 3.1.2.0 + 3.1.2.0 + 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace + 3.1.2 diff --git a/Examples/Example/Example.csproj b/Examples/Example/Example.csproj index 2550b70b..9a5b212d 100644 --- a/Examples/Example/Example.csproj +++ b/Examples/Example/Example.csproj @@ -2,10 +2,10 @@ enable enable - 3.1.1.0 - 3.1.1.0 - 3.1.1+3.Branch.main.Sha.e90fb6df7f7e09c2407f1dde5f32d7cc8c8e9e63 - 3.1.1 + 3.1.2.0 + 3.1.2.0 + 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace + 3.1.2 false 10 Exe From 5f71cad1d19362e715916a0675bddfe75930735e Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 26 Oct 2023 16:02:14 +0200 Subject: [PATCH 11/14] "Starting EliteAPI" log is now on DEBUG level --- EliteAPI/EliteDangerousApi.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EliteAPI/EliteDangerousApi.cs b/EliteAPI/EliteDangerousApi.cs index 273dec86..dbf56a2e 100644 --- a/EliteAPI/EliteDangerousApi.cs +++ b/EliteAPI/EliteDangerousApi.cs @@ -121,7 +121,7 @@ public async Task StartAsync() try { - _log?.LogInformation("Starting EliteAPI v{Version}", typeof(EliteDangerousApi).Assembly.GetName().Version); + _log?.LogDebug("Starting EliteAPI v{Version}", typeof(EliteDangerousApi).Assembly.GetName().Version); _journalsDirectory = new DirectoryInfo(Config.JournalsPath); _optionsDirectory = new DirectoryInfo(Config.OptionsPath); From a725e56523824af0adea15d356b2cee8b0ca03f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 26 Oct 2023 14:04:29 +0000 Subject: [PATCH 12/14] Bumped version to 3.1.3 --- EliteAPI.Abstractions/EliteAPI.Abstractions.csproj | 8 ++++---- EliteAPI.Events/EliteAPI.Events.csproj | 8 ++++---- EliteAPI.Tests/EliteAPI.Tests.csproj | 8 ++++---- EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj | 8 ++++---- EliteAPI.Web/EliteAPI.Web.csproj | 8 ++++---- EliteAPI/EliteAPI.csproj | 8 ++++---- Examples/Example.Web/Example.Web.csproj | 8 ++++---- Examples/Example/Example.csproj | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj b/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj index d6de996d..750ef1a3 100644 --- a/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj +++ b/EliteAPI.Abstractions/EliteAPI.Abstractions.csproj @@ -5,10 +5,10 @@ 10 3.0.0.0 3.0.0.0 - 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace + 3.1.3+3.Branch.main.Sha.3f580569f82b353dc898f1e57a776f18dc2a597e 3.0.0-alpha5155 - 3.1.2.0 - 3.1.2.0 + 3.1.3.0 + 3.1.3.0 https://github.com/EliteAPI/EliteAPI https://github.com/EliteAPI/EliteAPI @@ -18,7 +18,7 @@ Abstractions for EliteAPI © Somfic 2022 false - 3.1.2 + 3.1.3 true icon.png true diff --git a/EliteAPI.Events/EliteAPI.Events.csproj b/EliteAPI.Events/EliteAPI.Events.csproj index 6b8f76b1..0b43b675 100644 --- a/EliteAPI.Events/EliteAPI.Events.csproj +++ b/EliteAPI.Events/EliteAPI.Events.csproj @@ -3,9 +3,9 @@ enable enable 10 - 3.1.2.0 - 3.1.2.0 - 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace + 3.1.3.0 + 3.1.3.0 + 3.1.3+3.Branch.main.Sha.3f580569f82b353dc898f1e57a776f18dc2a597e 3.0.0-alpha5167 true https://github.com/EliteAPI/EliteAPI @@ -17,7 +17,7 @@ Events for EliteAPI © Somfic 2022 false - 3.1.2 + 3.1.3 true icon.png netstandard2.0 diff --git a/EliteAPI.Tests/EliteAPI.Tests.csproj b/EliteAPI.Tests/EliteAPI.Tests.csproj index 98f21045..42579ddf 100644 --- a/EliteAPI.Tests/EliteAPI.Tests.csproj +++ b/EliteAPI.Tests/EliteAPI.Tests.csproj @@ -5,10 +5,10 @@ enable false true - 3.1.2.0 - 3.1.2.0 - 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace - 3.1.2 + 3.1.3.0 + 3.1.3.0 + 3.1.3+3.Branch.main.Sha.3f580569f82b353dc898f1e57a776f18dc2a597e + 3.1.3 diff --git a/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj b/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj index 8fe0b8c7..f47f346b 100644 --- a/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj +++ b/EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj @@ -4,10 +4,10 @@ enable enable default - 3.1.2.0 - 3.1.2.0 - 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace - 3.1.2 + 3.1.3.0 + 3.1.3.0 + 3.1.3+3.Branch.main.Sha.3f580569f82b353dc898f1e57a776f18dc2a597e + 3.1.3 diff --git a/EliteAPI.Web/EliteAPI.Web.csproj b/EliteAPI.Web/EliteAPI.Web.csproj index 9dade673..e74e27a5 100644 --- a/EliteAPI.Web/EliteAPI.Web.csproj +++ b/EliteAPI.Web/EliteAPI.Web.csproj @@ -4,10 +4,10 @@ enable default netstandard2.0 - 3.1.2.0 - 3.1.2.0 - 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace - 3.1.2 + 3.1.3.0 + 3.1.3.0 + 3.1.3+3.Branch.main.Sha.3f580569f82b353dc898f1e57a776f18dc2a597e + 3.1.3 diff --git a/EliteAPI/EliteAPI.csproj b/EliteAPI/EliteAPI.csproj index cf0b4749..c33b1f7d 100644 --- a/EliteAPI/EliteAPI.csproj +++ b/EliteAPI/EliteAPI.csproj @@ -1,7 +1,7 @@  - 3.1.2.0 - 3.1.2.0 + 3.1.3.0 + 3.1.3.0 https://github.com/EliteAPI/EliteAPI https://github.com/EliteAPI/EliteAPI @@ -11,14 +11,14 @@ A powerful event based .NET API for Elite: Dangerous © Somfic 2022 false - 3.1.2 + 3.1.3 true icon.png true 10 true Somfic - 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace + 3.1.3+3.Branch.main.Sha.3f580569f82b353dc898f1e57a776f18dc2a597e enable netstandard2.0 diff --git a/Examples/Example.Web/Example.Web.csproj b/Examples/Example.Web/Example.Web.csproj index 7ecd077d..f3c746e0 100644 --- a/Examples/Example.Web/Example.Web.csproj +++ b/Examples/Example.Web/Example.Web.csproj @@ -5,10 +5,10 @@ enable enable false - 3.1.2.0 - 3.1.2.0 - 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace - 3.1.2 + 3.1.3.0 + 3.1.3.0 + 3.1.3+3.Branch.main.Sha.3f580569f82b353dc898f1e57a776f18dc2a597e + 3.1.3 diff --git a/Examples/Example/Example.csproj b/Examples/Example/Example.csproj index 9a5b212d..6a0b8eff 100644 --- a/Examples/Example/Example.csproj +++ b/Examples/Example/Example.csproj @@ -2,10 +2,10 @@ enable enable - 3.1.2.0 - 3.1.2.0 - 3.1.2+4.Branch.main.Sha.444876e8116f20e7c00f7008fd9745ec2d17eace - 3.1.2 + 3.1.3.0 + 3.1.3.0 + 3.1.3+3.Branch.main.Sha.3f580569f82b353dc898f1e57a776f18dc2a597e + 3.1.3 false 10 Exe From 8b9dfd64214cad0c258bddcc046f83a830a048af Mon Sep 17 00:00:00 2001 From: Lucas Date: Wed, 20 Dec 2023 03:29:12 +0100 Subject: [PATCH 13/14] Create FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..189abff6 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +github: somfic From c80c5f6d5122f43f585906d596bff3b3aebd08a8 Mon Sep 17 00:00:00 2001 From: Lucas Date: Fri, 26 Jan 2024 23:41:37 +0100 Subject: [PATCH 14/14] Added `Thargoid` value to `LegalState` --- EliteAPI.Events/Status/Ship/LegalState.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EliteAPI.Events/Status/Ship/LegalState.cs b/EliteAPI.Events/Status/Ship/LegalState.cs index ebbfbae8..d30bd367 100644 --- 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 } \ No newline at end of file