fix previous code smells

STARIONGROUP · Dec 5, 2024 · e566941 · e566941
1 parent a5a8f17
commit e566941
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/EA-ModelKit/App.cs b/EA-ModelKit/App.cs
@@ -87,7 +87,8 @@ public App()
             Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
             Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
             AppDomain.CurrentDomain.AssemblyResolve += CurrentDomainOnAssemblyResolve;
-            Directory.SetCurrentDirectory(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!);
+
+            Directory.SetCurrentDirectory(Path.GetDirectoryName(typeof(App).Assembly.Location)!);
 
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel
@@ -122,9 +123,8 @@ public App()
         /// Builds the <see cref="Container" />
         /// </summary>
         /// <param name="containerBuilder">An optional <see cref="Container" /></param>
-        public static void BuildContainer(ContainerBuilder containerBuilder = null)
+        public static void BuildContainer(ContainerBuilder containerBuilder)
         {
-            containerBuilder ??= new ContainerBuilder();
             Container = containerBuilder.Build();
         }
 
@@ -171,24 +171,16 @@ public string EA_GetRibbonCategory(Repository _)
         /// <returns>The definition of the menu option</returns>
         public object EA_GetMenuItems(Repository repository, string location, string menuName)
         {
-            switch (location)
+            return location switch
             {
-                case "MainMenu":
-                    switch (menuName)
-                    {
-                        case "":
-                            return MenuHeaderName;
-                        case MenuHeaderName:
-                            return new[]
-                            {
-                                GenericExportEntry
-                            };
-                    }
-
-                    break;
-            }
-
-            return null;
+                "MainMenu" => menuName switch
+                {
+                    "" => MenuHeaderName,
+                    MenuHeaderName => new[] { GenericExportEntry },
+                    _ => null
+                },
+                _ => null
+            };
         }
 
         /// <summary>
@@ -425,7 +417,7 @@ private void ResolveRequiredServices()
         /// <returns>The assembly</returns>
         private static Assembly CurrentDomainOnAssemblyResolve(object sender, ResolveEventArgs args)
         {
-            var folderPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            var folderPath = Path.GetDirectoryName(typeof(App).Assembly.Location);
 
             if (string.IsNullOrEmpty(folderPath))
             {

diff --git a/EA-ModelKit/Services/Version/VersionService.cs b/EA-ModelKit/Services/Version/VersionService.cs
@@ -33,7 +33,7 @@ internal class VersionService : IVersionService
         /// </summary>
         public VersionService()
         {
-            this.Version = Assembly.GetExecutingAssembly().GetName().Version;
+            this.Version = typeof(VersionService).Assembly.GetName().Version;
         }
 
         /// <summary>