取消模块加载与打包

huoyaoyuan · Dec 13, 2017 · e753166 · e753166
1 parent da4b0c7
commit e753166
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/AdmiralRoom/Composition/ModuleHost.cs b/AdmiralRoom/Composition/ModuleHost.cs
@@ -11,15 +11,7 @@ internal class ModuleHost
     {
         private ModuleHost()
         {
-            var a = new AssemblyCatalog(Assembly.GetExecutingAssembly());
-            ComposablePartCatalog catalog;
-            try
-            {
-                var d = new DirectoryCatalog("modules");
-                catalog = new AggregateCatalog(a, d);
-            }
-            catch { catalog = a; }
-            container = new CompositionContainer(catalog);
+            container = new CompositionContainer(new AssemblyCatalog(Assembly.GetExecutingAssembly()));
             container.ComposeParts(this);
         }
         public static ModuleHost Instance { get; } = new ModuleHost();

diff --git a/packaging/package.ps1 b/packaging/package.ps1
@@ -14,8 +14,6 @@ function Main
 
         $exeSource  = 'AdmiralRoom.exe'
 
-        $modules = 'Akashi', 'MasterDataViewer', 'Ranking', 'RawApiViewer'
-
         if (-not(Test-Path $bin))
         {
             throw 'Script detected as locate in invalid path exception!! Make sure exist in <AdmiralRoom repository root>\packaging\'
@@ -32,16 +30,6 @@ function Main
 
             Copy-StrictedFilterFileWithDirectoryStructure -Path $(Join-Path $bin $target) -Destination '.\' -Targets $targetKeywords -Exclude $ignoreKeywords #-ChildFolders $childFolders
 
-            $moduleDir = [System.IO.Path]::Combine('.\', $target, 'Modules')
-            New-Item $moduleDir -ItemType Directory
-
-            foreach ($module in $modules)
-            {
-                $moduleFile = $module+'.dll'
-                $modulePath = [System.IO.Path]::Combine('..\Modules\', $module, 'bin', $target, $moduleFile)
-                Copy-Item $modulePath -Destination $(Join-Path $moduleDir $moduleFile)
-            }
-
             # valid path check
             $versionSource = Join-Path $target $exeSource -Resolve