diff --git a/Directory.Packages.props b/Directory.Packages.props index 431bfc7ba7..c291304df4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ - + @@ -45,9 +45,9 @@ - - - + + + @@ -61,8 +61,8 @@ - - + + @@ -70,17 +70,17 @@ - + - + - + diff --git a/src/Umbraco.Core/Extensions/ObjectExtensions.cs b/src/Umbraco.Core/Extensions/ObjectExtensions.cs index 21fa8fa3b4..50fe788da0 100644 --- a/src/Umbraco.Core/Extensions/ObjectExtensions.cs +++ b/src/Umbraco.Core/Extensions/ObjectExtensions.cs @@ -48,7 +48,14 @@ public static class ObjectExtensions { if (input is IDisposable disposable) { - disposable.Dispose(); + try + { + disposable.Dispose(); + } + catch (ObjectDisposedException) + { + // ignore if it is already disposed + } } }