Add NET8 support and Set Version to 6.0.0. Fix #135

Analogy-LogViewer · Nov 15, 2023 · 2f5fd1c · 2f5fd1c
1 parent 4321b4e
commit 2f5fd1c
Show file tree

Hide file tree

Showing 55 changed files with 303 additions and 247 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -405,6 +405,9 @@ dotnet_diagnostic.MA0044.severity = error
 dotnet_diagnostic.MA0052.severity = error
 dotnet_diagnostic.SA1139.severity = error
 dotnet_diagnostic.SA1316.severity = error
+dotnet_diagnostic.SA1204.severity = none
+dotnet_diagnostic.SA1623.severity = silent
+dotnet_diagnostic.SA1615.severity = silent
 
 [*.{cs,vb}]
 dotnet_style_operator_placement_when_wrapping = beginning_of_line

diff --git a/Analogy.Interfaces.UnitTests/Analogy.Interfaces.UnitTests.csproj b/Analogy.Interfaces.UnitTests/Analogy.Interfaces.UnitTests.csproj
@@ -6,7 +6,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 		<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
 		<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
 	</ItemGroup>

diff --git a/Analogy.Interfaces.UnitTests/AnalogyInterfaceUnitTests.cs b/Analogy.Interfaces.UnitTests/AnalogyInterfaceUnitTests.cs
@@ -15,7 +15,6 @@ public void TestAnalogyLogMessageIsNotNull()
             Assert.IsNotNull(message.MethodName);
             Assert.IsNotNull(message.Module);
             Assert.IsNotNull(message.User);
-
         }
         [TestMethod]
         public void TestAdditionalProperties()
@@ -25,8 +24,6 @@ public void TestAdditionalProperties()
             message.AddOrReplaceAdditionalProperty("test", "test");
             Assert.IsNotNull(message.AdditionalProperties.Count == 1);
             Assert.IsNotNull(message.AdditionalProperties["test"] == "test");
-
-
         }
         public void TestAnalogyMessagesTypes()
         {
@@ -37,4 +34,4 @@ public void TestAnalogyMessagesTypes()
             IAnalogyLogMessage m5 = new AnalogyCriticalMessage("text", "Source");
         }
     }
-}
+}
diff --git a/Analogy.Interfaces.sln b/Analogy.Interfaces.sln
@@ -9,6 +9,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{62E073E4-94B9-4988-9FBB-5E43EE641028}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		Directory.Build.props = Directory.Build.props
+		.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
 	EndProjectSection
 EndProject
 Global

diff --git a/Analogy.Interfaces/Analogy.Interfaces.csproj b/Analogy.Interfaces/Analogy.Interfaces.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0-windows;net6.0-windows;net48;net471</TargetFrameworks>
+		<TargetFrameworks>net8.0-windows;net7.0-windows;net6.0-windows;net48;net471</TargetFrameworks>
 		<UseWindowsForms>true</UseWindowsForms>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<IncludeSymbols>true</IncludeSymbols>
@@ -15,12 +15,12 @@
 		<AssemblyName>Analogy.Interfaces</AssemblyName>
 		<RootNamespace>Analogy.Interfaces</RootNamespace>
 		<PackageId>Analogy.LogViewer.Interfaces</PackageId>
-		<VersionPrefix>5.0.3.0</VersionPrefix>
+		<VersionPrefix>6.0.0</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<Authors>Lior Banai</Authors>
 		<Product>Analogy.LogViewer.Interfaces</Product>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<Copyright>Lior Banai @ 2018-2023</Copyright>
+		<Copyright>Lior Banai @ 2018-2024</Copyright>
 		<PackageIcon>icon.png</PackageIcon>
 		<Nullable>enable</Nullable>
 		<LangVersion>latest</LangVersion>
@@ -30,16 +30,6 @@
 		<Company>Analogy.LogViewer</Company>
 		<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
 	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net471|AnyCPU'">
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net471|AnyCPU'">
-		<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<None Include="..\icon.png">
 			<Pack>True</Pack>
@@ -48,21 +38,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Build.Tasks.Git" Version="1.1.1">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
-	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net471' ">
-		<PackageReference Include="PolySharp" Version="1.13.2">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+		<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
 	</ItemGroup>
 </Project>
diff --git a/Analogy.Interfaces/AnalogyLogMessageCustomEqualityComparer.cs b/Analogy.Interfaces/AnalogyLogMessageCustomEqualityComparer.cs
@@ -42,7 +42,7 @@ public bool Equals(IAnalogyLogMessage? x, IAnalogyLogMessage? y)
                 return false;
             }
 
-            if (CompareText && ((x.Text is not null && y.Text is null) || x.Text is null && y.Text is not null) ||
+            if ((CompareText && ((x.Text is not null && y.Text is null) || (x.Text is null && y.Text is not null))) ||
                 ((x.Text is not null && y.Text is not null) && !x.Text.Equals(y.Text)))
             {
                 return false;
@@ -99,12 +99,12 @@ public bool Equals(IAnalogyLogMessage? x, IAnalogyLogMessage? y)
             }
             if (CompareParameters)
             {
-                if (x.AdditionalProperties is null && y.AdditionalProperties != null ||
-                    x.AdditionalProperties != null && y.AdditionalProperties is null)
+                if ((x.AdditionalProperties is null && y.AdditionalProperties != null) ||
+                    (x.AdditionalProperties != null && y.AdditionalProperties is null))
                 {
                     return false;
                 }
-                return x.AdditionalProperties is null && y.AdditionalProperties is null ||
+                return (x.AdditionalProperties is null && y.AdditionalProperties is null) ||
                        x.AdditionalProperties.SequenceEqual(y.AdditionalProperties);
             }
 
@@ -142,7 +142,7 @@ public int GetHashCode(IAnalogyLogMessage obj)
                     hashCode = (hashCode * 397) ^ (obj.FileName != null ? obj.FileName.GetHashCode() : 0);
                 }
                 if (CompareLineNumber)
