From 88dde25e6d7cd89b5863e9fa1aa6957272e1df50 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sun, 24 Sep 2017 15:14:35 -0400 Subject: [PATCH 1/3] Directory deletion no longer recurses into symlinks --- TGServerService/Compiler.cs | 13 ------------- TGServerService/Program.cs | 6 +++++- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/TGServerService/Compiler.cs b/TGServerService/Compiler.cs index 2292f5b2451..0fc81ab6c85 100644 --- a/TGServerService/Compiler.cs +++ b/TGServerService/Compiler.cs @@ -141,22 +141,9 @@ void CleanGameFolder() if (Directory.Exists(Path.Combine(GameDirA, InterfaceDLLName))) Directory.Delete(Path.Combine(GameDirA, InterfaceDLLName)); - var Config = LoadRepoConfig(); - if (Config != null) - { - CleanGameFolderList(GameDirA, Config.StaticDirectoryPaths); - CleanGameFolderList(GameDirA, Config.DLLPaths); - } - if (Directory.Exists(Path.Combine(GameDirB, InterfaceDLLName))) Directory.Delete(Path.Combine(GameDirB, InterfaceDLLName)); - if (Config != null) - { - CleanGameFolderList(GameDirB, Config.StaticDirectoryPaths); - CleanGameFolderList(GameDirB, Config.DLLPaths); - } - if (Directory.Exists(GameDirLive)) Directory.Delete(GameDirLive); } diff --git a/TGServerService/Program.cs b/TGServerService/Program.cs index 8a1fdff9f1f..127299c259b 100644 --- a/TGServerService/Program.cs +++ b/TGServerService/Program.cs @@ -30,7 +30,11 @@ public static void DeleteDirectory(string path, bool ContentsOnly = false, IList if (excludeRoot != null) for (var I = 0; I < excludeRoot.Count; ++I) excludeRoot[I] = excludeRoot[I].ToLower(); - + if (!di.Attributes.HasFlag(FileAttributes.Directory)) + { //this is probably a symlink + Directory.Delete(di.FullName); + return; + } NormalizeAndDelete(di, excludeRoot); if (!ContentsOnly) { From 964c21ba0815c2bce5035febbd6a80360aad8916 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sun, 24 Sep 2017 15:15:10 -0400 Subject: [PATCH 2/3] tavs --- TGServerService/Program.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TGServerService/Program.cs b/TGServerService/Program.cs index 127299c259b..44c29e92690 100644 --- a/TGServerService/Program.cs +++ b/TGServerService/Program.cs @@ -30,11 +30,11 @@ public static void DeleteDirectory(string path, bool ContentsOnly = false, IList if (excludeRoot != null) for (var I = 0; I < excludeRoot.Count; ++I) excludeRoot[I] = excludeRoot[I].ToLower(); - if (!di.Attributes.HasFlag(FileAttributes.Directory)) - { //this is probably a symlink - Directory.Delete(di.FullName); - return; - } + if (!di.Attributes.HasFlag(FileAttributes.Directory)) + { //this is probably a symlink + Directory.Delete(di.FullName); + return; + } NormalizeAndDelete(di, excludeRoot); if (!ContentsOnly) { From 675a2451364aaea3644096b7bfde345722e56e8f Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sun, 24 Sep 2017 15:17:58 -0400 Subject: [PATCH 3/3] Version bump to 3.1.0.5 --- Version.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Version.cs b/Version.cs index c822664d12e..223214a9ea5 100644 --- a/Version.cs +++ b/Version.cs @@ -12,6 +12,6 @@ // [assembly: AssemblyVersion("1.0.*")] //It's impossible to make these a define, don't say I didn't warn you -[assembly: AssemblyVersion("3.1.0.4")] -[assembly: AssemblyFileVersion("3.1.0.4")] -[assembly: AssemblyInformationalVersion("3.1.0.4")] +[assembly: AssemblyVersion("3.1.0.5")] +[assembly: AssemblyFileVersion("3.1.0.5")] +[assembly: AssemblyInformationalVersion("3.1.0.5")]