Merge branch 'master' of https://github.com/tadoEng/EtabSharp

Author: tadoEng

src/EtabSharp/Core/ETABSApplication.cs

@@ -4,6 +4,8 @@
 using ETABSv1;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using System.Runtime.InteropServices;
+
 
 namespace EtabSharp.Core;
 
@@ -157,18 +159,19 @@ public void ExecuteSafely(Action apiCall, string? functionName = null)
     /// If true, ETABS prompts to save unsaved changes.
     /// If false (default), exits immediately — correct for Mode B hidden instances.
     /// </param>
+    // Close() remains explicit — user calls this when they want ETABS to exit
     public void Close(bool savePrompt = false)
     {
         if (_disposed) return;
 
         try
         {
             _application.Value.ApplicationExit(savePrompt);
-            _logger.LogInformation("ETABS application closed");
+            _logger.LogInformation("ETABS application exited");
         }
         catch (Exception ex)
         {
-            _logger.LogWarning(ex, "Error during Close: {Message}", ex.Message);
+            _logger.LogWarning(ex, "Error during ApplicationExit: {Message}", ex.Message);
         }
     }
 
@@ -179,10 +182,36 @@ public void Close(bool savePrompt = false)
     /// </summary>
     public void Dispose()
     {
-        if (!_disposed)
+        if (_disposed) return;
+        _disposed = true;
+
+        // Only attempt COM cleanup on Windows platforms where Marshal.ReleaseComObject is supported.
+        // This prevents CA1416 diagnostics and avoids calling Windows-only runtime APIs on other platforms.
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            try
+            {
+                // Release child managers first (reverse init order)
+                if (_model.IsValueCreated)
+                    Marshal.ReleaseComObject(_model.Value);
+
+                if (_application.IsValueCreated)
+                    Marshal.ReleaseComObject(_application.Value);
+
+                // Release raw COM refs last (parents after children)
+                Marshal.ReleaseComObject(_sapModel);
+                Marshal.ReleaseComObject(_api);
+
+                _logger.LogInformation("COM references released");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning(ex, "Error releasing COM objects: {Message}", ex.Message);
+            }
+        }
+        else
         {
-            Close(false);
-            _disposed = true;
+            _logger.LogInformation("Skipping COM cleanup: not running on Windows platform");
         }
 
         GC.SuppressFinalize(this);

src/EtabSharp/EtabSharp.csproj

@@ -8,7 +8,7 @@
 		<!-- Package Identity -->
 		<Title>EtabSharp</Title>
 		<PackageId>EtabSharp</PackageId>
-		<Version>0.3.0-beta</Version>
+		<Version>0.3.1-beta</Version>
 		<Copyright>Copyright © Thanh Tu 2026</Copyright>
 		<Authors>Thanh Tu</Authors>
 
@@ -29,11 +29,8 @@
 
 		<!-- Package Release Notes -->
 		<PackageReleaseNotes>
-			v0.3.0-beta
-			* New IApplication interface wrapping the ETABS cOAPI object, with a concrete ETABSApplicationManager implementation to manage starting, hiding, and cleanly exiting ETABS.
-			* Safer application access via ETABSApplication.Application : IApplication; raw COM (cOAPI) and GetRawAPI()/GetRawModel() are now internal, and Close() routes through Application.ApplicationExit() for more robust shutdown.
-			* PID-aware instance attachment in ETABSWrapper: connections now target a specific ETABS process when possible, and a new ConnectToProcess(int pid) API lets callers attach to an exact running instance.
-
+			v0.3.1-beta
+			* Update dispose behavior correctly dispose of COM objects and release ETABS reference
 		</PackageReleaseNotes>
 
 		<!-- CI/CD Settings -->

test/EtabSharp.Test/SkipHelper.cs

@@ -0,0 +1,38 @@
+// Plan (pseudocode):
+// 1. Provide a small helper `Skip` class in the same test namespace so existing calls like
+//    `Skip.If(condition, "reason")` compile.
+// 2. Implement `If(bool condition, string reason)` to throw xUnit's skip exception when
+//    condition is true. This causes xUnit to mark the test as skipped instead of failed.
+// 3. Keep the helper internal and minimal to avoid changing other code.
+// 4. Put detailed plan as comments here and then the implementation below.
+//
+// Detailed pseudocode:
+// - namespace: EtabSharp.Test (matches tests' namespace)
+// - using: Xunit (for SkipException)
+// - define internal static class Skip
+//   - public static void If(bool condition, string reason)
+//     - if condition is true:
+//         - throw new SkipException(reason)
+//     - else: return (no-op)
+// - This file will allow existing tests that call `Skip.If(...)` to compile and run,
+//   and tests will be reported as skipped when the condition is true.
+
+using Xunit;
+
+namespace EtabSharp.Test
+{
+    /// <summary>
+    /// Minimal helper to support calls like `Skip.If(condition, "reason")` in tests.
+    /// Calls Assert.Skip() so the runner reports the test as Skipped.
+    /// </summary>
+    internal static class Skip
+    {
+        public static void If(bool condition, string reason)
+        {
+            if (condition)
+            {
+                Assert.Skip(reason);
+            }
+        }
+    }
+}