Update Solution to .NET 6

changhuixu · changhuixu · commit 1fed6281d5b5 · 2022-09-13T09:11:18.000-05:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - 'v*.*.*'
 
@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@main
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 3.1.100
+        dotnet-version: '6.0.x'
     - name: Generate coverage report
       run: |
         printenv
diff --git a/uiowa.DelimitedDataHelper.Tests/CsvFileTests.cs b/uiowa.DelimitedDataHelper.Tests/CsvFileTests.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.IO;
-using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using uiowa.DelimitedDataHelper.Csv;
 using uiowa.DelimitedDataHelper.Tests.TestModels;
 
 namespace uiowa.DelimitedDataHelper.Tests
@@ -46,10 +42,8 @@ public void ShouldReadAndWriteCsvCorrectly()
         [TestMethod]
         public void ShouldThrowExceptionWhenCsvHasExtraColumn()
         {
-            Action action = () => _ = new CsvFile(_input2)
-                .SkipNRows(1)
-                .GetData<Contact>().ToList();
-            var e = Assert.ThrowsException<IndexOutOfRangeException>(action);
+            var e = Assert.ThrowsException<IndexOutOfRangeException>(() =>
+                _ = new CsvFile(_input2).SkipNRows(1).GetData<Contact>().ToList());
             Assert.AreEqual("Index was outside the bounds of the array. DataRow: \"Johnson\",\"ABC\",\"johnson@abc.com\"", e.Message);
         }
 
