Format with dotnet format (#9)

Shane32 · Dec 8, 2023 · edd6fde · edd6fde
1 parent 68a4c01
commit edd6fde
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 73 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,11 +21,15 @@ jobs:
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
+      - name: Install libgdiplus (Ubuntu only)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgdiplus
       - name: Use .NET Core SDK
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: |
-            2.1.x
             3.1.x
             5.0.x
             6.0.x

diff --git a/src/Shane32.ExcelLinq.Tests/Shane32.ExcelLinq.Tests.csproj b/src/Shane32.ExcelLinq.Tests/Shane32.ExcelLinq.Tests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net462;net48</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net462;net48</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Shane32.ExcelLinq/Builders/ColumnModelBuilder.cs b/src/Shane32.ExcelLinq/Builders/ColumnModelBuilder.cs
@@ -23,17 +23,21 @@ public class ColumnModelBuilder<T, TReturn> : IColumnModel
 
         public ColumnModelBuilder(SheetModelBuilder<T> sheetModelBuilder, MemberExpression memberExpression, string name)
         {
-            if (sheetModelBuilder == null) throw new ArgumentNullException(nameof(sheetModelBuilder));
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullException(nameof(name));
+            if (sheetModelBuilder == null)
+                throw new ArgumentNullException(nameof(sheetModelBuilder));
+            if (string.IsNullOrWhiteSpace(name))
+                throw new ArgumentNullException(nameof(name));
             _member = memberExpression.Member;
             if (_member is PropertyInfo propertyInfo) {
-                if (!propertyInfo.CanRead) throw new ArgumentOutOfRangeException(nameof(memberExpression), "This property cannot be read from");
-                if (!propertyInfo.CanWrite) throw new ArgumentOutOfRangeException(nameof(memberExpression), "This property cannot be written from");
-            // A MemberExpression can only represent a property or a field
-            /*
-            } else if (!(_member is FieldInfo)) {
-                throw new ArgumentOutOfRangeException(nameof(memberExpression), "This member is not a property or field");
-            */
+                if (!propertyInfo.CanRead)
+                    throw new ArgumentOutOfRangeException(nameof(memberExpression), "This property cannot be read from");
+                if (!propertyInfo.CanWrite)
+                    throw new ArgumentOutOfRangeException(nameof(memberExpression), "This property cannot be written from");
+                // A MemberExpression can only represent a property or a field
+                /*
+                } else if (!(_member is FieldInfo)) {
+                    throw new ArgumentOutOfRangeException(nameof(memberExpression), "This member is not a property or field");
+                */
             }
             if (sheetModelBuilder._columns.Any(x => x.Member == _member))
                 throw new InvalidOperationException("This column has already been added to the sheet");
@@ -45,7 +49,8 @@ public ColumnModelBuilder(SheetModelBuilder<T> sheetModelBuilder, MemberExpressi
 
         public ColumnModelBuilder<T, TReturn> AlternateName(string name)
         {
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullException(nameof(name));
+            if (string.IsNullOrWhiteSpace(name))
+                throw new ArgumentNullException(nameof(name));
             name = name.Trim();
             _sheetModelBuilder._columnDictionary.Add(name.ToLower(), this);
             _columnAlternateNames.Add(name);

diff --git a/src/Shane32.ExcelLinq/Builders/ExcelModelBuilder.cs b/src/Shane32.ExcelLinq/Builders/ExcelModelBuilder.cs
@@ -1,7 +1,7 @@
-using Shane32.ExcelLinq.Models;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Shane32.ExcelLinq.Models;
 
 namespace Shane32.ExcelLinq.Builders
 {
@@ -19,7 +19,8 @@ public SheetModelBuilder<T> Sheet<T>() where T : new()
 
         public SheetModelBuilder<T> Sheet<T>(string name) where T : new()
         {
-            if (name == null) throw new ArgumentNullException(nameof(name));
+            if (name == null)
+                throw new ArgumentNullException(nameof(name));
             var trimmedName = name.Trim();
             for (int i = 0; i < _sheets.Count; i++) {
                 if (_sheets[i].Type == typeof(T) && _sheets[i].Name == trimmedName) {

diff --git a/src/Shane32.ExcelLinq/Builders/SheetModelBuilder.cs b/src/Shane32.ExcelLinq/Builders/SheetModelBuilder.cs
@@ -23,7 +23,8 @@ public class SheetModelBuilder<T> : ISheetModel, IColumnModelLookup
         public SheetModelBuilder(ExcelModelBuilder excelModelBuilder, string name)
         {
             _excelModelBuilder = excelModelBuilder ?? throw new ArgumentNullException(nameof(name));
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullException(nameof(name));
+            if (string.IsNullOrWhiteSpace(name))
+                throw new ArgumentNullException(nameof(name));
             _sheetName = name.Trim();
             excelModelBuilder._sheetDictionary.Add(_sheetName.ToLower(), this);
             excelModelBuilder._sheets.Add(this);
@@ -33,7 +34,8 @@ public SheetModelBuilder(ExcelModelBuilder excelModelBuilder, string name)
 
         public SheetModelBuilder<T> AlternateName(string name)
         {
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullException(nameof(name));
+            if (string.IsNullOrWhiteSpace(name))
+                throw new ArgumentNullException(nameof(name));
             name = name.Trim();
             _excelModelBuilder._sheetDictionary.Add(name.ToLower(), this);
             _sheetAlternateNames.Add(name);
@@ -50,7 +52,8 @@ public SheetModelBuilder<T> AlternateName(string name)
 
         public ColumnModelBuilder<T, TReturn> Column<TReturn>(Expression<Func<T, TReturn>> memberAccessor, string name)
         {
-            if (name == null) throw new ArgumentNullException(nameof(name));
+            if (name == null)
+                throw new ArgumentNullException(nameof(name));
             if (memberAccessor.Body is MemberExpression memberExpression) {
                 var trimmedName = name.Trim();
                 for (int i = 0; i < _columns.Count; i++) {