-                { hashCode = (hashCode * 397) ^ (int) obj.LineNumber; }
+                { hashCode = (hashCode * 397) ^ (int)obj.LineNumber; }
 
                 if (CompareClass)
                 {
@@ -170,7 +170,7 @@ public int GetHashCode(IAnalogyLogMessage obj)
                 }
                 if (CompareParameters)
                 {
-                    if (obj.AdditionalProperties != null && obj.AdditionalProperties.Any())
+                    if (obj.AdditionalProperties is { Count: > 0 })
                     {
                         foreach (var parameter in obj.AdditionalProperties)
                         {
@@ -187,4 +187,4 @@ public int GetHashCode(IAnalogyLogMessage obj)
             }
         }
     }
-}
+}
diff --git a/Analogy.Interfaces/AnalogyLogMessageCustomEqualityOptedInComparer.cs b/Analogy.Interfaces/AnalogyLogMessageCustomEqualityOptedInComparer.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Analogy.Interfaces
 {
@@ -25,7 +22,6 @@ public class AnalogyLogMessageCustomEqualityOptedInComparer : IEqualityComparer<
 
         public AnalogyLogMessageCustomEqualityOptedInComparer()
         {
-
         }
 
         public AnalogyLogMessageCustomEqualityOptedInComparer(bool compareDate, bool compareId, bool compareText,
@@ -71,7 +67,7 @@ public bool Equals(IAnalogyLogMessage? x, IAnalogyLogMessage? y)
                 return false;
             }
 
-            if (CompareText && ((x.Text is not null && y.Text is null) || x.Text is null && y.Text is not null) ||
+            if ((CompareText && ((x.Text is not null && y.Text is null) || (x.Text is null && y.Text is not null))) ||
                 ((x.Text is not null && y.Text is not null) && !x.Text.Equals(y.Text)))
             {
                 return false;
@@ -128,12 +124,12 @@ public bool Equals(IAnalogyLogMessage? x, IAnalogyLogMessage? y)
             }
             if (CompareParameters)
             {
-                if (x.AdditionalProperties is null && y.AdditionalProperties != null ||
-                    x.AdditionalProperties != null && y.AdditionalProperties is null)
+                if ((x.AdditionalProperties is null && y.AdditionalProperties != null) ||
+                    (x.AdditionalProperties != null && y.AdditionalProperties is null))
                 {
                     return false;
                 }
-                return x.AdditionalProperties is null && y.AdditionalProperties is null ||
+                return (x.AdditionalProperties is null && y.AdditionalProperties is null) ||
                        x.AdditionalProperties.SequenceEqual(y.AdditionalProperties);
             }
 
@@ -199,7 +195,7 @@ public int GetHashCode(IAnalogyLogMessage obj)
                 }
                 if (CompareParameters)
                 {
-                    if (obj.AdditionalProperties != null && obj.AdditionalProperties.Any())
+                    if (obj.AdditionalProperties != null && obj.AdditionalProperties.Count > 0)
                     {
                         foreach (var parameter in obj.AdditionalProperties)
                         {
@@ -216,4 +212,4 @@ public int GetHashCode(IAnalogyLogMessage obj)
             }
         }
     }
-}
+}
diff --git a/Analogy.Interfaces/DataTypes/AnalogyColumnFilter.cs b/Analogy.Interfaces/DataTypes/AnalogyColumnFilter.cs
@@ -1,16 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Analogy.Interfaces.DataTypes
+namespace Analogy.Interfaces.DataTypes
 {
     public struct AnalogyColumnFilter
     {
         public string ColumnName { get; set; }
         public string FilterValue { get; set; }
         public AnalogyColumnFilterType FilterType { get; set; }
-
     }
-}
+}
diff --git a/Analogy.Interfaces/DataTypes/AnalogyColumnInfo.cs b/Analogy.Interfaces/DataTypes/AnalogyColumnInfo.cs
@@ -15,4 +15,4 @@ public AnalogyColumnInfo(string columnCaption, string columnName, Type columnTyp
             ColumnType = columnType;
         }
     }
-}
+}
diff --git a/Analogy.Interfaces/DataTypes/AnalogyFileReadProgress.cs b/Analogy.Interfaces/DataTypes/AnalogyFileReadProgress.cs
@@ -3,14 +3,17 @@
     public struct AnalogyFileReadProgress
     {
         public AnalogyFileReadProgressType ProgressType { get; }
+
         /// <summary>
         ///Number of items processed in this report (normally one message per report).
         /// </summary>
         public long TotalProcessedInThisReport { get; }
+
         /// <summary>
         ///Total processed entries (lines or messages)
         /// </summary>
         public long TotalProcessed { get; }
+
         /// <summary>
         ///Total entries (lines or messages) in file
         /// </summary>
@@ -24,4 +27,4 @@ public AnalogyFileReadProgress(AnalogyFileReadProgressType progressType, long to
             TotalProcessedInThisReport = totalProcessedInThisReport;
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
                 ColumnType = columnType;
             }
         }
-    }
+    }