From 48ab3a6c3bb15a5c6a1b2e320f11851b656611d2 Mon Sep 17 00:00:00 2001
From: Mario <mdallago@globalnewsgroup.com>
Date: Thu, 15 Sep 2016 17:19:00 -0300
Subject: [PATCH 1/2] migration to vs 2015, updated dependencies, some
 refactoring,

---
 Source/SvnBackup/Program.cs                 | 13 ++++++-
 Source/SvnBackup/SvnBackup.csproj           | 38 +++++++++++++++++----
 Source/SvnBackup/packages.config            |  4 +++
 Source/SvnTools.Tests/SvnTools.Tests.csproj | 35 +++++++++++++++++--
 Source/SvnTools.Tests/packages.config       |  4 +++
 Source/SvnTools.sln                         | 14 ++++----
 Source/SvnTools/BackupArguments.cs          |  5 +--
 Source/SvnTools/SvnTools.csproj             | 38 ++++++++++++++++++---
 Source/SvnTools/packages.config             |  4 +++
 9 files changed, 132 insertions(+), 23 deletions(-)
 create mode 100644 Source/SvnBackup/packages.config
 create mode 100644 Source/SvnTools.Tests/packages.config
 create mode 100644 Source/SvnTools/packages.config

diff --git a/Source/SvnBackup/Program.cs b/Source/SvnBackup/Program.cs
index 289dc2f..5e853d6 100644
--- a/Source/SvnBackup/Program.cs
+++ b/Source/SvnBackup/Program.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
+using log4net;
 using SvnTools;
 using SvnTools.CommandLine;
 
