diff --git a/Vrh.Log4Pro.MaintenanceConsole/App.config b/Vrh.Log4Pro.MaintenanceConsole/App.config
index f250bc3..27e3e18 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/App.config
+++ b/Vrh.Log4Pro.MaintenanceConsole/App.config
@@ -4,35 +4,35 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/Vrh.Log4Pro.MaintenanceConsole/Manager - BackupPackageManager.cs b/Vrh.Log4Pro.MaintenanceConsole/Manager - BackupPackageManager.cs
index 97a8fe3..9bcf525 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/Manager - BackupPackageManager.cs
+++ b/Vrh.Log4Pro.MaintenanceConsole/Manager - BackupPackageManager.cs
@@ -461,7 +461,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
{
public BackupFolder(XElement backupfolderxml)
{
- Xml_Path = GetValue(nameof(XmlStructure.BackupPackage.BackupFolder.Attributes.Path), backupfolderxml, XmlStructure.BackupPackage.BackupFolder.Attributes.Path.Values.DEFAULT);
+ Xml_Path = SpecialFolderNameSubstitution(GetValue(nameof(XmlStructure.BackupPackage.BackupFolder.Attributes.Path), backupfolderxml, XmlStructure.BackupPackage.BackupFolder.Attributes.Path.Values.DEFAULT));
Xml_Description = GetValue(nameof(XmlStructure.BackupPackage.BackupFolder.Attributes.Description), backupfolderxml, Xml_Path);
Xml_BackupToFile = GetValue(nameof(XmlStructure.BackupPackage.BackupFolder.Attributes.BackupToFile), backupfolderxml, "");
Xml_IncludeFileNameMask = GetValue(nameof(XmlStructure.BackupPackage.BackupFolder.Attributes.IncludeNameMask), backupfolderxml, XmlStructure.BackupPackage.BackupFolder.Attributes.IncludeNameMask.Values.DEFAULT);
@@ -482,6 +482,34 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
public string Xml_IncludeFileNameMask;
public string Xml_IncludeFileFullPathRegex;
public bool FolderExists;
+
+ private string SpecialFolderNameSubstitution(string path)
+ {
+ return path
+ .R(Environment.SpecialFolder.ApplicationData)// Current User's Application Data
+ .R(Environment.SpecialFolder.CommonApplicationData) // All User's Application Data
+ .R(Environment.SpecialFolder.CommonProgramFiles) // Program Files
+ .R(Environment.SpecialFolder.Cookies) // Internet Cookie
+ .R(Environment.SpecialFolder.Desktop) // Logical Desktop
+ .R(Environment.SpecialFolder.DesktopDirectory) // Physical Desktop
+ .R(Environment.SpecialFolder.Favorites) // Favorites
+ .R(Environment.SpecialFolder.History) // Internet History
+ .R(Environment.SpecialFolder.InternetCache) // Internet Cache
+ .R(Environment.SpecialFolder.MyComputer) // "My Computer" Folder
+ .R(Environment.SpecialFolder.MyDocuments) // "My Documents" Folder
+ .R(Environment.SpecialFolder.MyMusic) // "My Music" Folder
+ .R(Environment.SpecialFolder.MyPictures) // "My Pictures" Folder
+ .R(Environment.SpecialFolder.Personal) // "My Document" Folder
+ .R(Environment.SpecialFolder.ProgramFiles) // Program files Folder
+ .R(Environment.SpecialFolder.Programs) // Programs Folder
+ .R(Environment.SpecialFolder.Recent) // Recent Folder
+ .R(Environment.SpecialFolder.SendTo) // "Sent to" Folder
+ .R(Environment.SpecialFolder.StartMenu) // Start Menu
+ .R(Environment.SpecialFolder.Startup) // Startup
+ .R(Environment.SpecialFolder.System) // System Folder
+ .R(Environment.SpecialFolder.Templates) // Document Templates
+ ;
+ }
}
#endregion BackupFolder class
#region BackupSQLDataBase class
@@ -509,5 +537,9 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
#endregion BackupSQLDataBase class
}
+ public static class StringExtension
+ {
+ public static string R(this string s, Environment.SpecialFolder n) { return s.Replace("@" + n.ToString() + "@", Environment.GetFolderPath(n)); }
+ }
#endregion BackupPackage class
}
diff --git a/Vrh.Log4Pro.MaintenanceConsole/Manager - FileCleanerManager.cs b/Vrh.Log4Pro.MaintenanceConsole/Manager - FileCleanerManager.cs
index 214566f..46cf050 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/Manager - FileCleanerManager.cs
+++ b/Vrh.Log4Pro.MaintenanceConsole/Manager - FileCleanerManager.cs
@@ -213,7 +213,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.FileCleanerManagerNS
bool conditionresult = false;
if (c.Type == FolderToClean.ConditionType.TimeStampInName)
{
- var fileTSstr = VRH.Common.StringConstructor.ResolveConstructor(groupnamevalues, c.TimestampConstructor, "{}@@");
+ var fileTSstr = VRH.Common.StringConstructor.ResolveConstructor(groupnamevalues, c.TimestampConstructor, "{}@@");
try { var fileTS = DateTime.Parse(fileTSstr); conditionresult = DateTime.Now.Subtract(fileTS).TotalDays > c.Limit; }
catch
diff --git a/Vrh.Log4Pro.MaintenanceConsole/Manager - InstallManager.cs b/Vrh.Log4Pro.MaintenanceConsole/Manager - InstallManager.cs
index 1a5b2b7..d669021 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/Manager - InstallManager.cs
+++ b/Vrh.Log4Pro.MaintenanceConsole/Manager - InstallManager.cs
@@ -25,7 +25,7 @@ using System.Collections.ObjectModel;
namespace Vrh.Log4Pro.MaintenanceConsole.InstallManagerNS
{
- #region MaintenanceTools class
+ #region InstallManager class
public static class InstallManager
{
private const string XMLCONNECTIONSTRING = "config=MAINTENANCECONSOLE_INSTALLMANAGER;";
@@ -142,7 +142,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.InstallManagerNS
#endregion First level Executors with UI
}
- #endregion MaintenanceTools class
+ #endregion InstallManager class
#region InstallManagerXmlParser class
public class InstallManagerXmlParser: XmlParser
diff --git a/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs b/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
index 3514d43..bd6b850 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
+++ b/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 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("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/Vrh.Log4Pro.MaintenanceConsole/Vrh.Log4Pro.MaintenanceConsole.csproj b/Vrh.Log4Pro.MaintenanceConsole/Vrh.Log4Pro.MaintenanceConsole.csproj
index 1c8cd16..12559ec 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/Vrh.Log4Pro.MaintenanceConsole.csproj
+++ b/Vrh.Log4Pro.MaintenanceConsole/Vrh.Log4Pro.MaintenanceConsole.csproj
@@ -162,6 +162,8 @@
..\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll
+ True
+ True
..\packages\Microsoft.Win32.Registry.4.0.0\lib\net46\Microsoft.Win32.Registry.dll
@@ -170,8 +172,10 @@
..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll
-
- ..\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll
+
+ ..\packages\System.AppContext.4.1.0\lib\net463\System.AppContext.dll
+ True
+ True
@@ -179,6 +183,8 @@
..\packages\System.Console.4.0.0\lib\net46\System.Console.dll
+ True
+ True
@@ -187,13 +193,19 @@
..\packages\System.Diagnostics.TraceSource.4.0.0\lib\net46\System.Diagnostics.TraceSource.dll
+ True
+ True
..\packages\System.Diagnostics.Tracing.4.1.0\lib\net462\System.Diagnostics.Tracing.dll
+ True
+ True
..\packages\System.Globalization.Calendars.4.0.1\lib\net46\System.Globalization.Calendars.dll
+ True
+ True
@@ -201,19 +213,34 @@
..\packages\System.IO.4.1.0\lib\net462\System.IO.dll
+ True
+ True
..\packages\System.IO.Compression.4.1.0\lib\net46\System.IO.Compression.dll
+ True
+ True
..\packages\System.IO.Compression.ZipFile.4.0.1\lib\net46\System.IO.Compression.ZipFile.dll
+ True
+ True
..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll
+ True
+ True
..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll
+ True
+ True
+
+
+ ..\packages\System.Linq.4.1.0\lib\net463\System.Linq.dll
+ True
+ True
..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll
@@ -224,43 +251,67 @@
..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll
+ True
+ True
..\packages\System.Net.Sockets.4.1.0\lib\net46\System.Net.Sockets.dll
+ True
+ True
..\packages\System.Reflection.4.1.0\lib\net462\System.Reflection.dll
+ True
+ True
..\packages\System.Reflection.TypeExtensions.4.4.0\lib\net461\System.Reflection.TypeExtensions.dll
..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll
+ True
+ True
..\packages\System.Runtime.Extensions.4.1.0\lib\net462\System.Runtime.Extensions.dll
+ True
+ True
..\packages\System.Runtime.InteropServices.4.1.0\lib\net462\System.Runtime.InteropServices.dll
+ True
+ True
..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
+ True
+ True
..\packages\System.Security.Claims.4.0.1\lib\net46\System.Security.Claims.dll
+ True
+ True
-
- ..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll
+
+ ..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net463\System.Security.Cryptography.Algorithms.dll
+ True
+ True
..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll
+ True
+ True
..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll
+ True
+ True
..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll
+ True
+ True
..\packages\System.Security.Principal.Windows.4.0.0\lib\net46\System.Security.Principal.Windows.dll
@@ -269,6 +320,11 @@
..\packages\System.ServiceProcess.ServiceController.4.1.0\lib\net461\System.ServiceProcess.ServiceController.dll
+
+ ..\packages\System.Text.RegularExpressions.4.1.0\lib\net463\System.Text.RegularExpressions.dll
+ True
+ True
+
diff --git a/Vrh.Log4Pro.MaintenanceConsole/packages.config b/Vrh.Log4Pro.MaintenanceConsole/packages.config
index 43357e9..910a05b 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/packages.config
+++ b/Vrh.Log4Pro.MaintenanceConsole/packages.config
@@ -1,76 +1,76 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
libgit2 0.21.2