hotfix r25 unload assemby

chuongmep · Jun 29, 2024 · 950bc6f · 950bc6f
1 parent 10b8aae
commit 950bc6f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/AddInManager/Command/AddinManagerBase.cs b/AddInManager/Command/AddinManagerBase.cs
@@ -98,9 +98,10 @@ public Result RunActiveCommand(ExternalCommandData data, ref string message, Ele
         }
         Result result = Result.Failed;
         var alc = new AssemblyLoadContext(filePath);
+        Stream stream = null;
         try
         {
-            var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read);
+            stream = new FileStream(filePath, FileMode.Open, FileAccess.Read);
             Assembly assembly = alc.LoadFromStream(stream);
             object instance = assembly.CreateInstance(_activeCmdItem.FullClassName);
             WeakReference alcWeakRef = new WeakReference(alc, trackResurrection: true);
@@ -121,13 +122,25 @@ public Result RunActiveCommand(ExternalCommandData data, ref string message, Ele
         }
         catch (Exception ex)
         {
+            // unload the assembly
             MessageBox.Show(ex.ToString());
+            alc?.Unload();
             result = Result.Failed;
+            WeakReference alcWeakRef = new WeakReference(alc, trackResurrection: true);
+            for (int counter = 0; alcWeakRef.IsAlive && (counter < 10); counter++)
+            {
+                alc = null;
+                GC.Collect();
+                GC.WaitForPendingFinalizers();
+            }
+            stream?.Close();
+            Debug.WriteLine("Assembly unloaded");
+
         }
-        finally
-        {
-            alc = null;
-        }
+        // finally
+        // {
+        //     alc?.Unload();
+        // }
         return result;
     }
 #endif

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -36,6 +36,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.Contains('R25'))">
     <RevitVersion>2025</RevitVersion>
+    <DebugType>Full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
     <TargetFramework>net8.0-windows</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <DefineConstants>$(DefineConstants);R25</DefineConstants>

diff --git a/Test/TestEvaCommand.cs b/Test/TestEvaCommand.cs
@@ -13,9 +13,9 @@ public class TestEvaCommand  : IExternalCommand
     public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
     {
         MessageBox.Show("TestEvaCommand");
-        // string? value = DependLib.ShowDialogFolder();
-        // Console.WriteLine(value);
-        // MessageBox.Show(value.ToString());
+        string? value = DependLib.ShowDialogFolder();
+        Console.WriteLine(value);
+        MessageBox.Show(value.ToString());
         return Result.Succeeded;
     }
 }