Migrate the main project to the latest version of C#

Author: traf72

ExcelReportGenerator.Tests/TestDb.mdf

@@ -1,57 +1,55 @@
 using ExcelReportGenerator.Enums;
-using System;
 
-namespace ExcelReportGenerator.Attributes
+namespace ExcelReportGenerator.Attributes;
+
+/// <summary>
+/// An attribute that allows you to configure excel column output more flexibly
+/// </summary>
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
+public class ExcelColumnAttribute : Attribute
 {
-    /// <summary>
-    /// An attribute that allows you to configure excel column output more flexibly
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    public class ExcelColumnAttribute : Attribute
+    public ExcelColumnAttribute()
     {
-        public ExcelColumnAttribute()
-        {
-            AggregateFunction = AggregateFunction.NoAggregation;
-        }
-
-        /// <summary>
-        /// Column caption which will be displayed in excel sheet
-        /// </summary>
-        public string Caption { get; set; }
-
-        /// <summary>
-        /// Column width if panel is vertical or row height if panel is horizontal
-        /// </summary>
-        public double Width { get; set; }
-
-        /// <summary>
-        /// Aggregate function applied to this column
-        /// </summary>
-        public AggregateFunction AggregateFunction { get; set; }
-
-        /// <summary>
-        /// Do not apply an aggregate function even it is specified
-        /// </summary>
-        public bool NoAggregate { get; set; }
-
-        /// <summary>
-        /// Display format for number and date columns
-        /// </summary>
-        public string DisplayFormat { get; set; }
-
-        /// <summary>
-        /// Do not apply display format even it is specified
-        /// </summary>
-        public bool IgnoreDisplayFormat { get; set; }
-
-        /// <summary>
-        /// Adjust to content column width if panel is vertical or row height if panel is horizontal
-        /// </summary>
-        public bool AdjustToContent { get; set; }
-
-        /// <summary>
-        /// Order in which the column appears in Excel
-        /// </summary>
-        public int Order { get; set; }
+        AggregateFunction = AggregateFunction.NoAggregation;
     }
+
+    /// <summary>
+    /// Column caption which will be displayed in excel sheet
+    /// </summary>
+    public string Caption { get; set; }
+
+    /// <summary>
+    /// Column width if panel is vertical or row height if panel is horizontal
+    /// </summary>
+    public double Width { get; set; }
+
+    /// <summary>
+    /// Aggregate function applied to this column
+    /// </summary>
+    public AggregateFunction AggregateFunction { get; set; }
+
+    /// <summary>
+    /// Do not apply an aggregate function even it is specified
+    /// </summary>
+    public bool NoAggregate { get; set; }
+
+    /// <summary>
+    /// Display format for number and date columns
+    /// </summary>
+    public string DisplayFormat { get; set; }
+
+    /// <summary>
+    /// Do not apply display format even it is specified
+    /// </summary>
+    public bool IgnoreDisplayFormat { get; set; }
+
+    /// <summary>
+    /// Adjust to content column width if panel is vertical or row height if panel is horizontal
+    /// </summary>
+    public bool AdjustToContent { get; set; }
+
+    /// <summary>
+    /// Order in which the column appears in Excel
+    /// </summary>
+    public int Order { get; set; }
 }

ExcelReportGenerator.Tests/TestDb_log.ldf

@@ -1,11 +1,10 @@
-using System;
+namespace ExcelReportGenerator.Attributes;
 
-namespace ExcelReportGenerator.Attributes
+/// <summary>
+/// Marks panel property which can be populated from excel
+/// </summary>
+[AttributeUsage(AttributeTargets.Property)]
+internal class ExternalPropertyAttribute : Attribute
 {
-    // Marks panel property which can be populated from excel
-    [AttributeUsage(AttributeTargets.Property)]
-    internal class ExternalPropertyAttribute : Attribute
-    {
-        public Type Converter { get; set; }
-    }
+    public Type Converter { get; set; }
 }

ExcelReportGenerator/Attributes/ExcelColumnAttribute.cs

@@ -1,12 +1,9 @@
-using System;
+namespace ExcelReportGenerator.Attributes;
 
-namespace ExcelReportGenerator.Attributes
+/// <summary>
+/// An attribute that allows you to mark property as no excel column
+/// </summary>
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
+public class NoExcelColumnAttribute : Attribute
 {
-    /// <summary>
-    /// An attribute that allows you to mark property as no excel column
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    public class NoExcelColumnAttribute : Attribute
-    {
-    }
 }

ExcelReportGenerator/Attributes/ExternalPropertyAttribute.cs

@@ -1,21 +1,18 @@
-using System;
+namespace ExcelReportGenerator.Attributes;
 