@@ -10,8 +10,14 @@ namespace SvnBackup
 {
     class Program
     {
+        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
         static int Main(string[] args)
         {
+
+            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+
+            Log.Info("Current Dir:" + Environment.CurrentDirectory);
             if (Parser.ParseHelp(args))
             {
                 OutputHeader();
@@ -34,6 +40,11 @@ static int Main(string[] args)
             return 0;
         }
 
+        private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
+            Log.Fatal("Unhandled exception:" + e.ExceptionObject);
+        }
+
         private static void OutputUsageHelp()
         {
             Console.WriteLine();
diff --git a/Source/SvnBackup/SvnBackup.csproj b/Source/SvnBackup/SvnBackup.csproj
index 715928c..636b8fb 100644
--- a/Source/SvnBackup/SvnBackup.csproj
+++ b/Source/SvnBackup/SvnBackup.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,8 +12,26 @@
     <AssemblyName>SvnBackup</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,9 +55,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Libraries\Ionic.Zip.Reduced.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Libraries\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.5\lib\net20-full\log4net.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -54,6 +72,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SvnTools\SvnTools.csproj">
@@ -61,6 +80,13 @@
       <Name>SvnTools</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Source/SvnBackup/packages.config b/Source/SvnBackup/packages.config
new file mode 100644
index 0000000..36480b5
--- /dev/null
+++ b/Source/SvnBackup/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.5" targetFramework="net20" />
+</packages>
\ No newline at end of file
diff --git a/Source/SvnTools.Tests/SvnTools.Tests.csproj b/Source/SvnTools.Tests/SvnTools.Tests.csproj
index 496caa2..d471a19 100644
--- a/Source/SvnTools.Tests/SvnTools.Tests.csproj
+++ b/Source/SvnTools.Tests/SvnTools.Tests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,26 @@
     <AssemblyName>SvnTools.Tests</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,6 +51,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.4.1\lib\net35\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -43,7 +67,6 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="nunit.framework" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BackupTest.cs" />
@@ -62,6 +85,14 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/Source/SvnTools.Tests/packages.config b/Source/SvnTools.Tests/packages.config
new file mode 100644
index 0000000..43d8b56
--- /dev/null
+++ b/Source/SvnTools.Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="3.4.1" targetFramework="net35" />
+</packages>
\ No newline at end of file
diff --git a/Source/SvnTools.sln b/Source/SvnTools.sln
index ef21e04..0229eb9 100644
--- a/Source/SvnTools.sln
+++ b/Source/SvnTools.sln
@@ -1,15 +1,17 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SvnBackup", "SvnBackup\SvnBackup.csproj", "{9741C214-53FB-4D17-8A3F-391ED8389EA0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SvnTools.Tests", "SvnTools.Tests\SvnTools.Tests.csproj", "{87E049EB-DC22-4103-8887-294579BED773}"
-EndProject
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FF2B4BE8-4601-4C81-8874-7BEBCC71A847}"
 	ProjectSection(SolutionItems) = preProject
 		..\Master.proj = ..\Master.proj
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SvnBackup", "SvnBackup\SvnBackup.csproj", "{9741C214-53FB-4D17-8A3F-391ED8389EA0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SvnTools.Tests", "SvnTools.Tests\SvnTools.Tests.csproj", "{87E049EB-DC22-4103-8887-294579BED773}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SvnTools", "SvnTools\SvnTools.csproj", "{D005FA62-3A70-48B9-B8A7-A7C14AE36774}"
 EndProject
 Global
diff --git a/Source/SvnTools/BackupArguments.cs b/Source/SvnTools/BackupArguments.cs
index 74c1126..c59123e 100644
--- a/Source/SvnTools/BackupArguments.cs
+++ b/Source/SvnTools/BackupArguments.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using SvnTools.CommandLine;
+using SvnTools.CommandLine;
 
 // $Id$
 
diff --git a/Source/SvnTools/SvnTools.csproj b/Source/SvnTools/SvnTools.csproj
index 65b8b0a..7877cbd 100644
--- a/Source/SvnTools/SvnTools.csproj
+++ b/Source/SvnTools/SvnTools.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,26 @@
     <AssemblyName>SvnTools</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,9 +57,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Libraries\Ionic.Zip.Reduced.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Libraries\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.5\lib\net20-full\log4net.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -70,6 +90,16 @@
   <ItemGroup>
     <Content Include="CommandLine\Readme.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Source/SvnTools/packages.config b/Source/SvnTools/packages.config
new file mode 100644
index 0000000..36480b5
--- /dev/null
+++ b/Source/SvnTools/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.5" targetFramework="net20" />
+</packages>
\ No newline at end of file

From 8a51cf27d82d4f37c6bcae8c5ffddc62e0cf1729 Mon Sep 17 00:00:00 2001
From: Mario <mdallago@globalnewsgroup.com>
Date: Thu, 15 Sep 2016 17:21:57 -0300
Subject: [PATCH 2/2] rename the temp folder during hotcopy

---
 Source/SvnTools/Backup.cs | 57 ++++++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/Source/SvnTools/Backup.cs b/Source/SvnTools/Backup.cs
index a1596c5..b7be563 100644
--- a/Source/SvnTools/Backup.cs
+++ b/Source/SvnTools/Backup.cs
@@ -14,7 +14,7 @@ namespace SvnTools
     public static class Backup
     {
         #region Logging Definition
-        private static readonly log4net.ILog _log = log4net.LogManager.GetLogger(typeof(Backup));
+        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(Backup));
         #endregion
 
         /// <summary>
@@ -24,6 +24,7 @@ public static class Backup
         public static void Run(BackupArguments args)
         {
             var repoRoot = new DirectoryInfo(args.RepositoryRoot);
+
             if (!repoRoot.Exists)
                 throw new InvalidOperationException(string.Format(
                     "The repository root directory '{0}' does not exist.",
@@ -36,6 +37,7 @@ public static void Run(BackupArguments args)
             // first try repoRoot as a repository
             if (PathHelper.IsRepository(repoRoot.FullName))
                 BackupRepository(args, repoRoot, backupRoot);
+
             // next try as partent folder for repositories
             else
                 foreach (var repo in repoRoot.GetDirectories())
@@ -49,7 +51,10 @@ private static void BackupRepository(BackupArguments args, DirectoryInfo reposit
                 string revString = GetRevision(args, repository);
 
                 if (string.IsNullOrEmpty(revString))
+                {
+                    Log.Info(string.Format("rev string is null in {0}", repository));
                     return; // couldn't find repo
+                }
 
                 string backupRepoPath = Path.Combine(backupRoot.FullName, repository.Name);
                 string backupRevPath = Path.Combine(backupRepoPath, revString);
@@ -58,41 +63,63 @@ private static void BackupRepository(BackupArguments args, DirectoryInfo reposit
                 if (!Directory.Exists(backupRepoPath))
                     Directory.CreateDirectory(backupRepoPath);
 
-                if (Directory.Exists(backupRevPath) || File.Exists(backupZipPath))
-                    return; // this rev is already backed up
+                if (File.Exists(backupZipPath))
+                {
+                    Log.Info(string.Format("this rev is already backed up, dir:{0}", backupRevPath)); // this rev is already backed up
+                    return;
+                }
 
-                // hotcopy
-                _log.InfoFormat("Backing up '{0}' from '{1}'.", revString, repository.Name);
-                RunHotCopy(args, repository, backupRevPath);
+                if (!Directory.Exists(backupRevPath))
+                {
+                    // hotcopy
+                    Log.InfoFormat("Backing up '{0}' from '{1}'.", revString, repository.Name);
+                    RunHotCopy(args, repository, backupRevPath);
+                }
+                else
+                {
+                    Log.Info(string.Format("this rev is already backed up, dir:{0}", backupRevPath)); // this rev is already backed up
+                }
 
                 // compress
-                if (args.Compress && !File.Exists(backupZipPath))
+                if (args.Compress)
+                {
+                    Log.Info(string.Format("Compressing {0}", backupZipPath));
                     CompressBackup(backupRevPath, backupZipPath);
+                }
+                else
+                {
+                    Log.Info("compress not active");
+                }
 
+                Log.Info(string.Format("Purging dir {0}", backupRepoPath));
                 // purge old
                 PruneBackups(backupRepoPath, args.History);
             }
             catch (Exception ex)
             {
-                _log.Error(ex.Message, ex);
+                Log.Error(ex.Message, ex);
             }
         }
 
         private static void RunHotCopy(BackupArguments args, DirectoryInfo repo, string backupRevPath)
         {
+            var tempDir = backupRevPath + "Temp";
+
             using (var hotCopy = new HotCopy())
             {
                 if (!string.IsNullOrEmpty(args.SubverisonPath))
                     hotCopy.ToolPath = args.SubverisonPath;
 
-                hotCopy.BackupPath = backupRevPath;
+                hotCopy.BackupPath = tempDir;
                 hotCopy.RepositoryPath = repo.FullName;
 
                 hotCopy.Execute();
 
                 if (!string.IsNullOrEmpty(hotCopy.StandardError))
-                    _log.Info(hotCopy.StandardError);
+                    Log.Info(hotCopy.StandardError);
             }
+
+            Directory.Move(tempDir, backupRevPath);
         }
 
         private static string GetRevision(BackupArguments args, DirectoryInfo repo)
@@ -108,14 +135,14 @@ private static string GetRevision(BackupArguments args, DirectoryInfo repo)
 
                 look.Execute();
                 if (!string.IsNullOrEmpty(look.StandardError))
-                    _log.Info(look.StandardError);
+                    Log.Info(look.StandardError);
 
                 if (!look.TryGetRevision(out rev))
                 {
-                    _log.WarnFormat("'{0}' is not a repository.", repo.Name);
+                    Log.WarnFormat("'{0}' is not a repository.", repo.Name);
 
                     if (!string.IsNullOrEmpty(look.StandardOutput))
-                        _log.Info(look.StandardOutput);
+                        Log.Info(look.StandardOutput);
 
                     return null;
                 }
@@ -152,7 +179,7 @@ private static void PruneBackups(string backupRepoPath, int historyCount)
                     string dir = dirs[i];
 
                     PathHelper.DeleteDirectory(dir);
-                    _log.InfoFormat("Removed backup '{0}'.", dir);
+                    Log.InfoFormat("Removed backup '{0}'.", dir);
                 }
             }
 
@@ -164,7 +191,7 @@ private static void PruneBackups(string backupRepoPath, int historyCount)
                     string file = files[i];
 
                     File.Delete(file);
-                    _log.InfoFormat("Removed backup '{0}'.", file);
+                    Log.InfoFormat("Removed backup '{0}'.", file);
                 }
             }
         }