Skip to content

Commit 59f119d

Browse files
SomficSomfic
committed
Merge branch 'main' of https://github.com/Somfic/EliteAPI 
2 parents d4b8fdb + 2a08b2f commit 59f119d

File tree

12 files changed

+47
-46
lines changed

12 files changed

+47
-46
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ jobs:
8181
with:
8282
tag_name: ${{ env.GitVersion_LegacySemVer }}
8383
name: v${{ env.GitVersion_LegacySemVer }}
84+
draft: false
8485
prerelease: ${{ env.GitVersion_PreReleaseLabel == 'alpha' || env.GitVersion_PreReleaseLabel == 'beta' }}
8586

8687
- name: Publish project to NuGet

‎EliteAPI.Abstractions/EliteAPI.Abstractions.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<LangVersion>10</LangVersion>
66
<AssemblyVersion>3.0.0.0</AssemblyVersion>
77
<FileVersion>3.0.0.0</FileVersion>
8-
<InformationalVersion>3.2.3+3.Branch.main.Sha.e13e8e777754dfd28c68d586f2a5f56c42db97b0</InformationalVersion>
8+
<InformationalVersion>3.2.7+3.Branch.main.Sha.0fa1ed3460dac72a033b0e89402fe90633fc27c9</InformationalVersion>
99
<Version>3.0.0-alpha5155</Version>
10-
<AssemblyVersion>3.2.3.0</AssemblyVersion>
11-
<FileVersion>3.2.3.0</FileVersion>
10+
<AssemblyVersion>3.2.7.0</AssemblyVersion>
11+
<FileVersion>3.2.7.0</FileVersion>
1212
<PackageProjectUrl>https://github.com/EliteAPI/EliteAPI</PackageProjectUrl>
1313
<RepositoryUrl>https://github.com/EliteAPI/EliteAPI</RepositoryUrl>
1414
<PackageIconUrl />
@@ -18,7 +18,7 @@
1818
<Description>Abstractions for EliteAPI</Description>
1919
<Copyright>© Somfic 2018-2024</Copyright>
2020
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
21-
<Version>3.2.3</Version>
21+
<Version>3.2.7</Version>
2222
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
2323
<PackageIcon>icon.png</PackageIcon>
2424
<IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>

‎EliteAPI.Events.Generator/EliteAPI.Events.Generator.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<AssemblyVersion>3.2.3.0</AssemblyVersion>
8-
<FileVersion>3.2.3.0</FileVersion>
9-
<InformationalVersion>3.2.3+3.Branch.main.Sha.e13e8e777754dfd28c68d586f2a5f56c42db97b0</InformationalVersion>
10-
<Version>3.2.3</Version>
7+
<AssemblyVersion>3.2.7.0</AssemblyVersion>
8+
<FileVersion>3.2.7.0</FileVersion>
9+
<InformationalVersion>3.2.7+3.Branch.main.Sha.0fa1ed3460dac72a033b0e89402fe90633fc27c9</InformationalVersion>
10+
<Version>3.2.7</Version>
1111
</PropertyGroup>
1212
<ItemGroup>
1313
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

‎EliteAPI.Events/EliteAPI.Events.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ImplicitUsings>enable</ImplicitUsings>
44
<Nullable>enable</Nullable>
55
<LangVersion>10</LangVersion>
6-
<AssemblyVersion>3.2.3.0</AssemblyVersion>
7-
<FileVersion>3.2.3.0</FileVersion>
8-
<InformationalVersion>3.2.3+3.Branch.main.Sha.e13e8e777754dfd28c68d586f2a5f56c42db97b0</InformationalVersion>
6+
<AssemblyVersion>3.2.7.0</AssemblyVersion>
7+
<FileVersion>3.2.7.0</FileVersion>
8+
<InformationalVersion>3.2.7+3.Branch.main.Sha.0fa1ed3460dac72a033b0e89402fe90633fc27c9</InformationalVersion>
99
<Version>3.0.0-alpha5167</Version>
1010
<IsPackable>true</IsPackable>
1111
<PackageProjectUrl>https://github.com/EliteAPI/EliteAPI</PackageProjectUrl>
@@ -17,7 +17,7 @@
1717
<Description>Events for EliteAPI</Description>
1818
<Copyright>© Somfic 2018-2024</Copyright>
1919
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
20-
<Version>3.2.3</Version>
20+
<Version>3.2.7</Version>
2121
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
2222
<PackageIcon>icon.png</PackageIcon>
2323
<TargetFramework>netstandard2.0</TargetFramework>

