net7.0

mustaddon · Nov 9, 2022 · 78a58d4 · 78a58d4
1 parent 8bd9170
commit 78a58d4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/ArrayToExcel/ArrayToExcel.cs b/ArrayToExcel/ArrayToExcel.cs
@@ -230,7 +230,7 @@ static CellValue GetCellValue(object? value)
             if (type == typeof(float))
                 return new(((float)value).ToString(_cultureInfo));
 
-            return new(_invalidXmlChars.Replace(value.ToString(), string.Empty));
+            return new(_invalidXmlChars.Replace(value.ToString()!, string.Empty));
         }
 
         static InlineString GetInlineString(string value)

diff --git a/ArrayToExcel/ArrayToExcel.csproj b/ArrayToExcel/ArrayToExcel.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0;net6.0;net7.0</TargetFrameworks>
 	<LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\ArrayToExcel.snk</AssemblyOriginatorKeyFile>
-	<AssemblyVersion>2.2.0</AssemblyVersion>
-    <FileVersion>2.2.0</FileVersion>
-    <Version>2.2.0</Version>
+	<AssemblyVersion>2.2.1</AssemblyVersion>
+    <FileVersion>2.2.1</FileVersion>
+    <Version>2.2.1</Version>
 	<Company></Company>
     <Authors>Leonid Salavatov</Authors>
     <Copyright>Leonid Salavatov 2022</Copyright>
     <PackageId>ArrayToExcel</PackageId>
     <Product>ArrayToExcel</Product>
     <Title>ArrayToExcel</Title>
     <Description>Create Excel from Array (List, DataTable, DataSet, ...)</Description>
-    <PackageTags>excel xlsx array2excel arraytoexcel array list dataset datatable convert map mapping dotnet</PackageTags>
+    <PackageTags>excel xlsx array2excel arraytoexcel array list dataset datatable convert map mapping</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/mustaddon/ArrayToExcel</PackageProjectUrl>
     <RepositoryUrl>https://github.com/mustaddon/ArrayToExcel</RepositoryUrl>

diff --git a/ArrayToExcel/SchemaBuilder.cs b/ArrayToExcel/SchemaBuilder.cs
@@ -129,15 +129,20 @@ private List<ColumnSchema> DefaultColumns(IEnumerable items)
 
                 var result = new List<ColumnSchema>();
 
-                while (dict?.MoveNext() == true)
-                {
-                    var key = dict.Key;
-                    result.Add(new()
+                if(dict != null)
+                    while (dict.MoveNext() == true)
                     {
-                        Name = key.ToString(),
-                        Value = new(x => (x as IDictionary)?[key]),
-                    });
-                }
+                        var key = dict.Key;
+
+                        if (key == null)
+                            continue;
+
+                        result.Add(new()
+                        {
+                            Name = key.ToString()!,
+                            Value = new(x => (x as IDictionary)?[key]),
+                        });
+                    }
 
                 return result;
             }

diff --git a/Examples/Example.ConsoleApp/Example.ConsoleApp.csproj b/Examples/Example.ConsoleApp/Example.ConsoleApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	<LangVersion>latest</LangVersion>
   </PropertyGroup>