FileArchiveStyleFactory - Extracted from FileTarget

NLog · Feb 28, 2017 · 45b8254 · 45b8254
1 parent 29f8734
commit 45b8254
Show file tree

Hide file tree

Showing 17 changed files with 1,044 additions and 872 deletions.
diff --git a/src/NLog/Internal/FileInfoExt.cs b/src/NLog/Internal/FileInfoExt.cs
@@ -43,19 +43,16 @@ public static DateTime GetLastWriteTimeUtc(this FileInfo fileInfo)
 #if !SILVERLIGHT
             return fileInfo.LastWriteTimeUtc;
 #else
-            return fileInfo.LastWriteTime;
+            return fileInfo.LastWriteTime.ToUniversalTime();
 #endif
         }
         public static DateTime GetCreationTimeUtc(this FileInfo fileInfo)
         {
 #if !SILVERLIGHT
             return fileInfo.CreationTimeUtc;
 #else
-            return fileInfo.CreationTime;
+            return fileInfo.CreationTime.ToUniversalTime();
 #endif
         }
-
-
-
     }
 }
diff --git a/src/NLog/NLog.Xamarin.Android.csproj b/src/NLog/NLog.Xamarin.Android.csproj
@@ -368,6 +368,7 @@
     <Compile Include="Targets\EventLogTarget.cs" />
     <Compile Include="Targets\EventLogTargetOverflowAction.cs" />
     <Compile Include="Targets\FileArchivePeriod.cs" />
+    <Compile Include="Targets\FileArchiveStyleFactory.cs" />
     <Compile Include="Targets\FilePathKind.cs" />
     <Compile Include="Targets\FileTarget.cs" />
     <Compile Include="Targets\IFileCompressor.cs" />

diff --git a/src/NLog/NLog.Xamarin.iOS.csproj b/src/NLog/NLog.Xamarin.iOS.csproj
@@ -365,6 +365,7 @@
     <Compile Include="Targets\EventLogTarget.cs" />
     <Compile Include="Targets\EventLogTargetOverflowAction.cs" />
     <Compile Include="Targets\FileArchivePeriod.cs" />
+    <Compile Include="Targets\FileArchiveStyleFactory.cs" />
     <Compile Include="Targets\FilePathKind.cs" />
     <Compile Include="Targets\FileTarget.cs" />
     <Compile Include="Targets\IFileCompressor.cs" />

diff --git a/src/NLog/NLog.doc.csproj b/src/NLog/NLog.doc.csproj
@@ -378,6 +378,7 @@
     <Compile Include="Targets\EventLogTarget.cs" />
     <Compile Include="Targets\EventLogTargetOverflowAction.cs" />
     <Compile Include="Targets\FileArchivePeriod.cs" />
+    <Compile Include="Targets\FileArchiveStyleFactory.cs" />
     <Compile Include="Targets\FilePathKind.cs" />
     <Compile Include="Targets\FileTarget.cs" />
     <Compile Include="Targets\IFileCompressor.cs" />

diff --git a/src/NLog/NLog.mono.csproj b/src/NLog/NLog.mono.csproj
@@ -384,6 +384,7 @@
     <Compile Include="Targets\EventLogTarget.cs" />
     <Compile Include="Targets\EventLogTargetOverflowAction.cs" />
     <Compile Include="Targets\FileArchivePeriod.cs" />
+    <Compile Include="Targets\FileArchiveStyleFactory.cs" />
     <Compile Include="Targets\FilePathKind.cs" />
     <Compile Include="Targets\FileTarget.cs" />
     <Compile Include="Targets\IFileCompressor.cs" />

diff --git a/src/NLog/NLog.netfx35.csproj b/src/NLog/NLog.netfx35.csproj
@@ -378,6 +378,7 @@
     <Compile Include="Targets\EventLogTarget.cs" />
     <Compile Include="Targets\EventLogTargetOverflowAction.cs" />
     <Compile Include="Targets\FileArchivePeriod.cs" />
+    <Compile Include="Targets\FileArchiveStyleFactory.cs" />
     <Compile Include="Targets\FilePathKind.cs" />
     <Compile Include="Targets\FileTarget.cs" />
     <Compile Include="Targets\IFileCompressor.cs" />

diff --git a/src/NLog/NLog.netfx40.csproj b/src/NLog/NLog.netfx40.csproj
@@ -378,6 +378,7 @@
     <Compile Include="Targets\EventLogTarget.cs" />
     <Compile Include="Targets\EventLogTargetOverflowAction.cs" />
     <Compile Include="Targets\FileArchivePeriod.cs" />
+    <Compile Include="Targets\FileArchiveStyleFactory.cs" />
     <Compile Include="Targets\FilePathKind.cs" />
     <Compile Include="Targets\FileTarget.cs" />
     <Compile Include="Targets\IFileCompressor.cs" />

