Index: Core/Common/src/Core.Common.Util/IO/EmbeddedResourceFileWriter.cs
===================================================================
diff -u -r3d088548dfdebfd5c3adbbd67075b42e134f5c03 -rdcf85cd357e51838d5dfad11c3882c5a76e3a72f
--- Core/Common/src/Core.Common.Util/IO/EmbeddedResourceFileWriter.cs	(.../EmbeddedResourceFileWriter.cs)	(revision 3d088548dfdebfd5c3adbbd67075b42e134f5c03)
+++ Core/Common/src/Core.Common.Util/IO/EmbeddedResourceFileWriter.cs	(.../EmbeddedResourceFileWriter.cs)	(revision dcf85cd357e51838d5dfad11c3882c5a76e3a72f)
@@ -84,7 +84,7 @@
         {
             if (removeFilesOnDispose && disposing)
             {
-                Directory.Delete(TargetFolderPath, true);
+                DirectoryHelper.TryDelete(TargetFolderPath);
             }
         }
 
Index: Core/Common/test/Core.Common.Util.Test/IO/EmbeddedResourceFileWriterTest.cs
===================================================================
diff -u -r3d088548dfdebfd5c3adbbd67075b42e134f5c03 -rdcf85cd357e51838d5dfad11c3882c5a76e3a72f
--- Core/Common/test/Core.Common.Util.Test/IO/EmbeddedResourceFileWriterTest.cs	(.../EmbeddedResourceFileWriterTest.cs)	(revision 3d088548dfdebfd5c3adbbd67075b42e134f5c03)
+++ Core/Common/test/Core.Common.Util.Test/IO/EmbeddedResourceFileWriterTest.cs	(.../EmbeddedResourceFileWriterTest.cs)	(revision dcf85cd357e51838d5dfad11c3882c5a76e3a72f)
@@ -110,7 +110,7 @@
                 // Cleanup
                 if (!removeFilesOnDispose)
                 {
-                    Directory.Delete(targetFolderPath, true);
+                    DirectoryHelper.TryDelete(targetFolderPath);
                 }
             }
         }
Index: Core/Components/test/Core.Components.BruTile.Test/Configurations/PersistentCacheConfigurationTest.cs
===================================================================
diff -u -r6567bbd26772a448b528652770d81e181ab2f470 -rdcf85cd357e51838d5dfad11c3882c5a76e3a72f
--- Core/Components/test/Core.Components.BruTile.Test/Configurations/PersistentCacheConfigurationTest.cs	(.../PersistentCacheConfigurationTest.cs)	(revision 6567bbd26772a448b528652770d81e181ab2f470)
+++ Core/Components/test/Core.Components.BruTile.Test/Configurations/PersistentCacheConfigurationTest.cs	(.../PersistentCacheConfigurationTest.cs)	(revision dcf85cd357e51838d5dfad11c3882c5a76e3a72f)
@@ -25,6 +25,7 @@
 using BruTile;
 using BruTile.Cache;
 using Core.Common.TestUtil;
+using Core.Common.Util;
 using Core.Components.BruTile.Configurations;
 using Core.Components.BruTile.IO;
 using Core.Components.Gis.Exceptions;
@@ -241,7 +242,7 @@
         {
             if (Directory.Exists(rootPath))
             {
-                Directory.Delete(rootPath, true);
+                DirectoryHelper.TryDelete(rootPath);
             }
 
             try
@@ -252,7 +253,7 @@
             {
                 if (Directory.Exists(rootPath))
                 {
-                    Directory.Delete(rootPath, true);
+                    DirectoryHelper.TryDelete(rootPath);
                 }
             }
         }
Index: Core/Components/test/Core.Components.Gis.IO.Test/Writers/WmtsConnectionInfoWriterTest.cs
===================================================================
diff -u -r98b126b6d45b128483be32b5d76285ddfbe5655b -rdcf85cd357e51838d5dfad11c3882c5a76e3a72f
--- Core/Components/test/Core.Components.Gis.IO.Test/Writers/WmtsConnectionInfoWriterTest.cs	(.../WmtsConnectionInfoWriterTest.cs)	(revision 98b126b6d45b128483be32b5d76285ddfbe5655b)
+++ Core/Components/test/Core.Components.Gis.IO.Test/Writers/WmtsConnectionInfoWriterTest.cs	(.../WmtsConnectionInfoWriterTest.cs)	(revision dcf85cd357e51838d5dfad11c3882c5a76e3a72f)
@@ -25,6 +25,7 @@
 using System.Security.AccessControl;
 using Core.Common.IO.Exceptions;
 using Core.Common.TestUtil;
+using Core.Common.Util;
 using Core.Components.Gis.IO.Writers;
 using NUnit.Framework;
 
@@ -94,7 +95,7 @@
             }
             finally
             {
-                Directory.Delete(directoryPath, true);
+                DirectoryHelper.TryDelete(directoryPath);
             }
         }
 
@@ -122,7 +123,7 @@
             }
             finally
             {
-                Directory.Delete(directoryPath, true);
+                DirectoryHelper.TryDelete(directoryPath);
             }
         }