‎EliteAPI.Status/EliteAPI.Status.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ImplicitUsings>enable</ImplicitUsings>
44
<Nullable>enable</Nullable>
55
<LangVersion>10</LangVersion>
6-
<AssemblyVersion>3.2.3.0</AssemblyVersion>
7-
<FileVersion>3.2.3.0</FileVersion>
8-
<InformationalVersion>3.2.3+3.Branch.main.Sha.e13e8e777754dfd28c68d586f2a5f56c42db97b0</InformationalVersion>
6+
<AssemblyVersion>3.2.7.0</AssemblyVersion>
7+
<FileVersion>3.2.7.0</FileVersion>
8+
<InformationalVersion>3.2.7+3.Branch.main.Sha.0fa1ed3460dac72a033b0e89402fe90633fc27c9</InformationalVersion>
99
<Version>3.0.0-alpha5167</Version>
1010
<IsPackable>true</IsPackable>
1111
<PackageProjectUrl>https://github.com/EliteAPI/EliteAPI</PackageProjectUrl>
@@ -17,7 +17,7 @@
1717
<Description>Status for EliteAPI</Description>
1818
<Copyright>© Somfic 2018-2024</Copyright>
1919
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
20-
<Version>3.2.3</Version>
20+
<Version>3.2.7</Version>
2121
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
2222
<PackageIcon>icon.png</PackageIcon>
2323
<TargetFramework>netstandard2.0</TargetFramework>

‎EliteAPI.Tests/EliteAPI.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
<Nullable>enable</Nullable>
66
<IsPackable>false</IsPackable>
77
<IsTestProject>true</IsTestProject>
8-
<AssemblyVersion>3.2.3.0</AssemblyVersion>
9-
<FileVersion>3.2.3.0</FileVersion>
10-
<InformationalVersion>3.2.3+3.Branch.main.Sha.e13e8e777754dfd28c68d586f2a5f56c42db97b0</InformationalVersion>
11-
<Version>3.2.3</Version>
8+
<AssemblyVersion>3.2.7.0</AssemblyVersion>
9+
<FileVersion>3.2.7.0</FileVersion>
10+
<InformationalVersion>3.2.7+3.Branch.main.Sha.0fa1ed3460dac72a033b0e89402fe90633fc27c9</InformationalVersion>
11+
<Version>3.2.7</Version>
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<PackageReference Include="itext7" Version="8.0.3" />
1515
<PackageReference Include="Moq" Version="4.20.70" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1717
<PackageReference Include="NUnit" Version="4.1.0" />
1818
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
19-
<PackageReference Include="NUnit.Analyzers" Version="4.0.1" />
20-
<PackageReference Include="coverlet.collector" Version="6.0.1">
19+
<PackageReference Include="NUnit.Analyzers" Version="4.1.0" />
20+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>

‎EliteAPI.Web.Spansh/EliteAPI.Web.Spansh.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<LangVersion>default</LangVersion>
7-
<AssemblyVersion>3.2.3.0</AssemblyVersion>
8-
<FileVersion>3.2.3.0</FileVersion>
9-
<InformationalVersion>3.2.3+3.Branch.main.Sha.e13e8e777754dfd28c68d586f2a5f56c42db97b0</InformationalVersion>
10-
<Version>3.2.3</Version>
7+
<AssemblyVersion>3.2.7.0</AssemblyVersion>
8+
<FileVersion>3.2.7.0</FileVersion>
9+
<InformationalVersion>3.2.7+3.Branch.main.Sha.0fa1ed3460dac72a033b0e89402fe90633fc27c9</InformationalVersion>
10+
<Version>3.2.7</Version>
1111
<Copyright>© Somfic 2018-2024</Copyright>
1212
</PropertyGroup>
1313
<ItemGroup>

