added generalmodule

fixed vulnerability (newtonsoft.json)
kougen · Oct 9, 2023 · 29c594c · 29c594c
1 parent 243a8e0
commit 29c594c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/Nuget/Projects/Modules.nuspec b/Nuget/Projects/Modules.nuspec
@@ -8,6 +8,7 @@
 		<dependencies>
 			<group targetFramework="net6.0">
 				<dependency id="Microsoft.Extensions.DependencyInjection" version="7.0.0" />
+				<dependency id="Newtonsoft.Json" version="13.0.3" />
 			</group>
 		</dependencies>
 	</metadata>

diff --git a/_src/Implementation/Implementation.csproj b/_src/Implementation/Implementation.csproj
@@ -34,7 +34,7 @@
 
 
     <ItemGroup>
-      <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 
 
 

diff --git a/_src/Implementation/Module/CoreModule.cs b/_src/Implementation/Module/CoreModule.cs
@@ -11,20 +11,20 @@
 using Infrastructure.IO;
 using Infrastructure.IO.Factories;
 using Infrastructure.Logger;
+using Infrastructure.Module;
 using Infrastructure.Navigator.Factories;
 using Infrastructure.Repositories.Factories;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Implementation.Module
 {
-    public class CoreModule
+    public class CoreModule : IGeneralModule
     {
-        public static void LoadModules(IServiceCollection collection, string projectName)
+        public void LoadModules(IServiceCollection collection, string projectNamespace)
         {
-            var mainFolder = Path.Join("joshika39", projectName);
+            var mainFolder = Path.Join("joshika39", projectNamespace);
             var userFolder = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), mainFolder);
             collection.AddScoped<ILogger, Logger.Logger>(_ => new Logger.Logger(Guid.NewGuid()));
-
             collection.AddTransient<IIOFactory, IOFactory>();
             collection.AddTransient<INavigatorFactory, NavigatorFactory>();
             collection.AddTransient<INavigatorElementFactory, NavigatorElementFactory>();

diff --git a/_src/Infrastructure/Module/IGeneralModule.cs b/_src/Infrastructure/Module/IGeneralModule.cs
@@ -0,0 +1,9 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Infrastructure.Module
+{
+    public interface IGeneralModule
+    {
+        void LoadModules(IServiceCollection collection, string projectNamespace);
+    }
+}
diff --git a/_src/_Tests/ManualTests/Core.cs b/_src/_Tests/ManualTests/Core.cs
@@ -9,7 +9,7 @@ internal class Core
         public IServiceProvider LoadModules()
         {
             var collection = new ServiceCollection();
-            CoreModule.LoadModules(collection, "ManualTests");
+            new CoreModule().LoadModules(collection, "ManualTests");
             return collection.BuildServiceProvider();
         }
     }