v8.0.0

Author: LiorBanai-Intuitive

.editorconfig

@@ -91,12 +91,12 @@ csharp_style_expression_bodied_operators = false:silent
 csharp_style_expression_bodied_properties = true:silent
 
 # Pattern matching preferences
-csharp_style_pattern_matching_over_as_with_null_check = true
-csharp_style_pattern_matching_over_is_with_cast_check = true
-csharp_style_prefer_extended_property_pattern = true
-csharp_style_prefer_not_pattern = true
-csharp_style_prefer_pattern_matching = true
-csharp_style_prefer_switch_expression = true
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_prefer_extended_property_pattern = true:suggestion
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_prefer_switch_expression = true:suggestion
 
 # Null-checking preferences
 csharp_style_conditional_delegate_call = true
@@ -274,6 +274,8 @@ dotnet_diagnostic.SA1108.severity = silent
 dotnet_diagnostic.SA1012.severity = error
 dotnet_diagnostic.SA1500.severity = error
 dotnet_diagnostic.SA1316.severity = error
+csharp_prefer_system_threading_lock = true:suggestion
+dotnet_diagnostic.MA0132.severity = error
 
 [*.{cs,vb}]
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
@@ -297,4 +299,5 @@ dotnet_style_predefined_type_for_locals_parameters_members = true:silent
 dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
 dotnet_code_quality_unused_parameters = all:suggestion
 dotnet_diagnostic.CA2200.severity = error
-dotnet_diagnostic.CA1012.severity = error
+dotnet_diagnostic.CA1012.severity = error
+dotnet_style_namespace_match_folder = true:suggestion

.github/workflows/dotnet-core-desktop.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        configuration: [Release, Debug]
+        configuration: [Release]
 
     runs-on: windows-latest  # For a list of available runner types, refer to 
                              # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
@@ -23,13 +23,13 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4.2.2
       with:
         fetch-depth: 0
 
     # Install the .NET Core workload
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v4.1.0
+      uses: actions/setup-dotnet@v4.2.0
       with:
         dotnet-version: 9.0.x
 
@@ -54,7 +54,7 @@ jobs:
 
     # Publish Artifacts 
     - name: 'Publish Artifacts'   
-      uses: actions/[email protected].0
+      uses: actions/[email protected].3
       with:
         name:  artifactory_${{ matrix.configuration }}
         path: ./Analogy.LogViewer.Log4jXml/bin/${{ matrix.configuration }}
@@ -64,19 +64,18 @@ jobs:
     if: ${{ github.event_name == 'push'}}    
     runs-on: windows-latest
     steps:
+      - name: Setup NuGet.exe for use with actions
+        uses: NuGet/[email protected]
       - name: 'Download Artifact'
         uses: actions/[email protected]
         with:
           name: artifactory_Release
       - name: 'Dotnet NuGet Push'
         run: |
           Get-ChildItem ./ -Filter *.nupkg |
-          Where-Object { !$_.Name.Contains('preview') } |
           ForEach-Object { dotnet nuget push $_ --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{secrets.NUGET_API_KEY}} }
         shell: pwsh
 
-      - name: Setup NuGet.exe for use with actions
-        uses: NuGet/[email protected]
 concurrency: 
   group: ${{ github.ref }}
   cancel-in-progress: true

Analogy.LogViewer.Log4jXml/Analogy.LogViewer.Log4jXml.csproj

@@ -9,7 +9,7 @@
 		<PackageProjectUrl>https://github.com/Analogy-LogViewer/Analogy.LogViewer.Log4jXml</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Analogy-LogViewer/Analogy.LogViewer.Log4jXml</RepositoryUrl>
 		<PackageReleaseNotes>Analogy Nlog Log4Jxml parser</PackageReleaseNotes>
-		<VersionPrefix>7.2.0</VersionPrefix>
+		<VersionPrefix>8.0.0</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<Company>Analogy.LogViewer</Company>
 		<PackageIcon>Log4jXml.png</PackageIcon>
@@ -27,8 +27,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.2.0" />
-		<PackageReference Include="Analogy.LogViewer.Template" Version="7.2.0" />
+		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.0.0" />
+		<PackageReference Include="Analogy.LogViewer.Template" Version="8.0.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="System.Resources.Extensions" Version="9.0.1" />
 	</ItemGroup>

Analogy.LogViewer.Log4jXml/Core/Log/LogMessage.cs

@@ -60,7 +60,7 @@ public string MessageSingleLine
         /// <summary>
         /// Time Stamp.
         /// </summary>
-        public DateTime TimeStamp { get; set; }
+        public DateTimeOffset TimeStamp { get; set; }
 
         /// <summary>
         /// Properties collection.

Analogy.LogViewer.Log4jXml/Core/Readers/Parsers/FlatLogParser.cs

@@ -53,7 +53,7 @@ private LogMessage ParseExactTemplateOrDefault(string logEvent)
             }
 
             var timestampRaw = logEvent.Substring(0, indexOfOpenBracket);
-            if (!DateTime.TryParseExact(timestampRaw, "yyyy-MM-dd HH:mm:ss.fff zzz", CultureInfo.InvariantCulture, DateTimeStyles.None, out var timestamp))
+            if (!DateTimeOffset.TryParseExact(timestampRaw, "yyyy-MM-dd HH:mm:ss.fff zzz", CultureInfo.InvariantCulture, DateTimeStyles.None, out var timestamp))
             {
                 return null;
             }

Analogy.LogViewer.Log4jXml/Core/Readers/Parsers/Log4jParser.cs

@@ -60,7 +60,7 @@ protected override LogMessage ParseLogEvent(XmlReader reader)
 
             if (long.TryParse(reader.GetAttribute("timestamp"), out var timeStamp))
             {
-                logMsg.TimeStamp = ToDateTime(timeStamp);
+                logMsg.TimeStamp = new DateTimeOffset(S1970.AddMilliseconds(timeStamp));
             }
 
             int eventDepth = reader.Depth;
@@ -136,10 +136,5 @@ protected override XmlParserContext GetXmlParserContext()
         {
             return _xmlContext;
         }
-
-        public static DateTime ToDateTime(long timeStamp)
-        {
-            return S1970.AddMilliseconds(timeStamp);
-        }
     }
 }

Analogy.LogViewer.Log4jXml/Core/Readers/Parsers/LogParserExtensions.cs

@@ -23,7 +23,7 @@ public static LogMessage TryParseLogEvent(this ILogParser logParser, string logE
                     LoggerName = defaultLogger,
                     ThreadName = "NA",
                     Message = logEvent,
-                    TimeStamp = DateTime.Now,
+                    TimeStamp = DateTimeOffset.Now,
                     LogLevel = LogLevel.Info,
                     ExceptionString = e.Message,
                 };

Analogy.LogViewer.Log4jXml/IAnalogy/OfflineDataProvider.cs

@@ -1,4 +1,5 @@
 using Analogy.Interfaces;
+using Analogy.Interfaces.DataTypes;
 using Logazmic.Core.Log;
 using Logazmic.Core.Readers;
 using Logazmic.Core.Receiver;