Added generic methods and updated C# version

MapDataReader.Benchmarks/MapDataReader.Benchmarks.csproj

@@ -5,6 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

MapDataReader.Benchmarks/Program.cs

@@ -63,10 +63,30 @@ public void MapDatareader_ViaDapper()
 		}
 
 		[Benchmark]
-		public void MapDataReader_ViaMapaDataReader()
+		public void MapDataReader_ViaMapDataReader()
 		{
 			var dr = _dt.CreateDataReader();
-			var list = dr.ToTestClass();
+			var list = dr.To<TestClass>();
+		}
+
+		[Benchmark]
+		public void MapDataReader_ViaManualMap()
+		{
+			var dr = _dt.CreateDataReader();
+
+			var list = new List<TestClass>();
+			while (dr.Read())
+			{
+				list.Add(new TestClass
+				{
+					String1 = dr["String1"] as string,
+					String2 = dr["String2"] as string,
+					String3 = dr["String3"] as string,
+					Int = dr.GetInt32(3),
+					Int2 = dr.GetInt32(4),
+					IntNullable = dr["IntNullable"] as int?
+				});
+			}
 		}
 
 		static DataTable _dt;
@@ -93,14 +113,14 @@ public static void Setup()
 		}
 	}
 
-	[GenerateDataReaderMapper]
+	[GenerateDataReaderMapper(AccessModifier = "internal")]
 	public class TestClass
 	{
 		public string String1 { get; set; }
 		public string String2 { get; set; }
 		public string String3 { get; set; }
-		public string Int { get; set; }
-		public string Int2 { get; set; }
+		public int Int { get; set; }
+		public int Int2 { get; set; }
 		public int? IntNullable { get; set; }
 	}
 }

MapDataReader.Tests/MapDataReader.Tests.csproj

@@ -4,8 +4,8 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-
     <IsPackable>false</IsPackable>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

MapDataReader.Tests/TestActualCode.cs

@@ -3,6 +3,7 @@
 using System.Data;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -147,7 +148,7 @@ public void TestStringAssign()
 		}
 
 		[TestMethod]
-		public void TestDatatReader()
+		public void TestDataReader()
 		{
 			//create datatable with test data
 			var dt = new DataTable();
@@ -165,7 +166,7 @@ public void TestDatatReader()
 			dt.Rows.Add(123, "ggg", true, 3213, 123, date, TimeSpan.FromSeconds(123), new byte[] { 3, 2, 1 });
 			dt.Rows.Add(3, "fgdk", false, 11123, 321, date, TimeSpan.FromSeconds(123), new byte[] { 5, 6, 7, 8 });
 
-			var list = dt.CreateDataReader().ToMyObject();
+			var list = dt.CreateDataReader().To<MyObject>();
 
 			Assert.IsTrue(list.Count == 2);
 
@@ -198,7 +199,7 @@ public void TestDatatReader()
 
 			dt2.Rows.Add(true, "alex", 123);
 
-			list = dt2.CreateDataReader().ToMyObject(); //should not throw exception
+			list = dt2.CreateDataReader().To<MyObject>(); //should not throw exception
 
 			Assert.IsTrue(list[0].Id == 123);
 			Assert.IsTrue(list[0].Name == "alex");
@@ -227,6 +228,24 @@ public void TestWrongProperty()
 			o.SetPropertyByName("Name", 123); //try to assign string prop to int
 			Assert.IsTrue(o.Name == null); //wrong type. should be null
 		}
+
+		[TestMethod]
+		public void TestInternalAccessModifier()
+		{
+			var type = typeof(TestClassInternalExtensions);
+			var method = type.GetMethod("To", BindingFlags.Static | BindingFlags.NonPublic);
+
+			Assert.IsNotNull(method, "Expected method 'To' to be 'internal'.");
+		}
+
+		[TestMethod]
+		public void TestInternalAccessModifierNamed()
+		{
+			var type = typeof(TestClassInternalNamedExtensions);
+			var method = type.GetMethod("To", BindingFlags.Static | BindingFlags.NonPublic);
+
+			Assert.IsNotNull(method, "Expected method 'To' to be 'internal'.");
+		}
 	}
 
 	public class BaseClass
@@ -239,5 +258,17 @@ public class ChildClass : BaseClass
 	{
 		public string Name { get; set; }
 	}
+
+	[GenerateDataReaderMapper("internal")]
+	internal class TestClassInternal
+	{
+		public int Id { get; set; }
+	}
+
+	[GenerateDataReaderMapper(AccessModifier = "internal")]
+	internal class TestClassInternalNamed
+	{
+		public int Id { get; set; }
+	}
 }
 

MapDataReader.Tests/TestGenerator.cs

@@ -29,6 +29,29 @@ public class MyClass
 		public decimal Price {get;set;}
 	}
 }
+";
+			var src = GetAndCheckOutputSource(userSource);
+		}
+
+		[TestMethod]
+		public void TestAccessModifier()
+		{
+			string userSource = @"
+using MapDataReader;
+
+namespace MyCode
+{
+	[GenerateDataReaderMapper(AccessModifier = ""internal"")]
+	public class MyClass
+	{
+		public string Name {get;set;}
+		public int Size {get;set;}
+		public bool Enabled {get;set;}
+		public System.DateTime Created {get;set;}
+		public System.DateTimeOffset Offset {get;set;}
+		public decimal Price {get;set;}
+	}
+}
 ";
 			var src = GetAndCheckOutputSource(userSource);
 		}

MapDataReader/MapDataReader.csproj

@@ -14,6 +14,7 @@
 	<PackageTags>aot;source-generator</PackageTags>
 	<Description>Super fast mapping of DataReader to custom objects</Description>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
+	<LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>