‎EliteAPI.Web/EliteAPI.Web.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<Nullable>enable</Nullable>
55
<LangVersion>default</LangVersion>
66
<TargetFramework>netstandard2.0</TargetFramework>
7-
<AssemblyVersion>3.2.3.0</AssemblyVersion>
8-
<FileVersion>3.2.3.0</FileVersion>
9-
<InformationalVersion>3.2.3+3.Branch.main.Sha.e13e8e777754dfd28c68d586f2a5f56c42db97b0</InformationalVersion>
10-
<Version>3.2.3</Version>
7+
<AssemblyVersion>3.2.7.0</AssemblyVersion>
8+
<FileVersion>3.2.7.0</FileVersion>
9+
<InformationalVersion>3.2.7+3.Branch.main.Sha.0fa1ed3460dac72a033b0e89402fe90633fc27c9</InformationalVersion>
10+
<Version>3.2.7</Version>
1111
<Copyright>© Somfic 2018-2024</Copyright>
1212
</PropertyGroup>
1313
<ItemGroup>
@@ -17,6 +17,6 @@
1717
</PackageReference>
1818
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
1919
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
20-
<PackageReference Include="Somfic.Common" Version="0.2.4" />
20+
<PackageReference Include="Somfic.Common" Version="0.2.7" />
2121
</ItemGroup>
2222
</Project>

‎EliteAPI/EliteAPI.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<AssemblyVersion>3.2.3.0</AssemblyVersion>
4-
<FileVersion>3.2.3.0</FileVersion>
3+
<AssemblyVersion>3.2.7.0</AssemblyVersion>
4+
<FileVersion>3.2.7.0</FileVersion>
55
<PackageProjectUrl>https://github.com/EliteAPI/EliteAPI</PackageProjectUrl>
66
<RepositoryUrl>https://github.com/EliteAPI/EliteAPI</RepositoryUrl>
77
<PackageIconUrl />
@@ -11,14 +11,14 @@
1111
<Description>A powerful event based .NET API for Elite: Dangerous</Description>
1212
<Copyright>© Somfic 2018-2024</Copyright>
1313
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
14-
<Version>3.2.3</Version>
14+
<Version>3.2.7</Version>
1515
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1616
<PackageIcon>icon.png</PackageIcon>
1717
<IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
1818
<LangVersion>10</LangVersion>
1919
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2020
<Authors>Somfic</Authors>
21-
<InformationalVersion>3.2.3+3.Branch.main.Sha.e13e8e777754dfd28c68d586f2a5f56c42db97b0</InformationalVersion>
21+
<InformationalVersion>3.2.7+3.Branch.main.Sha.0fa1ed3460dac72a033b0e89402fe90633fc27c9</InformationalVersion>
2222
<Nullable>enable</Nullable>
2323
<TargetFramework>netstandard2.0</TargetFramework>
2424
<Title>EliteAPI</Title>

‎EliteAPI/Events/Events.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public IEvent Invoke<TEvent>(TEvent @event, EventContext context) where TEvent :
212212
{
213213
if (string.IsNullOrEmpty(json))
214214
throw new ArgumentNullException(nameof(json));
215-
215+
216216
var jObject = JObject.Parse(json);
217217
var eventKey = jObject["event"];
218218

@@ -286,8 +286,8 @@ public IEvent Invoke<TEvent>(TEvent @event, EventContext context) where TEvent :
286286
{
287287
ex.Data.Add("JSON", json);
288288
ex.Data.Add("File", context.SourceFile);
289-
_log?.LogWarning(ex, "Could not invoke event from JSON");
290-
throw;
289+
_log?.LogDebug(ex, "Could not invoke event from JSON");
290+
return null;
291291
}
292292
}
293293

0 commit comments

Comments
 (0)