diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index b83e7aa4df..bf0c338efc 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -99,7 +99,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting _logger.LogInformation($"Tried to start site, state: {state.ToString()}"); } } - catch (COMException comException) + catch (Exception ex) when (ex is DllNotFoundException || (ex is COMException && (uint)ex.HResult == 0x800710D8) ) { // Accessing the site.State property while the site // is starting up returns the COMException @@ -107,7 +107,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting // (Exception from HRESULT: 0x800710D8) // This also means the site is not started yet, so catch and retry // after waiting. - _logger.LogWarning($"ComException: {comException.Message}"); } await Task.Delay(_retryDelay); diff --git a/test/Common.FunctionalTests/AppHostConfig/IIS.config b/test/Common.FunctionalTests/AppHostConfig/IIS.config index c8c4848e25..624edf91ca 100644 --- a/test/Common.FunctionalTests/AppHostConfig/IIS.config +++ b/test/Common.FunctionalTests/AppHostConfig/IIS.config @@ -68,7 +68,6 @@
-
diff --git a/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs b/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs index c6007ab5fe..9941a6b5a5 100644 --- a/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs +++ b/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs @@ -7,5 +7,4 @@ using Xunit; [assembly: CollectionBehavior(DisableTestParallelization = true)] [assembly: RequiresIIS] -[assembly: OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "https://github.com/aspnet/IISIntegration/issues/1069")]