diff --git a/src/NLog/NLog.netfx45.csproj b/src/NLog/NLog.netfx45.csproj
@@ -15,8 +15,7 @@
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\NLog.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <TargetFrameworkProfile></TargetFrameworkProfile>
     <StyleCopTargetsFile>$(MSBuildExtensionsPath)\Microsoft\StyleCop\v4.4\Microsoft.StyleCop.Targets</StyleCopTargetsFile>
     <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -384,6 +383,7 @@
     <Compile Include="Targets\EventLogTarget.cs" />
     <Compile Include="Targets\EventLogTargetOverflowAction.cs" />
     <Compile Include="Targets\FileArchivePeriod.cs" />
+    <Compile Include="Targets\FileArchiveStyleFactory.cs" />
     <Compile Include="Targets\FilePathKind.cs" />
     <Compile Include="Targets\FileTarget.cs" />
     <Compile Include="Targets\IFileCompressor.cs" />

diff --git a/src/NLog/NLog.sl4.csproj b/src/NLog/NLog.sl4.csproj
@@ -385,6 +385,7 @@
     <Compile Include="Targets\EventLogTarget.cs" />
     <Compile Include="Targets\EventLogTargetOverflowAction.cs" />
     <Compile Include="Targets\FileArchivePeriod.cs" />
+    <Compile Include="Targets\FileArchiveStyleFactory.cs" />
     <Compile Include="Targets\FilePathKind.cs" />
     <Compile Include="Targets\FileTarget.cs" />
     <Compile Include="Targets\IFileCompressor.cs" />

diff --git a/src/NLog/NLog.sl5.csproj b/src/NLog/NLog.sl5.csproj
@@ -382,6 +382,7 @@
     <Compile Include="Targets\EventLogTarget.cs" />
     <Compile Include="Targets\EventLogTargetOverflowAction.cs" />
     <Compile Include="Targets\FileArchivePeriod.cs" />
+    <Compile Include="Targets\FileArchiveStyleFactory.cs" />
     <Compile Include="Targets\FilePathKind.cs" />
     <Compile Include="Targets\FileTarget.cs" />
     <Compile Include="Targets\IFileCompressor.cs" />

diff --git a/src/NLog/NLog.wp7.csproj b/src/NLog/NLog.wp7.csproj
@@ -381,6 +381,7 @@
     <Compile Include="Targets\EventLogTarget.cs" />
     <Compile Include="Targets\EventLogTargetOverflowAction.cs" />
     <Compile Include="Targets\FileArchivePeriod.cs" />
+    <Compile Include="Targets\FileArchiveStyleFactory.cs" />
     <Compile Include="Targets\FilePathKind.cs" />
     <Compile Include="Targets\FileTarget.cs" />
     <Compile Include="Targets\IFileCompressor.cs" />

diff --git a/src/NLog/NLog.wp71.csproj b/src/NLog/NLog.wp71.csproj
@@ -381,6 +381,7 @@
     <Compile Include="Targets\EventLogTarget.cs" />
     <Compile Include="Targets\EventLogTargetOverflowAction.cs" />
     <Compile Include="Targets\FileArchivePeriod.cs" />
+    <Compile Include="Targets\FileArchiveStyleFactory.cs" />
     <Compile Include="Targets\FilePathKind.cs" />
     <Compile Include="Targets\FileTarget.cs" />
     <Compile Include="Targets\IFileCompressor.cs" />

diff --git a/src/NLog/NLog.wp8.csproj b/src/NLog/NLog.wp8.csproj
@@ -406,6 +406,7 @@
     <Compile Include="Targets\EventLogTarget.cs" />
     <Compile Include="Targets\EventLogTargetOverflowAction.cs" />
     <Compile Include="Targets\FileArchivePeriod.cs" />
+    <Compile Include="Targets\FileArchiveStyleFactory.cs" />
     <Compile Include="Targets\FilePathKind.cs" />
     <Compile Include="Targets\FileTarget.cs" />
     <Compile Include="Targets\IFileCompressor.cs" />

diff --git a/src/NLog/Targets/DateAndSequenceArchive.cs b/src/NLog/Targets/DateAndSequenceArchive.cs
@@ -41,7 +41,6 @@ namespace NLog.Targets
     internal class DateAndSequenceArchive
     {
         private readonly string _dateFormat;
-        private readonly string _formattedDate;
 
         /// <summary>
         /// The full name of the archive file.
@@ -65,7 +64,7 @@ internal class DateAndSequenceArchive
         /// <returns><c>True</c> if the formatted dates are equal, otherwise <c>False</c>.</returns>
         public bool HasSameFormattedDate(DateTime date)
         {
-            return date.ToString(_dateFormat) == _formattedDate;
+            return string.Equals(date.ToString(_dateFormat), Date.ToString(_dateFormat), StringComparison.Ordinal);
         }
 
         /// <summary>
@@ -80,7 +79,6 @@ public DateAndSequenceArchive(string fileName, DateTime date, string dateFormat,
             _dateFormat = dateFormat;
             Sequence = sequence;
             FileName = fileName;
-            _formattedDate = date.ToString(dateFormat);
         }
     }
 }