Merge pull request #38 from JordiCorbilla/feature-1

upgrade to .net 8
JordiCorbilla · Jun 10, 2024 · b58cd11 · b58cd11
2 parents a9ddf01 + 46554e8
commit b58cd11
Show file tree

Hide file tree

Showing 22 changed files with 211 additions and 210 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2023 Jordi Corbilla
+Copyright (c) 2020-2024 Jordi Corbilla
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/table.lib.tests/PivotTests.cs b/table.lib.tests/PivotTests.cs
@@ -10,18 +10,15 @@ public static List<TestClass> GetSampleOutput()
         {
             var list = new List<TestClass>
             {
-                new TestClass
-                {
+                new() {
                     Field1 = 321121, Field2 = "AA", Field3 = 2121.32m, Field4 = true,
                     Field5 = new DateTime(1970, 1, 1), Field6 = 34.43
                 },
-                new TestClass
-                {
+                new() {
                     Field1 = 32321, Field2 = "BB", Field3 = 21111111.32m, Field4 = true,
                     Field5 = new DateTime(1970, 1, 1), Field6 = 34.43
                 },
-                new TestClass
-                {
+                new() {
                     Field1 = 321, Field2 = "CC", Field3 = 2121.32m, Field4 = true,
                     Field5 = new DateTime(1970, 1, 1), Field6 = 34.43
                 }

diff --git a/table.lib.tests/table.lib.tests.csproj b/table.lib.tests/table.lib.tests.csproj
@@ -1,18 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" />
-	  <PackageReference Include="Dapper" Version="2.0.123" />
-	  <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+	  <PackageReference Include="Dapper" Version="2.1.35" />
+	  <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/table.lib/Base.cs b/table.lib/Base.cs
@@ -1,6 +1,6 @@
 //MIT License
 
-//Copyright (c) 2020-2023 Jordi Corbilla
+//Copyright (c) 2020-2024 Jordi Corbilla
 
 //Permission is hereby granted, free of charge, to any person obtaining a copy
 //of this software and associated documentation files (the "Software"), to deal
@@ -30,20 +30,18 @@ public class Base<T>
         public string ClassName { get; set; }
         public List<PropertyName> PropertyNames { get; set; }
         public Dictionary<string, int> MaxWidth { get; set; }
-        public Dictionary<string, string> ColumnNameOverrides { get; set; } = new Dictionary<string, string>();
-        public Dictionary<string, bool> ColumnFilter { get; set; } = new Dictionary<string, bool>();
+        public Dictionary<string, string> ColumnNameOverrides { get; set; } = [];
+        public Dictionary<string, bool> ColumnFilter { get; set; } = [];
         public FilterAction ColumnAction { get; set; } = FilterAction.Exclude;
         public ConsoleColor BackgroundColor { get; set; } = ConsoleColor.Black;
         public ConsoleColor ForegroundColor { get; set; } = ConsoleColor.Green;
-        public List<T> Items { get; set; } = new List<T>();
+        public List<T> Items { get; set; } = [];
 
-        public Dictionary<string, List<HighlightOperator>> Operation { get; set; } =
-            new Dictionary<string, List<HighlightOperator>>();
+        public Dictionary<string, List<HighlightOperator>> Operation { get; set; } = [];
 
         public Options Options { get; set; } = new Options();
 
-        public Dictionary<string, TextJustification> ColumnTextJustification { get; set; } =
-            new Dictionary<string, TextJustification>();
+        public Dictionary<string, TextJustification> ColumnTextJustification { get; set; } = [];
 
         public string GetValue(T item, PropertyName property)
         {
@@ -52,7 +50,7 @@ public string GetValue(T item, PropertyName property)
             if (property.IsCollection)
             {
                 var prop = item.GetType().GetProperties()[property.PropertyIndex];
-                value = prop.GetValue(item, new object[] { property.Index });
+                value = prop.GetValue(item, [property.Index]);
             }
             else
             {
@@ -70,7 +68,7 @@ public object GetOriginalValue(T item, PropertyName property)
             if (property.IsCollection)
             {
                 var prop = item.GetType().GetProperties()[property.PropertyIndex];
-                value = prop.GetValue(item, new object[] { property.Index });
+                value = prop.GetValue(item, [property.Index]);
             }
             else
             {
@@ -129,8 +127,8 @@ public void ConsoleRender(string value, string column)
             Console.ForegroundColor = ForegroundColor;
 
             if (Operation != null)
-                if (Operation.ContainsKey(column))
-                    foreach (var item in Operation[column])
+                if (Operation.TryGetValue(column, out List<HighlightOperator> operation))
+                    foreach (var item in operation)
                         switch (item.Type)
                         {
                             case HighlightType.Decimal:

diff --git a/table.lib/CsvOptionType.cs b/table.lib/CsvOptionType.cs
@@ -1,6 +1,6 @@
 //MIT License
 
-//Copyright (c) 2020-2023 Jordi Corbilla
+//Copyright (c) 2020-2024 Jordi Corbilla
 
 //Permission is hereby granted, free of charge, to any person obtaining a copy
 //of this software and associated documentation files (the "Software"), to deal

diff --git a/table.lib/DbTable.cs b/table.lib/DbTable.cs
@@ -1,6 +1,6 @@
 //MIT License
 
-//Copyright (c) 2020-2023 Jordi Corbilla
+//Copyright (c) 2020-2024 Jordi Corbilla
 
 //Permission is hereby granted, free of charge, to any person obtaining a copy
 //of this software and associated documentation files (the "Software"), to deal
@@ -33,13 +33,13 @@ public class DbTable
         public List<PropertyName> PropertyNames { get; set; }
         public Dictionary<string, int> MaxWidth { get; set; }
         public Options Options { get; set; } = new Options();
-        public Dictionary<string, bool> ColumnFilter { get; set; } = new Dictionary<string, bool>();
+        public Dictionary<string, bool> ColumnFilter { get; set; } = [];
         public FilterAction ColumnAction { get; set; } = FilterAction.Exclude;
 
         public DbTable(IEnumerable<IDictionary<string, object>> list, Options options = null)
         {
-            PropertyNames = new List<PropertyName>();
-            MaxWidth = new Dictionary<string, int>();
+            PropertyNames = [];
+            MaxWidth = [];
             Items = list;
             if (options != null)
                 Options = options;

diff --git a/table.lib/FilterAction.cs b/table.lib/FilterAction.cs
@@ -1,6 +1,6 @@
 //MIT License
 
-//Copyright (c) 2020-2023 Jordi Corbilla
+//Copyright (c) 2020-2024 Jordi Corbilla
 
 //Permission is hereby granted, free of charge, to any person obtaining a copy
 //of this software and associated documentation files (the "Software"), to deal

diff --git a/table.lib/HighlightOperation.cs b/table.lib/HighlightOperation.cs
@@ -1,6 +1,6 @@
 //MIT License
 
-//Copyright (c) 2020-2023 Jordi Corbilla
+//Copyright (c) 2020-2024 Jordi Corbilla
 
 //Permission is hereby granted, free of charge, to any person obtaining a copy
 //of this software and associated documentation files (the "Software"), to deal

diff --git a/table.lib/HighlightOperator.cs b/table.lib/HighlightOperator.cs
@@ -1,6 +1,6 @@
 //MIT License
 
-//Copyright (c) 2020-2023 Jordi Corbilla
+//Copyright (c) 2020-2024 Jordi Corbilla
 
 //Permission is hereby granted, free of charge, to any person obtaining a copy
 //of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,7 @@
 
 //MIT License
 
-//Copyright (c) 2020-2023 Jordi Corbilla
+//Copyright (c) 2020-2024 Jordi Corbilla
 
 //Permission is hereby granted, free of charge, to any person obtaining a copy
 //of this software and associated documentation files (the "Software"), to deal

diff --git a/table.lib/HighlightType.cs b/table.lib/HighlightType.cs
@@ -1,6 +1,6 @@
 //MIT License
 
-//Copyright (c) 2020-2023 Jordi Corbilla
+//Copyright (c) 2020-2024 Jordi Corbilla
 
 //Permission is hereby granted, free of charge, to any person obtaining a copy
 //of this software and associated documentation files (the "Software"), to deal

diff --git a/table.lib/Options.cs b/table.lib/Options.cs
@@ -1,6 +1,6 @@
 //MIT License
 
-//Copyright (c) 2020-2023 Jordi Corbilla
+//Copyright (c) 2020-2024 Jordi Corbilla
 
 //Permission is hereby granted, free of charge, to any person obtaining a copy
 //of this software and associated documentation files (the "Software"), to deal

diff --git a/table.lib/Pivot.cs b/table.lib/Pivot.cs
@@ -12,20 +12,20 @@ public class Pivot<T>
         public List<PropertyName> PropertyNames { get; set; }
         public int MaxWidthProperties { get; set; }
         public Dictionary<int, int> MaxWidthData { get; set; }
-        public Dictionary<string, string> ColumnNameOverrides { get; set; } = new Dictionary<string, string>();
-        public Dictionary<string, bool> ColumnFilter { get; set; } = new Dictionary<string, bool>();
+        public Dictionary<string, string> ColumnNameOverrides { get; set; } = [];
+        public Dictionary<string, bool> ColumnFilter { get; set; } = [];
         public FilterAction ColumnAction { get; set; } = FilterAction.Exclude;
         public ConsoleColor BackgroundColor { get; set; } = ConsoleColor.Black;
         public ConsoleColor ForegroundColor { get; set; } = ConsoleColor.Green;
-        public List<T> Items { get; set; } = new List<T>();
+        public List<T> Items { get; set; } = [];
 
         public Dictionary<string, List<HighlightOperator>> Operation { get; set; } =
-            new Dictionary<string, List<HighlightOperator>>();
+            [];
 
         public Options Options { get; set; } = new Options();
 
         public Dictionary<string, TextJustification> ColumnTextJustification { get; set; } =
-            new Dictionary<string, TextJustification>();
+            [];
 
         /// <summary>
         ///     Where the magic happens.
@@ -35,11 +35,11 @@ public class Pivot<T>
         /// <param name="options"></param>
         public Pivot(List<T> list)
         {
-            Data = new Dictionary<string, List<DynamicType>>();
+            Data = [];
 
-            PropertyNames = new List<PropertyName>();
+            PropertyNames = [];
             MaxWidthProperties = "Field".Length;
-            MaxWidthData = new Dictionary<int, int>();
+            MaxWidthData = [];
             Items = list;
             var properties = typeof(T).GetProperties();
             ClassName = typeof(T).Name;
@@ -48,7 +48,7 @@ public Pivot(List<T> list)
                 PropertyNames.Add(new PropertyName(property.Name));
                 if (property.Name.Length > MaxWidthProperties)
                     MaxWidthProperties = property.Name.Length;
-                Data.Add(property.Name, new List<DynamicType>());
+                Data.Add(property.Name, []);
             }
 
             var index = 0;
@@ -201,7 +201,7 @@ public string GetValue(T item, PropertyName property)
             if (property.IsCollection)
             {
                 var prop = item.GetType().GetProperties()[property.PropertyIndex];
-                value = prop.GetValue(item, new object[] { property.Index });
+                value = prop.GetValue(item, [property.Index]);
             }
             else
             {

diff --git a/table.lib/PropertyName.cs b/table.lib/PropertyName.cs
@@ -1,6 +1,6 @@
 //MIT License
 
-//Copyright (c) 2020-2023 Jordi Corbilla
+//Copyright (c) 2020-2024 Jordi Corbilla
 
 //Permission is hereby granted, free of charge, to any person obtaining a copy
 //of this software and associated documentation files (the "Software"), to deal

diff --git a/table.lib/StringExtensions.cs b/table.lib/StringExtensions.cs
@@ -1,6 +1,6 @@
 //MIT License
 
-//Copyright (c) 2020-2023 Jordi Corbilla
+//Copyright (c) 2020-2024 Jordi Corbilla
 
 //Permission is hereby granted, free of charge, to any person obtaining a copy
 //of this software and associated documentation files (the "Software"), to deal