refactor

chuongmep · Apr 20, 2024 · c74f329 · c74f329
1 parent f79affd
commit c74f329
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 33 deletions.
diff --git a/AddInManager.sln b/AddInManager.sln
@@ -122,30 +122,6 @@ Global
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Release R25|Any CPU.Build.0 = Release R25|Any CPU
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Debug R25|Any CPU.ActiveCfg = Release R25|Any CPU
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Debug R25|Any CPU.Build.0 = Release R25|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Debug R22|Any CPU.ActiveCfg = Debug R22|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Debug R22|Any CPU.Build.0 = Debug R22|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Debug R23|Any CPU.ActiveCfg = Debug R23|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Debug R23|Any CPU.Build.0 = Debug R23|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Debug R24|Any CPU.ActiveCfg = Debug R24|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Debug R24|Any CPU.Build.0 = Debug R24|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Debug R25|Any CPU.ActiveCfg = Debug R21|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Debug R25|Any CPU.Build.0 = Debug R21|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Installer|Any CPU.ActiveCfg = Debug R21|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Installer|Any CPU.Build.0 = Debug R21|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R19|Any CPU.ActiveCfg = Release R19|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R19|Any CPU.Build.0 = Release R19|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R20|Any CPU.ActiveCfg = Release R20|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R20|Any CPU.Build.0 = Release R20|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R21|Any CPU.ActiveCfg = Release R21|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R21|Any CPU.Build.0 = Release R21|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R22|Any CPU.ActiveCfg = Release R22|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R22|Any CPU.Build.0 = Release R22|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R23|Any CPU.ActiveCfg = Release R23|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R23|Any CPU.Build.0 = Release R23|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R24|Any CPU.ActiveCfg = Release R24|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R24|Any CPU.Build.0 = Release R24|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R25|Any CPU.ActiveCfg = Release R25|Any CPU
-		{DA609427-F086-4C79-A5FA-202DBB5DE48D}.Release R25|Any CPU.Build.0 = Release R25|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/AddInManager/Command/AddinManagerBase.cs b/AddInManager/Command/AddinManagerBase.cs
@@ -109,10 +109,6 @@ public Result RunActiveCommand(ExternalCommandData data, ref string message, Ele
                 _activeEc = externalCommand;
                 result = _activeEc.Execute(data, ref message, elements);
                 alc.Unload();
-                // foreach (AssemblyLoadContext subAlc in subAlcs)
-                // {
-                //     subAlc.Unload();
-                // }
             }
             int counter = 0;
             for (counter = 0; alcWeakRef.IsAlive && (counter < 10); counter++)

diff --git a/AddInManager/Model/AssemblyLoadContext.cs b/AddInManager/Model/AssemblyLoadContext.cs
@@ -26,10 +26,6 @@ protected override Assembly Load(AssemblyName assemblyName)
             {
                 return null;
             }
-            if(assemblyPath.Contains("RevitAPIUI"))
-            {
-                return null;
-            }
             var stream = new FileStream(assemblyPath, FileMode.Open, FileAccess.Read);
             return LoadFromStream(stream);
         }

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -7,7 +7,7 @@
     <IsPackable>false</IsPackable>
     <PlatformTarget>x64</PlatformTarget>
     <UseWpf>true</UseWpf>
-    <Configurations>Debug R21;Debug R22;Debug R23;Debug R24;</Configurations>
+    <Configurations>Debug R21;Debug R22;Debug R23;Debug R24;Debug R25;</Configurations>
     <Configurations>$(Configurations)Release R25;Release R19;Release R20;Release R21;Release R22;Release R23;Release R24</Configurations>
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.Contains('R19'))">