@@ -58,7 +52,7 @@ public void ShouldConvertToString()
         {
             var dataString = new CsvFile(_input)
                 .SkipNRows(1)
-                .GetData<Contact>().AsString();
+                .GetData<Contact>().AsCsvString();
             var result1 = File.ReadAllLines(_input).ToArray();
             var result2 = dataString.Split(Environment.NewLine).Where(x => !string.IsNullOrWhiteSpace(x)).ToArray();
             CollectionAssert.AreEqual(result2, result1);
diff --git a/uiowa.DelimitedDataHelper.Tests/PipeDelimitedFileTests.cs b/uiowa.DelimitedDataHelper.Tests/PipeDelimitedFileTests.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.IO;
-using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using uiowa.DelimitedDataHelper.Pipe;
+﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
 using uiowa.DelimitedDataHelper.Tests.TestModels;
 
 namespace uiowa.DelimitedDataHelper.Tests
@@ -37,10 +33,8 @@ public void ShouldReadAndWritePipeDelimitedFileCorrectly()
         [TestMethod]
         public void ShouldThrowExceptionWhenWrongColumnNumber()
         {
-            Action action = () => _ = new PipeDelimitedFile(_input2)
-                .SkipNRows(1)
-                .GetData<Contact>().ToList();
-            var e = Assert.ThrowsException<IndexOutOfRangeException>(action);
+            var e = Assert.ThrowsException<IndexOutOfRangeException>(() =>
+                _ = new PipeDelimitedFile(_input2).SkipNRows(1).GetData<Contact>().ToList());
             Assert.AreEqual("Index was outside the bounds of the array. DataRow: Johnson|ABC|johnson@abc.com", e.Message);
         }
 
@@ -49,7 +43,7 @@ public void ShouldConvertToString()
         {
             var dataString = new PipeDelimitedFile(_input)
                 .SkipNRows(1)
-                .GetData<Contact>().AsPipedString();
+                .GetData<Contact>().AsPipDelimitedString();
             var result1 = File.ReadAllLines(_input).ToArray();
             var result2 = dataString.Split(Environment.NewLine).Where(x => !string.IsNullOrWhiteSpace(x)).ToArray();
             CollectionAssert.AreEqual(result2, result1);
diff --git a/uiowa.DelimitedDataHelper.Tests/TabDelimitedFileTests.cs b/uiowa.DelimitedDataHelper.Tests/TabDelimitedFileTests.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.IO;
-using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using uiowa.DelimitedDataHelper.Tab;
+﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
 using uiowa.DelimitedDataHelper.Tests.TestModels;
 
 namespace uiowa.DelimitedDataHelper.Tests
@@ -38,7 +34,7 @@ public void ShouldConvertToString()
         {
             var dataString = new TabDelimitedFile(_input)
                 .SkipNRows(1)
-                .GetData<Contact>().AsTabedString();
+                .GetData<Contact>().AsTabDelimitedString();
             var result1 = File.ReadAllLines(_input).ToArray();
             var result2 = dataString.Split(Environment.NewLine).Where(x => !string.IsNullOrWhiteSpace(x)).ToArray();
             CollectionAssert.AreEqual(result2, result1);
diff --git a/uiowa.DelimitedDataHelper.Tests/TestModels/Contact.cs b/uiowa.DelimitedDataHelper.Tests/TestModels/Contact.cs
@@ -2,9 +2,9 @@
 {
     public class Contact
     {
-        public string Name { get; set; }
-        public string Company { get; set; }
-        public string Email { get; set; }
-        public string Password { get; set; }
+        public string Name { get; set; } = string.Empty;
+        public string Company { get; set; } = string.Empty;
+        public string Email { get; set; } = string.Empty;
+        public string Password { get; set; } = string.Empty;
     }
 }
diff --git a/uiowa.DelimitedDataHelper.Tests/uiowa.DelimitedDataHelper.Tests.csproj b/uiowa.DelimitedDataHelper.Tests/uiowa.DelimitedDataHelper.Tests.csproj
@@ -1,9 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
+
+    <Nullable>enable</Nullable>
+
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/uiowa.DelimitedDataHelper.sln b/uiowa.DelimitedDataHelper.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29318.209
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32825.248
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "uiowa.DelimitedDataHelper", "uiowa.DelimitedDataHelper\uiowa.DelimitedDataHelper.csproj", "{657BC75F-071A-423F-BF39-4678DE65604C}"
 EndProject
diff --git a/uiowa.DelimitedDataHelper/Csv/CsvFile.cs b/uiowa.DelimitedDataHelper/Csv/CsvFile.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace uiowa.DelimitedDataHelper.Csv
+﻿namespace uiowa.DelimitedDataHelper
 {
     /// <inheritdoc />
     public class CsvFile : DelimitedDataFile
@@ -30,9 +27,9 @@ public CsvFile(string fileName) : base(fileName, ",")
         /// <typeparam name="T"></typeparam>
         /// <param name="config">Optional. By default, reader will trim starting/ending white spaces of each entry and reader will parse "" quoted entries.</param>
         /// <returns></returns>
-        public IEnumerable<T> GetData<T>(CsvReaderConfig config = null) where T : new()
+        public IEnumerable<T> GetData<T>(CsvReaderConfig? config = null) where T : new()
         {
-            if (config == null) config = new CsvReaderConfig();
+            config ??= new CsvReaderConfig();
             return config.IsQuoted ? ParseQuotedCsvData<T>(config) : base.GetData<T>(config);
         }
 
@@ -43,7 +40,7 @@ public CsvFile(string fileName) : base(fileName, ",")
             {
                 var result = new T();
                 var items = x.Split(new[] { QuotedDelimiter }, StringSplitOptions.None);
-                items[0] = items[0].Substring(1);
+                items[0] = items[0][1..];
                 try
                 {
                     items[objProperties.Length - 1] = TrimLastCharacter(items[objProperties.Length - 1]);
@@ -65,7 +62,7 @@ public CsvFile(string fileName) : base(fileName, ",")
 
         private static string TrimLastCharacter(string s)
         {
-            return s.Substring(0, s.Length - 1);
+            return s[..^1];
         }
     }
 }
diff --git a/uiowa.DelimitedDataHelper/Csv/CsvFileIOConfigs.cs b/uiowa.DelimitedDataHelper/Csv/CsvFileIOConfigs.cs
@@ -1,4 +1,4 @@
-﻿namespace uiowa.DelimitedDataHelper.Csv
+﻿namespace uiowa.DelimitedDataHelper
 {
     /// <inheritdoc />
     /// <summary>
diff --git a/uiowa.DelimitedDataHelper/Csv/CsvFileWriter.cs b/uiowa.DelimitedDataHelper/Csv/CsvFileWriter.cs
@@ -1,6 +1,4 @@
-﻿using System.Collections.Generic;
-
-namespace uiowa.DelimitedDataHelper.Csv
+﻿namespace uiowa.DelimitedDataHelper
 {
     internal class CsvFileWriter : DelimitedFileWriter
     {
@@ -9,9 +7,9 @@ public CsvFileWriter() : base(",")
 
         }
 
-        protected override string Escape(object o)
+        protected override string Escape(object? o)
         {
-            return o == null ? "" : $"\"{o.ToString().Replace("\"", "\"\"")}\"";
+            return o == null ? "" : $"\"{o.ToString()?.Replace("\"", "\"\"")}\"";
         }
     }
 
@@ -29,7 +27,7 @@ public static class CsvFileExtensions
         /// <param name="data"></param>
         /// <param name="fileName">Full path for output file.</param>
         /// <param name="config">Optional. By default, null, which means will write header and will write "" quoted entries.</param>
-        public static void WriteToCsvFile<T>(this IEnumerable<T> data, string fileName, CsvWriterConfig config = null)
+        public static void WriteToCsvFile<T>(this IEnumerable<T> data, string fileName, CsvWriterConfig? config = null)
         {
             if (config == null) config = new CsvWriterConfig();
             if (config.IsQuoted)
@@ -47,9 +45,9 @@ public static void WriteToCsvFile<T>(this IEnumerable<T> data, string fileName,
         /// <param name="config"></param>
         /// <typeparam name="T"></typeparam>
         /// <returns></returns>
-        public static string AsString<T>(this IEnumerable<T> data, CsvWriterConfig config = null)
+        public static string AsCsvString<T>(this IEnumerable<T> data, CsvWriterConfig? config = null)
         {
-            if (config == null) config = new CsvWriterConfig();
+            config ??= new CsvWriterConfig();
             if (config.IsQuoted)
             {
                 return new CsvFileWriter().ConvertToString(data, config);
diff --git a/uiowa.DelimitedDataHelper/DelimitedDataFile.cs b/uiowa.DelimitedDataHelper/DelimitedDataFile.cs
@@ -1,9 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace uiowa.DelimitedDataHelper
+﻿namespace uiowa.DelimitedDataHelper
 {
     /// <summary>
     /// Delimited Data File. It must be a flat file.
@@ -52,9 +47,9 @@ public virtual DelimitedDataFile SkipNRows(int n)
         /// <typeparam name="T"></typeparam>
         /// <param name="config">Optional. By default, reader will trim starting/ending white spaces of each entry.</param>
         /// <returns></returns>
-        public virtual IEnumerable<T> GetData<T>(DelimitedFileReaderConfig config = null) where T : new()
+        public virtual IEnumerable<T> GetData<T>(DelimitedFileReaderConfig? config = null) where T : new()
         {
-            if (config == null) config = new DelimitedFileReaderConfig();
+            config ??= new DelimitedFileReaderConfig();
             var objProperties = typeof(T).GetProperties();
 
             foreach (var x in Rows)
diff --git a/uiowa.DelimitedDataHelper/DelimitedFileWriter.cs b/uiowa.DelimitedDataHelper/DelimitedFileWriter.cs
@@ -1,6 +1,4 @@
-﻿using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
+﻿using System.Reflection;
 using System.Text;
 
 namespace uiowa.DelimitedDataHelper
@@ -20,9 +18,9 @@ public DelimitedFileWriter(string delimiter = "\t")
         /// <param name="data">List of data with type of (T).</param>
         /// <param name="fileName"></param>
         /// <param name="config">Optional. By default, true, write header, which is a list of property names in type (T).</param>
-        public void CreateFileWithData<T>(IEnumerable<T> data, string fileName, DelimitedFileWriterConfig config = null)
+        public void CreateFileWithData<T>(IEnumerable<T> data, string fileName, DelimitedFileWriterConfig? config = null)
         {
-            if (config == null) config = new DelimitedFileWriterConfig();
+            config ??= new DelimitedFileWriterConfig();
             if (File.Exists(fileName)) File.Delete(fileName);
             var objProperties = typeof(T).GetProperties();
 
@@ -41,9 +39,9 @@ public void CreateFileWithData<T>(IEnumerable<T> data, string fileName, Delimite
         /// <param name="data"></param>
         /// <param name="config"></param>
         /// <returns></returns>
-        public string ConvertToString<T>(IEnumerable<T> data, DelimitedFileWriterConfig config = null)
+        public string ConvertToString<T>(IEnumerable<T> data, DelimitedFileWriterConfig? config = null)
         {
-            if (config == null) config = new DelimitedFileWriterConfig();
+            config ??= new DelimitedFileWriterConfig();
             var objProperties = typeof(T).GetProperties();
             var sb = new StringBuilder();
             if (config.WriteHeader) sb.Append(GetHeader(objProperties));
@@ -64,13 +62,11 @@ protected virtual string GetHeader(PropertyInfo[] objProperties)
             return result.ToString();
         }
 
-        protected virtual string WriteRows<T>(IEnumerable<T> objs, PropertyInfo[] objProperties)
+        protected virtual string WriteRows<T>(IEnumerable<T> data, PropertyInfo[] objProperties)
         {
-            if (objs == null) return null;
-
             var result = new StringBuilder();
 
-            foreach (var obj in objs)
+            foreach (var obj in data)
             {
                 foreach (var objProperty in objProperties)
                 {
@@ -83,7 +79,7 @@ protected virtual string WriteRows<T>(IEnumerable<T> objs, PropertyInfo[] objPro
             return result.ToString();
         }
 
-        protected virtual string Escape(object o)
+        protected virtual string Escape(object? o)
         {
             return o?.ToString() ?? string.Empty;
         }
diff --git a/uiowa.DelimitedDataHelper/Pipe/PipeDelimitedFile.cs b/uiowa.DelimitedDataHelper/Pipe/PipeDelimitedFile.cs
@@ -1,6 +1,4 @@
-﻿using System.Collections.Generic;
-
-namespace uiowa.DelimitedDataHelper.Pipe
+﻿namespace uiowa.DelimitedDataHelper
 {
     /// <inheritdoc />
     public class PipeDelimitedFile : DelimitedDataFile
@@ -29,7 +27,7 @@ public static class PipeDelimitedDataWriter
         /// <param name="data"></param>
         /// <param name="fileName"></param>
         /// <param name="config"></param>
-        public static void WriteToPipeDelimitedFile<T>(this IEnumerable<T> data, string fileName, DelimitedFileWriterConfig config = null)
+        public static void WriteToPipeDelimitedFile<T>(this IEnumerable<T> data, string fileName, DelimitedFileWriterConfig? config = null)
         {
             new DelimitedFileWriter("|").CreateFileWithData(data, fileName, config);
         }
@@ -41,7 +39,7 @@ public static void WriteToPipeDelimitedFile<T>(this IEnumerable<T> data, string
         /// <param name="config"></param>
         /// <typeparam name="T"></typeparam>
         /// <returns></returns>
-        public static string AsPipedString<T>(this IEnumerable<T> data, DelimitedFileWriterConfig config = null)
+        public static string AsPipDelimitedString<T>(this IEnumerable<T> data, DelimitedFileWriterConfig? config = null)
         {
             return new DelimitedFileWriter("|").ConvertToString(data, config);
         }
diff --git a/uiowa.DelimitedDataHelper/Tab/TabDelimitedFile.cs b/uiowa.DelimitedDataHelper/Tab/TabDelimitedFile.cs
@@ -1,6 +1,4 @@
-﻿using System.Collections.Generic;
-
-namespace uiowa.DelimitedDataHelper.Tab
+﻿namespace uiowa.DelimitedDataHelper
 {
     /// <inheritdoc />
     public class TabDelimitedFile : DelimitedDataFile
@@ -29,7 +27,7 @@ public static class TabDelimitedDataWriter
         /// <param name="data"></param>
         /// <param name="fileName"></param>
         /// <param name="config"></param>
-        public static void WriteToTabDelimitedFile<T>(this IEnumerable<T> data, string fileName, DelimitedFileWriterConfig config = null)
+        public static void WriteToTabDelimitedFile<T>(this IEnumerable<T> data, string fileName, DelimitedFileWriterConfig? config = null)
         {
             new DelimitedFileWriter().CreateFileWithData(data, fileName, config);
         }
@@ -41,7 +39,7 @@ public static void WriteToTabDelimitedFile<T>(this IEnumerable<T> data, string f
         /// <param name="config"></param>
         /// <typeparam name="T"></typeparam>
         /// <returns></returns>
-        public static string AsTabedString<T>(this IEnumerable<T> data, DelimitedFileWriterConfig config = null)
+        public static string AsTabDelimitedString<T>(this IEnumerable<T> data, DelimitedFileWriterConfig? config = null)
         {
             return new DelimitedFileWriter().ConvertToString(data, config);
         }
diff --git a/uiowa.DelimitedDataHelper/uiowa.DelimitedDataHelper.csproj b/uiowa.DelimitedDataHelper/uiowa.DelimitedDataHelper.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PackageId>uiowa.DelimitedDataHelper</PackageId>
     <Title>Delimited Data Helper</Title>
     <Version>1.0.2</Version>
@@ -12,19 +12,19 @@
     <Tags>Delimited Data Reader Writer Csv Tab Pipe</Tags>
     <ProjectUrl>https://github.com/changhuixu/DelimitedDataFileHelper</ProjectUrl>
     <PackageProjectUrl>https://github.com/changhuixu/DelimitedDataFileHelper</PackageProjectUrl>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <RepositoryUrl>https://github.com/changhuixu/DelimitedDataFileHelper</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageIconUrl></PackageIconUrl>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\LICENSE">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
+    <None Include="..\README.md" Pack="true" PackagePath="\"/>
+    <None Include="..\LICENSE" Pack="true" PackagePath="\"/>
   </ItemGroup>
-
 </Project>
diff --git a/uiowa.DelimitedDataHelper/uiowa.DelimitedDataHelper.csproj.DotSettings b/uiowa.DelimitedDataHelper/uiowa.DelimitedDataHelper.csproj.DotSettings

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`{`
`3`	`3`	`public class Contact`
`4`	`4`	`{`
`5`		`- public string Name { get; set; }`
`6`		`- public string Company { get; set; }`
`7`		`- public string Email { get; set; }`
`8`		`- public string Password { get; set; }`
	`5`	`+ public string Name { get; set; } = string.Empty;`
	`6`	`+ public string Company { get; set; } = string.Empty;`
	`7`	`+ public string Email { get; set; } = string.Empty;`
	`8`	`+ public string Password { get; set; } = string.Empty;`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-`
`4`		`-namespace uiowa.DelimitedDataHelper.Csv`
	`1`	`+namespace uiowa.DelimitedDataHelper`
`5`	`2`	`{`
`6`	`3`	`/// <inheritdoc />`
`7`	`4`	`public class CsvFile : DelimitedDataFile`
`@@ -30,9 +27,9 @@ public CsvFile(string fileName) : base(fileName, ",")`
`30`	`27`	`/// <typeparam name="T"></typeparam>`
`31`	`28`	`/// <param name="config">Optional. By default, reader will trim starting/ending white spaces of each entry and reader will parse "" quoted entries.</param>`
`32`	`29`	`/// <returns></returns>`
`33`		`- public IEnumerable<T> GetData<T>(CsvReaderConfig config = null) where T : new()`
	`30`	`+ public IEnumerable<T> GetData<T>(CsvReaderConfig? config = null) where T : new()`
`34`	`31`	`{`
`35`		`- if (config == null) config = new CsvReaderConfig();`
	`32`	`+ config ??= new CsvReaderConfig();`
`36`	`33`	`return config.IsQuoted ? ParseQuotedCsvData<T>(config) : base.GetData<T>(config);`
`37`	`34`	`}`
`38`	`35`
`@@ -43,7 +40,7 @@ public CsvFile(string fileName) : base(fileName, ",")`
`43`	`40`	`{`
`44`	`41`	`var result = new T();`
`45`	`42`	`var items = x.Split(new[] { QuotedDelimiter }, StringSplitOptions.None);`
`46`		`- items[0] = items[0].Substring(1);`
	`43`	`+ items[0] = items[0][1..];`
`47`	`44`	`try`
`48`	`45`	`{`
`49`	`46`	`items[objProperties.Length - 1] = TrimLastCharacter(items[objProperties.Length - 1]);`
`@@ -65,7 +62,7 @@ public CsvFile(string fileName) : base(fileName, ",")`
`65`	`62`
`66`	`63`	`private static string TrimLastCharacter(string s)`
`67`	`64`	`{`
`68`		`- return s.Substring(0, s.Length - 1);`
	`65`	`+ return s[..^1];`
`69`	`66`	`}`
`70`	`67`	`}`
`71`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace uiowa.DelimitedDataHelper.Csv`
	`1`	`+namespace uiowa.DelimitedDataHelper`
`2`	`2`	`{`
`3`	`3`	`/// <inheritdoc />`
`4`	`4`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using System.Collections.Generic;`
`2`		`-`
`3`		`-namespace uiowa.DelimitedDataHelper.Csv`
	`1`	`+namespace uiowa.DelimitedDataHelper`
`4`	`2`	`{`
`5`	`3`	`internal class CsvFileWriter : DelimitedFileWriter`
`6`	`4`	`{`
`@@ -9,9 +7,9 @@ public CsvFileWriter() : base(",")`
`9`	`7`
`10`	`8`	`}`
`11`	`9`
`12`		`- protected override string Escape(object o)`
	`10`	`+ protected override string Escape(object? o)`
`13`	`11`	`{`
`14`		`- return o == null ? "" : $"\"{o.ToString().Replace("\"", "\"\"")}\"";`
	`12`	`+ return o == null ? "" : $"\"{o.ToString()?.Replace("\"", "\"\"")}\"";`
`15`	`13`	`}`
`16`	`14`	`}`
`17`	`15`
`@@ -29,7 +27,7 @@ public static class CsvFileExtensions`
`29`	`27`	`/// <param name="data"></param>`
`30`	`28`	`/// <param name="fileName">Full path for output file.</param>`
`31`	`29`	`/// <param name="config">Optional. By default, null, which means will write header and will write "" quoted entries.</param>`
`32`		`- public static void WriteToCsvFile<T>(this IEnumerable<T> data, string fileName, CsvWriterConfig config = null)`
	`30`	`+ public static void WriteToCsvFile<T>(this IEnumerable<T> data, string fileName, CsvWriterConfig? config = null)`
`33`	`31`	`{`
`34`	`32`	`if (config == null) config = new CsvWriterConfig();`
`35`	`33`	`if (config.IsQuoted)`
`@@ -47,9 +45,9 @@ public static void WriteToCsvFile<T>(this IEnumerable<T> data, string fileName,`
`47`	`45`	`/// <param name="config"></param>`
`48`	`46`	`/// <typeparam name="T"></typeparam>`
`49`	`47`	`/// <returns></returns>`
`50`		`- public static string AsString<T>(this IEnumerable<T> data, CsvWriterConfig config = null)`
	`48`	`+ public static string AsCsvString<T>(this IEnumerable<T> data, CsvWriterConfig? config = null)`
`51`	`49`	`{`
`52`		`- if (config == null) config = new CsvWriterConfig();`
	`50`	`+ config ??= new CsvWriterConfig();`
`53`	`51`	`if (config.IsQuoted)`
`54`	`52`	`{`
`55`	`53`	`return new CsvFileWriter().ConvertToString(data, config);`