Merge branch 'dev'

winbench · Jan 6, 2020 · 7773f52 · 7773f52
2 parents 80dd2e1 + 1baa4f0
commit 7773f52
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 19 deletions.
diff --git a/BenchManager/BenchCLI/Properties/AssemblyInfo.cs b/BenchManager/BenchCLI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.3.0")]
-[assembly: AssemblyFileVersion("0.22.3.0")]
+[assembly: AssemblyVersion("0.22.4.0")]
+[assembly: AssemblyFileVersion("0.22.4.0")]
diff --git a/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs b/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.3.0")]
-[assembly: AssemblyFileVersion("0.22.3.0")]
+[assembly: AssemblyVersion("0.22.4.0")]
+[assembly: AssemblyFileVersion("0.22.4.0")]
diff --git a/BenchManager/BenchLib/FileSystem.cs b/BenchManager/BenchLib/FileSystem.cs
@@ -55,15 +55,7 @@ public static string EmptyDir(string path)
             if (Directory.Exists(path))
             {
                 Debug.WriteLine("Cleaning directory: " + path);
-                File.SetAttributes(path, FileAttributes.Normal);
-                foreach (var dir in Directory.GetDirectories(path))
-                {
-                    ForceDeleteDirectory(dir);
-                }
-                foreach (var file in Directory.GetFiles(path))
-                {
-                    ForceDeleteFile(file);
-                }
+                ForceEmptyDirectory(path);
             }
             else
             {
@@ -98,10 +90,11 @@ public static void PurgeDir(string path)
             path = NormalizePath(path);
             if (!Directory.Exists(path)) return;
             Debug.WriteLine("Purging directory: " + path);
+            ForceEmptyDirectory(path);
             ForceDeleteDirectory(path);
         }
 
-        private static void ForceDeleteDirectory(string targetDir)
+        private static void ForceEmptyDirectory(string targetDir)
         {
             targetDir = NormalizePath(targetDir);
             File.SetAttributes(targetDir, FileAttributes.Normal);
@@ -116,15 +109,24 @@ private static void ForceDeleteDirectory(string targetDir)
 
             foreach (string dir in dirs)
             {
+                if (!File.GetAttributes(dir).HasFlag(FileAttributes.ReparsePoint))
+                {
+                    // empty folder if it is not a junction (directory symlink)
+                    ForceEmptyDirectory(dir);
+                }
                 ForceDeleteDirectory(dir);
             }
+        }
 
+        private static void ForceDeleteDirectory(string targetDir)
+        {
             // poll to work around short time locks from anti virus software
             for (int i = 0; i < UNAUTHORIZED_RETRY_LIMIT; i++)
             {
                 try
                 {
-                    Directory.Delete(targetDir, true);
+                    // expect the directory to be empty
+                    Directory.Delete(targetDir, false);
                     return;
                 }
                 catch (UnauthorizedAccessException)
@@ -185,6 +187,7 @@ public static void MoveContent(string sourceDir, string targetDir)
                 if (Directory.Exists(tp))
                 {
                     MoveContent(currentDir, tp);
+                    ForceEmptyDirectory(currentDir);
                     ForceDeleteDirectory(currentDir);
                 }
                 else

diff --git a/BenchManager/BenchLib/Properties/AssemblyInfo.cs b/BenchManager/BenchLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.3.0")]
-[assembly: AssemblyFileVersion("0.22.3.0")]
+[assembly: AssemblyVersion("0.22.4.0")]
+[assembly: AssemblyFileVersion("0.22.4.0")]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,14 @@ Add a link to the GitHub diff like
 
 [Unreleased]: https://github.com/winbench/bench/compare/master...dev
 
+## [0.22.4] - 2020-01-06
+
+[0.22.4]: https://github.com/winbench/bench/compare/v0.22.3...v0.22.4
+
+### Fixed
+* Prevent recursive deletion of junctions
+  ([#142](https://github.com/winbench/bench/issues/142))
+
 ## [0.22.3] - 2019-08-13
 
 [0.22.3]: https://github.com/winbench/bench/compare/v0.22.2...v0.22.3

diff --git a/res/bench-install.bat b/res/bench-install.bat
@@ -7,7 +7,7 @@ SetLocal
 :: https://winbench.org/guide/setup/
 ::
 
-SET VERSION=0.22.3
+SET VERSION=0.22.4
 SET TAG=v%VERSION%
 SET ROOT=%~dp0
 IF [%1] NEQ [] SET ROOT=%~dpnx1\

diff --git a/res/version.txt b/res/version.txt
@@ -1 +1 @@
-0.22.3
+0.22.4