finally

Author: potatoqualitee

private/assembly-loader.ps1

@@ -63,13 +63,24 @@ function Initialize-DbatoolsAssemblyLoader {
         # Get platform information
         $platformDetails = Get-PlatformDetails
 
-        # Initialize the redirector for non-Core PowerShell
+        # Reset resolver states
+        $script:isResolving = $false
+        $script:resolverInitialized = $false
+
+        # Initialize resolvers for non-Core PowerShell
         if ($PSVersionTable.PSEdition -ne 'Core') {
             try {
+                # Initialize redirector first
                 Initialize-DbatoolsAssemblyRedirector
+
+                # Then initialize resolution handler if redirector succeeded
+                if ($script:dbatoolsRedirector) {
+                    [System.AppDomain]::CurrentDomain.add_AssemblyResolve($script:onAssemblyResolveEventHandler)
+                    $script:resolverInitialized = $true
+                }
             }
             catch {
-                Write-Warning "Failed to initialize assembly redirector: $($_.Exception.Message)"
+                Write-Warning "Failed to initialize assembly handlers: $($_.Exception.Message)"
                 Write-Warning "This may cause issues with assembly loading in Windows PowerShell"
             }
         }
@@ -254,15 +265,24 @@ function Reset-DbatoolsAssemblyLoader {
 
     # Remove assembly resolve handlers in non-Core PowerShell
     if ($PSVersionTable.PSEdition -ne 'Core') {
-        # Remove standard handler
-        if ($script:onAssemblyResolveEventHandler) {
-            [System.AppDomain]::CurrentDomain.remove_AssemblyResolve($script:onAssemblyResolveEventHandler)
-        }
+        try {
+            # Remove standard handler
+            if ($script:onAssemblyResolveEventHandler -and $script:resolverInitialized) {
+                [System.AppDomain]::CurrentDomain.remove_AssemblyResolve($script:onAssemblyResolveEventHandler)
+                $script:resolverInitialized = $false
+            }
+
+            # Remove redirector handler if it exists
+            if ($script:dbatoolsRedirector) {
+                [System.AppDomain]::CurrentDomain.remove_AssemblyResolve($script:dbatoolsRedirector.EventHandler)
+                $script:dbatoolsRedirector = $null
+            }
 
-        # Remove redirector handler if it exists
-        if ($script:dbatoolsRedirector) {
-            [System.AppDomain]::CurrentDomain.remove_AssemblyResolve($script:dbatoolsRedirector.EventHandler)
-            $script:dbatoolsRedirector = $null
+            # Reset resolver state
+            $script:isResolving = $false
+        }
+        catch {
+            Write-Warning "Error removing assembly handlers: $_"
         }
     }
 

private/assembly-redirector.ps1

@@ -8,7 +8,8 @@ function Initialize-DbatoolsAssemblyRedirector {
     $dir = [System.IO.Path]::Combine($script:libraryroot, "lib")
     $dir = ("$dir\").Replace('\', '\\')
 
-    if (-not ("Redirector" -as [type])) {
+    # Only create type if not already defined
+    if (-not ("Redirector" -as [type]) -and $PSVersionTable.PSEdition -ne 'Core') {
             $source = @"
 using System;
 using System.Linq;
@@ -56,9 +57,25 @@ public class Redirector
 
     public readonly ResolveEventHandler EventHandler;
 
+    private static bool isResolving = false;
+
     protected Assembly AssemblyResolve(object sender, ResolveEventArgs e)
     {
+        // Guard against empty assembly names
+        if (e == null || string.IsNullOrEmpty(e.Name))
+        {
+            return null;
+        }
 
+        // Prevent recursive resolution
+        if (isResolving)
+        {
+            return null;
+        }
+
+        isResolving = true;
+        try
+        {
         // Only track essential system dependencies
         string[] systemDlls = {
             "System.Memory",
@@ -164,7 +181,12 @@ public class Redirector
                 }
             }
         }
-        return null;
+            return null;
+        }
+        finally
+        {
+            isResolving = false;
+        }
     }
 }
 "@
@@ -179,16 +201,18 @@ public class Redirector
             }
     }
 
-    try {
-        $redirector = New-Object Redirector
-        [System.AppDomain]::CurrentDomain.add_AssemblyResolve($redirector.EventHandler)
-
-        # Store the redirector instance in script scope for cleanup
-        $script:dbatoolsRedirector = $redirector
-    }
-    catch {
-        Write-Warning "Failed to initialize assembly redirector: $_"
-        throw
+    # Only initialize redirector for non-Core PowerShell if not already initialized
+    if ($PSVersionTable.PSEdition -ne 'Core' -and -not $script:dbatoolsRedirector) {
+        try {
+            $redirector = New-Object Redirector
+            [System.AppDomain]::CurrentDomain.add_AssemblyResolve($redirector.EventHandler)
+            # Store the redirector instance in script scope for cleanup
+            $script:dbatoolsRedirector = $redirector
+        }
+        catch {
+            Write-Warning "Failed to initialize assembly redirector: $_"
+            throw
+        }
     }
 }
 

private/assembly-resolution.ps1

@@ -151,15 +151,24 @@ function Get-DbatoolsAssemblyPath {
 }
 
 # Assembly resolution event handler
+# Track resolution state to prevent recursion
+$script:isResolving = $false
+
 $script:onAssemblyResolveEventHandler = [System.ResolveEventHandler] {
     param($sender, $args)
 
-    try {
-        if (-not $args -or [string]::IsNullOrEmpty($args.Name)) {
-            Write-Warning "Empty assembly name provided to resolver"
-            return $null
-        }
+    # Guard against empty assembly names early
+    if (-not $args -or [string]::IsNullOrEmpty($args.Name)) {
+        return $null
+    }
 
+    # Prevent recursive resolution
+    if ($script:isResolving) {
+        return $null
+    }
+
+    $script:isResolving = $true
+    try {
         # Parse assembly name
         $assemblyName = [System.Reflection.AssemblyName]::new($args.Name)
         if ([string]::IsNullOrEmpty($assemblyName.Name)) {
@@ -196,11 +205,15 @@ $script:onAssemblyResolveEventHandler = [System.ResolveEventHandler] {
         Write-Warning "Error resolving assembly $($args.Name): $_"
         return $null
     }
+    finally {
+        $script:isResolving = $false
+    }
 }
 
-# Initialize assembly resolution for non-Core PowerShell
-if ($PSVersionTable.PSEdition -ne 'Core') {
+# Initialize assembly resolution for non-Core PowerShell if not already initialized
+if ($PSVersionTable.PSEdition -ne 'Core' -and -not $script:resolverInitialized) {
     [System.AppDomain]::CurrentDomain.add_AssemblyResolve($script:onAssemblyResolveEventHandler)
+    $script:resolverInitialized = $true
 }
 
 Export-ModuleMember -Function Get-DbatoolsPlatformInfo, Get-DbatoolsAssemblyPath