Update package references and improve error handling

- Enhanced error handling in `RetryHelper.cs` by adding a catch block for `DirectoryNotFoundException` and refining `IOException` handling.
- Updated `InstrumenterHelper.cs` to return a default value for specific `IOException` cases instead of throwing an `AggregateException`.
- Refactored `retryStrategy` in `RetryHelperTests.cs` to a static method for consistency across test methods.
- Changed exception types in `TargetActionThrows` and `TargetActionThrows5Times` methods to `IOException` for better alignment with the new error handling logic.

Author: Bertk

Directory.Packages.props

@@ -42,17 +42,19 @@
     <PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.7" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <!--To test issue 1104 https://github.com/coverlet-coverage/coverlet/issues/1104-->
-    <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
-    <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
-    <PackageVersion Include="System.Reflection.Metadata" Version="8.0.1" />
     <!-- latest Tmds.ExecFunction package uses EnvDTE V17.8.37221 -->
     <PackageVersion Include="Tmds.ExecFunction" Version="0.8.0" />
     <PackageVersion Include="xunit.v3" Version="1.0.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
+
     <PackageVersion Include="System.Buffers" Version="4.6.0" />
+    <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
+    <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     <PackageVersion Include="System.Memory" Version="4.6.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Reflection.Metadata" Version="8.0.1" />
+    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="6.0.5" />
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />

src/coverlet.core/Helpers/RetryHelper.cs

@@ -55,6 +55,10 @@ public T Do<T>(
           }
           return action();
         }
+        catch (DirectoryNotFoundException)
+        {
+          throw;
+        }
         catch (IOException ex)
         {
           exceptions.Add(ex);

test/coverlet.core.coverage.tests/Coverage/InstrumenterHelper.cs

@@ -226,6 +226,10 @@ public T Do<T>(Func<T> action, Func<TimeSpan> backoffStrategy, int maxAttemptCou
           }
           return action();
         }
+        catch (DirectoryNotFoundException)
+        {
+          throw;
+        }
         catch (IOException ex)
         {
           if (ex.ToString().Contains("RestoreOriginalModules") || ex.ToString().Contains("RestoreOriginalModule"))
@@ -240,7 +244,15 @@ public T Do<T>(Func<T> action, Func<TimeSpan> backoffStrategy, int maxAttemptCou
           }
         }
       }
-      throw new AggregateException(exceptions);
+      // Do not throw exception if we're restoring modules
+      if (exceptions.ToString().Contains("RestoreOriginalModules") || exceptions.ToString().Contains("RestoreOriginalModule"))
+      {
+        return default;
+      }
+      else
+      {
+        throw new AggregateException(exceptions);
+      }
     }
 
     public void Retry(Action action, Func<TimeSpan> backoffStrategy, int maxAttemptCount = 3)

test/coverlet.core.tests/Coverage/InstrumenterHelper.cs

@@ -215,7 +215,11 @@ public T Do<T>(Func<T> action, Func<TimeSpan> backoffStrategy, int maxAttemptCou
           }
           return action();
         }
-        catch (Exception ex)
+        catch (DirectoryNotFoundException)
+        {
+          throw;
+        }
+        catch (IOException ex)
         {
           if (ex.ToString().Contains("RestoreOriginalModules") || ex.ToString().Contains("RestoreOriginalModule"))
           {
@@ -229,7 +233,15 @@ public T Do<T>(Func<T> action, Func<TimeSpan> backoffStrategy, int maxAttemptCou
           }
         }
       }
-      throw new AggregateException(exceptions);
+      // Do not throw exception if we're restoring modules
+      if (exceptions.ToString().Contains("RestoreOriginalModules") || exceptions.ToString().Contains("RestoreOriginalModule"))
+      {
+        return default;
+      }
+      else
+      {
+        throw new AggregateException(exceptions);
+      }
     }
 
     public void Retry(Action action, Func<TimeSpan> backoffStrategy, int maxAttemptCount = 3)

test/coverlet.core.tests/Helpers/RetryHelperTests.cs

@@ -13,10 +13,10 @@ public class RetryHelperTests
     [Fact]
     public void TestRetryWithFixedRetryBackoff()
     {
-      Func<TimeSpan> retryStrategy = () =>
+      static TimeSpan retryStrategy()
       {
         return TimeSpan.FromMilliseconds(1);
-      };
+      }
 
       var target = new RetryTarget();
       try
@@ -33,12 +33,12 @@ public void TestRetryWithFixedRetryBackoff()
     public void TestRetryWithExponentialRetryBackoff()
     {
       int currentSleep = 6;
-      Func<TimeSpan> retryStrategy = () =>
+      TimeSpan retryStrategy()
       {
         var sleep = TimeSpan.FromMilliseconds(currentSleep);
         currentSleep *= 2;
         return sleep;
-      };
+      }
 
       var target = new RetryTarget();
       try
@@ -55,10 +55,10 @@ public void TestRetryWithExponentialRetryBackoff()
     [Fact]
     public void TestRetryFinishesIfSuccessful()
     {
-      Func<TimeSpan> retryStrategy = () =>
+      static TimeSpan retryStrategy()
       {
         return TimeSpan.FromMilliseconds(1);
-      };
+      }
 
       var target = new RetryTarget();
       new RetryHelper().Retry(() => target.TargetActionThrows5Times(), retryStrategy, 20);
@@ -72,12 +72,12 @@ public class RetryTarget
     public void TargetActionThrows()
     {
       Calls++;
-      throw new Exception("Simulating Failure");
+      throw new IOException("Simulating Failure");
     }
     public void TargetActionThrows5Times()
     {
       Calls++;
-      if (Calls < 6) throw new Exception("Simulating Failure");
+      if (Calls < 6) throw new IOException("Simulating Failure");
     }
   }