-namespace ExcelReportGenerator.Attributes
+/// <summary>
+/// An attribute that allows you to replace null-values to more readable
+/// </summary>
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
+public class NullValueAttribute : Attribute
 {
-    /// <summary>
-    /// An attribute that allows you to replace null-values to more readable
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    public class NullValueAttribute : Attribute
+    public NullValueAttribute(object value)
     {
-        public NullValueAttribute(object value)
-        {
-            Value = value;
-        }
-
-        /// <summary>
-        /// The value that will be write to Excel if original value is null
-        /// </summary>
-        public object Value { get; }
+        Value = value;
     }
+
+    /// <summary>
+    /// The value that will be write to Excel if original value is null
+    /// </summary>
+    public object Value { get; }
 }

ExcelReportGenerator/Attributes/NoExcelColumnAttribute.cs

@@ -1,7 +1,6 @@
-namespace ExcelReportGenerator
+namespace ExcelReportGenerator;
+
+internal static class Constants
 {
-    internal static class Constants
-    {
-        public const string InvalidTemplateMessage = "Template \"{0}\" is invalid";
-    }
+    public const string InvalidTemplateMessage = "Template \"{0}\" is invalid";
 }

ExcelReportGenerator/Attributes/NullValueAttribute.cs

@@ -1,6 +1,5 @@
-namespace ExcelReportGenerator.Converters.ExternalPropertiesConverters
+namespace ExcelReportGenerator.Converters.ExternalPropertiesConverters;
+
+internal interface IExternalPropertyConverter<out TOut> : IGenericConverter<string, TOut>
 {
-    internal interface IExternalPropertyConverter<out TOut> : IGenericConverter<string, TOut>
-    {
-    }
 }

ExcelReportGenerator/Constants.cs

@@ -1,31 +1,29 @@
 using ExcelReportGenerator.Enums;
 using ExcelReportGenerator.Helpers;
-using System;
 
-namespace ExcelReportGenerator.Converters.ExternalPropertiesConverters
+namespace ExcelReportGenerator.Converters.ExternalPropertiesConverters;
+
+internal class PanelTypeConverter : IExternalPropertyConverter<PanelType>
 {
-    internal class PanelTypeConverter : IExternalPropertyConverter<PanelType>
+    public PanelType Convert(string panelType)
     {
-        public PanelType Convert(string panelType)
+        if (string.IsNullOrWhiteSpace(panelType))
         {
-            if (string.IsNullOrWhiteSpace(panelType))
-            {
-                throw new ArgumentException("Type property cannot be null or empty");
-            }
-
-            try
-            {
-                return EnumHelper.Parse<PanelType>(panelType.Trim());
-            }
-            catch (ArgumentException e)
-            {
-                throw new ArgumentException($"Value \"{panelType}\" is invalid for Type property", e);
-            }
+            throw new ArgumentException("Type property cannot be null or empty");
         }
 
-        object IConverter.Convert(object input)
+        try
+        {
+            return EnumHelper.Parse<PanelType>(panelType.Trim());
+        }
+        catch (ArgumentException e)
         {
-            return Convert((string)input);
+            throw new ArgumentException($"Value \"{panelType}\" is invalid for Type property", e);
         }
     }
+
+    object IConverter.Convert(object input)
+    {
+        return Convert((string)input);
+    }
 }

ExcelReportGenerator/Converters/ExternalPropertiesConverters/IExternalPropertyConverter.cs

@@ -1,27 +1,24 @@
-using System;
+namespace ExcelReportGenerator.Converters.ExternalPropertiesConverters;
 
-namespace ExcelReportGenerator.Converters.ExternalPropertiesConverters
+internal class RenderPriorityConverter : IExternalPropertyConverter<int>
 {
-    internal class RenderPriorityConverter : IExternalPropertyConverter<int>
+    public int Convert(string input)
     {
-        public int Convert(string input)
+        if (string.IsNullOrWhiteSpace(input))
         {
-            if (string.IsNullOrWhiteSpace(input))
-            {
-                throw new ArgumentException("RenderPriority property cannot be null or empty");
-            }
-
-            if (int.TryParse(input, out int renderPriority))
-            {
-                return renderPriority;
-            }
-
-            throw new ArgumentException($"Cannot convert value \"{input}\" to int");
+            throw new ArgumentException("RenderPriority property cannot be null or empty");
         }
 
-        object IConverter.Convert(object input)
+        if (int.TryParse(input, out int renderPriority))
         {
-            return Convert((string)input);
+            return renderPriority;
         }
+
+        throw new ArgumentException($"Cannot convert value \"{input}\" to int");
+    }
+
+    object IConverter.Convert(object input)
+    {
+        return Convert((string)input);
     }
 }