diff --git a/Benchmarks/Benchmarks.csproj b/Benchmarks/Benchmarks.csproj index dffb4173..ce51df85 100644 --- a/Benchmarks/Benchmarks.csproj +++ b/Benchmarks/Benchmarks.csproj @@ -1,10 +1,10 @@ - + + + Exe - net9.0 enable - enable diff --git a/Build.props b/Build.props new file mode 100644 index 00000000..d79f00ec --- /dev/null +++ b/Build.props @@ -0,0 +1,11 @@ + + + + 4.0.0 + net9.0 + latest + enable + Git + + + diff --git a/Libraries/SPTarkov.Common/SPTarkov.Common.csproj b/Libraries/SPTarkov.Common/SPTarkov.Common.csproj index d3a34661..2cfda8db 100644 --- a/Libraries/SPTarkov.Common/SPTarkov.Common.csproj +++ b/Libraries/SPTarkov.Common/SPTarkov.Common.csproj @@ -1,5 +1,7 @@ - + + + SPTarkov.Common Single Player Tarkov @@ -8,10 +10,7 @@ LICENSE https://sp-tarkov.com https://github.com/sp-tarkov/server-csharp - git - net9.0 enable - enable Library true @@ -21,7 +20,7 @@ - + diff --git a/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs b/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs index a861c9af..a07b0457 100644 --- a/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs +++ b/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs @@ -68,7 +68,14 @@ public static class DependencyInjectionRegistrator private static void RegisterGenericComponents(IServiceCollection builderServices, RegisterableType valueTuple) { - _allLoadedTypes ??= AppDomain.CurrentDomain.GetAssemblies().SelectMany(t => t.GetTypes()).ToList(); + try + { + _allLoadedTypes ??= AppDomain.CurrentDomain.GetAssemblies().SelectMany(t => t.GetTypes()).ToList(); + } + catch(ReflectionTypeLoadException ex) + { + Console.WriteLine($"COULD NOT LOAD TYPE: {ex}"); + } _allConstructors ??= _allLoadedTypes.SelectMany(t => t.GetConstructors()).ToList(); var typeName = $"{valueTuple.RegisterableInterface.Namespace}.{valueTuple.RegisterableInterface.Name}"; diff --git a/Libraries/SPTarkov.DI/SPTarkov.DI.csproj b/Libraries/SPTarkov.DI/SPTarkov.DI.csproj index 96ea6b26..6a39c7dd 100644 --- a/Libraries/SPTarkov.DI/SPTarkov.DI.csproj +++ b/Libraries/SPTarkov.DI/SPTarkov.DI.csproj @@ -1,4 +1,6 @@ - + + + SPTarkov.DI @@ -8,10 +10,7 @@ LICENSE https://sp-tarkov.com https://github.com/sp-tarkov/server-csharp - git - net9.0 enable - enable Library true diff --git a/Libraries/SPTarkov.Server.Assets/SPTarkov.Server.Assets.csproj b/Libraries/SPTarkov.Server.Assets/SPTarkov.Server.Assets.csproj index 25259803..a4f27bbb 100644 --- a/Libraries/SPTarkov.Server.Assets/SPTarkov.Server.Assets.csproj +++ b/Libraries/SPTarkov.Server.Assets/SPTarkov.Server.Assets.csproj @@ -1,4 +1,6 @@ - + + + SPTarkov.Server.Assets @@ -8,12 +10,9 @@ LICENSE https://sp-tarkov.com https://github.com/sp-tarkov/server-csharp - git - net9.0 enable enable Library - true content SptAssets diff --git a/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj b/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj index af747ddf..6bd98b24 100644 --- a/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj +++ b/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj @@ -1,4 +1,6 @@ - + + + SPTarkov.Server.Core @@ -8,10 +10,7 @@ LICENSE https://sp-tarkov.com https://github.com/sp-tarkov/server-csharp - git - net9.0 enable - enable Library true diff --git a/SPTarkov.Server/SPTarkov.Server.csproj b/SPTarkov.Server/SPTarkov.Server.csproj index d6cd1ce8..9dc128dd 100644 --- a/SPTarkov.Server/SPTarkov.Server.csproj +++ b/SPTarkov.Server/SPTarkov.Server.csproj @@ -1,5 +1,7 @@ + + SPTarkov.Server Single Player Tarkov @@ -8,14 +10,10 @@ LICENSE https://sp-tarkov.com https://github.com/sp-tarkov/server-csharp - git true false - net9.0 enable - enable Exe - 4.0.0 true diff --git a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.csproj b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.csproj index 19d8dc66..803e4cab 100644 --- a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.csproj +++ b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.csproj @@ -1,11 +1,11 @@ + + true false - net9.0 enable - enable Exe diff --git a/Tools/ItemTplGenerator/ItemTplGenerator.csproj b/Tools/ItemTplGenerator/ItemTplGenerator.csproj index eab26873..803e4cab 100644 --- a/Tools/ItemTplGenerator/ItemTplGenerator.csproj +++ b/Tools/ItemTplGenerator/ItemTplGenerator.csproj @@ -1,11 +1,11 @@ - + + + true false - net9.0 enable - enable Exe diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 0af96adb..019ba27f 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -1,9 +1,9 @@ + + - net9.0 enable - enable