Upgrade to .NET 8 (#111)

- Upgrade to .NET 8. - Resolved minor issues ## Changes in generating dynamic methods These changes were necessary because in .NET 8 the program was crashing when generating dynamic methods. - Fixed generating values for decimal and enum types: `ILGeneratorHelper.cs` - Fixed using local variables in dynamic methods: `DynamicMethodModelFactory.cs`, `RecordModelFactory.cs`
Kros-sk · Dec 18, 2023 · cde62e7 · cde62e7
1 parent e351165
commit cde62e7
Show file tree

Hide file tree

Showing 18 changed files with 165 additions and 142 deletions.
diff --git a/src/CommandGenerator/CommandGenerator.cs b/src/CommandGenerator/CommandGenerator.cs
@@ -200,7 +200,7 @@ public IEnumerable<DbCommand> GetDeleteCommands(IEnumerable ids)
                 AddDeleteCommandParameter(cmd, paramterName, id);
                 if (iterationCount > 1)
                 {
-                    deleteQueryText.Append(",");
+                    deleteQueryText.Append(',');
                 }
                 deleteQueryText.Append(paramterName);
 
@@ -249,17 +249,17 @@ public void FillCommand(DbCommand command, T item, ValueGenerated valueGenerated
             }
         }
 
-        private void AddDeleteCommandParameter(DbCommand cmd, string parameterName, object value)
+        private static void AddDeleteCommandParameter(DbCommand cmd, string parameterName, object value)
         {
             DbParameter newParameter = cmd.CreateParameter();
             newParameter.ParameterName = parameterName;
             newParameter.Value = value;
             cmd.Parameters.Add(newParameter);
         }
 
-        private DbCommand FinishDeleteCommand(DbCommand cmd, StringBuilder deleteQueryText)
+        private static DbCommand FinishDeleteCommand(DbCommand cmd, StringBuilder deleteQueryText)
         {
-            deleteQueryText.Append(")");
+            deleteQueryText.Append(')');
             cmd.CommandText = deleteQueryText.ToString();
             return cmd;
         }
@@ -272,7 +272,7 @@ private DbCommand FinishDeleteCommand(DbCommand cmd, StringBuilder deleteQueryTe
         public IEnumerable<ColumnInfo> GetQueryColumns(ValueGenerated valueGenerated)
             => GetQueryColumns().Where(c => c.ValueGenerator == null || c.ValueGenerated.HasFlag(valueGenerated));
 
-        private IEnumerable<ColumnInfo> GetQueryColumns()
+        private List<ColumnInfo> GetQueryColumns()
         {
             if (_columnsInfo == null)
             {
@@ -317,7 +317,7 @@ public object GetColumnValue(ColumnInfo columnInfo, T item, ValueGenerated value
             return value;
         }
 
-        internal void SetColumnValueFromValueGenerator(ColumnInfo columnInfo, T item, ValueGenerated valueGenerated)
+        internal static void SetColumnValueFromValueGenerator(ColumnInfo columnInfo, T item, ValueGenerated valueGenerated)
         {
             if ((!HasValueGeneratorOnInsert(columnInfo) || valueGenerated != ValueGenerated.OnUpdate) &&
                 TryGetValueFromValueGenerators(columnInfo, valueGenerated, out object generatorValue))
@@ -326,10 +326,10 @@ internal void SetColumnValueFromValueGenerator(ColumnInfo columnInfo, T item, Va
             }
         }
 
-        private bool HasValueGeneratorOnInsert(ColumnInfo columnInfo)
+        private static bool HasValueGeneratorOnInsert(ColumnInfo columnInfo)
             => (columnInfo.ValueGenerator != null && columnInfo.ValueGenerated == ValueGenerated.OnInsert);
 
-        private bool TryGetValueFromValueGenerators(ColumnInfo columnInfo, ValueGenerated valueGenerated, out object value)
+        private static bool TryGetValueFromValueGenerators(ColumnInfo columnInfo, ValueGenerated valueGenerated, out object value)
         {
             value = null;
 

diff --git a/src/Data/DataRowReader.cs b/src/Data/DataRowReader.cs
@@ -14,11 +14,11 @@ namespace Kros.KORM.Data
     [ExcludeFromCodeCoverage()]
     internal class DataRowReader : DbDataReader
     {
-        private DataTable _dataTable;
-        private DataRow _dataRow;
+        private readonly DataTable _dataTable;
+        private readonly DataRow _dataRow;
         private bool _isOpen = true;
         private bool _reachEORows = false;
-        private DataTable schemaTable;
+        private DataTable _schemaTable;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DataRowReader"/> class.
@@ -72,7 +72,7 @@ public override object this[int ordinal]
                     }
                     catch (IndexOutOfRangeException)
                     {
-                        throw new ArgumentOutOfRangeException("ordinal");
+                        throw new ArgumentOutOfRangeException(nameof(ordinal));
                     }
                 }
                 throw new InvalidOperationException("Cannot process deleted row.");
@@ -180,7 +180,7 @@ public override bool GetBoolean(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -200,7 +200,7 @@ public override byte GetByte(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -226,19 +226,21 @@ public override long GetBytes(int ordinal, long dataOffset, byte[] buffer, int b
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
             if (buffer == null)
+            {
                 return (long)numArray.Length;
+            }
             int num1 = (int)dataOffset;
             int num2 = Math.Min(numArray.Length - num1, length);
             if (num1 < 0)
             {
-                throw new ArgumentOutOfRangeException("dataOffset");
+                throw new ArgumentOutOfRangeException(nameof(dataOffset));
             }
             if (bufferOffset < 0 || bufferOffset > 0 && bufferOffset >= buffer.Length)
             {
-                throw new ArgumentOutOfRangeException("bufferOffset");
+                throw new ArgumentOutOfRangeException(nameof(bufferOffset));
             }
             if (0 < num2)
             {
@@ -248,7 +250,7 @@ public override long GetBytes(int ordinal, long dataOffset, byte[] buffer, int b
             {
                 if (length < 0)
                 {
-                    throw new ArgumentOutOfRangeException("length");
+                    throw new ArgumentOutOfRangeException(nameof(length));
                 }
                 num2 = 0;
             }
@@ -271,7 +273,7 @@ public override char GetChar(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -296,19 +298,21 @@ public override long GetChars(int ordinal, long dataOffset, char[] buffer, int b
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
             if (buffer == null)
+            {
                 return (long)chArray.Length;
+            }
             int num1 = (int)dataOffset;
             int num2 = Math.Min(chArray.Length - num1, length);
             if (num1 < 0)
             {
-                throw new ArgumentOutOfRangeException("dataOffset");
+                throw new ArgumentOutOfRangeException(nameof(dataOffset));
             }
             if (bufferOffset < 0 || bufferOffset > 0 && bufferOffset >= buffer.Length)
             {
-                throw new ArgumentOutOfRangeException("bufferOffset");
+                throw new ArgumentOutOfRangeException(nameof(bufferOffset));
             }
             if (0 < num2)
             {
@@ -318,7 +322,7 @@ public override long GetChars(int ordinal, long dataOffset, char[] buffer, int b
             {
                 if (length < 0)
                 {
-                    throw new ArgumentOutOfRangeException("length");
+                    throw new ArgumentOutOfRangeException(nameof(length));
                 }
                 num2 = 0;
             }
@@ -354,7 +358,7 @@ public override DateTime GetDateTime(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -374,7 +378,7 @@ public override decimal GetDecimal(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -394,7 +398,7 @@ public override double GetDouble(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -426,7 +430,7 @@ public override Type GetFieldType(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -446,7 +450,7 @@ public override float GetFloat(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -466,7 +470,7 @@ public override Guid GetGuid(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -486,7 +490,7 @@ public override short GetInt16(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -506,7 +510,7 @@ public override int GetInt32(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -526,7 +530,7 @@ public override long GetInt64(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -546,7 +550,7 @@ public override string GetName(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -575,11 +579,11 @@ public override int GetOrdinal(string name)
         /// </exception>
         public override DataTable GetSchemaTable()
         {
-            if (this.schemaTable == null)
+            if (_schemaTable == null)
             {
-                this.schemaTable = DataRowReader.GetSchemaTableFromDataTable(_dataTable);
+                _schemaTable = DataRowReader.GetSchemaTableFromDataTable(_dataTable);
             }
-            return this.schemaTable;
+            return _schemaTable;
         }
 
         /// <summary>
@@ -598,7 +602,7 @@ public override string GetString(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -618,7 +622,7 @@ public override object GetValue(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -634,7 +638,7 @@ public override int GetValues(object[] values)
         {
             if (values == null)
             {
-                throw new ArgumentNullException("values");
+                throw new ArgumentNullException(nameof(values));
             }
             Array.Copy((Array)_dataRow.ItemArray,
                 (Array)values, _dataRow.ItemArray.Length > values.Length ? values.Length : _dataRow.ItemArray.Length);
@@ -662,7 +666,7 @@ public override bool IsDBNull(int ordinal)
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentOutOfRangeException("ordinal");
+                throw new ArgumentOutOfRangeException(nameof(ordinal));
             }
         }
 
@@ -693,7 +697,7 @@ internal static DataTable GetSchemaTableFromDataTable(DataTable table)
         {
             if (table == null)
             {
-                throw new ArgumentNullException("DataTable");
+                throw new ArgumentNullException(nameof(table));
             }
             return new DataTableReader(table).GetSchemaTable();
         }

diff --git a/src/Kros.KORM.csproj b/src/Kros.KORM.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
-    <Version>6.2.0</Version>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <Version>7.0.0</Version>
     <Authors>KROS a. s.</Authors>
     <Company>KROS a. s.</Company>
     <Description>KORM is fast, easy to use, micro ORM tool (Kros Object Relation Mapper).</Description>
@@ -47,8 +47,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Kros.Utils" Version="2.1.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Kros.Utils" Version="3.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>

diff --git a/src/Materializer/DynamicMethodModelFactory.cs b/src/Materializer/DynamicMethodModelFactory.cs
@@ -96,12 +96,12 @@ private Func<IDataReader, T> CreateFactoryForPropertySetters<T>(
             DynamicMethod dynamicMethod = new(GetFactoryName, type, new Type[] { typeof(IDataReader) }, true);
             ILGenerator ilGenerator = dynamicMethod.GetILGenerator();
 
-            ilGenerator.DeclareLocal(typeof(T));
+            LocalBuilder localResult = ilGenerator.DeclareLocal(typeof(T));
             ilGenerator.LogAndEmit(OpCodes.Newobj, ctor);
-            ilGenerator.LogAndEmit(OpCodes.Stloc_0);
+            ilGenerator.LogAndEmit(OpCodes.Stloc_S, localResult.LocalIndex);
             EmitReaderFields(reader, tableInfo, ilGenerator, injector);
             ilGenerator.CallOnAfterMaterialize(tableInfo);
-            ilGenerator.LogAndEmit(OpCodes.Ldloc_0);
+            ilGenerator.LogAndEmit(OpCodes.Ldloc, localResult.LocalIndex);
             ilGenerator.LogAndEmit(OpCodes.Ret);
 
             return dynamicMethod.CreateDelegate(Expression.GetFuncType(typeof(IDataReader), type)) as Func<IDataReader, T>;

diff --git a/src/Materializer/ILGeneratorHelper.cs b/src/Materializer/ILGeneratorHelper.cs
@@ -337,12 +337,25 @@ private static void EmitSetDefaultValueForPrimitiveTypes(this ILGenerator ilGene
             }
         }
 
+        private static readonly FieldInfo _zeroDecimal = typeof(decimal).GetField(nameof(decimal.Zero));
+
         private static void EmitSetDefaultValueForValueTypes(this ILGenerator ilGenerator, Type propertyType)
         {
-            LocalBuilder local = ilGenerator.DeclareLocal(propertyType);
-            ilGenerator.LogAndEmit(OpCodes.Ldloca_S, local.LocalIndex);
-            ilGenerator.LogAndEmit(OpCodes.Initobj, local.LocalType);
-            ilGenerator.LogAndEmit(OpCodes.Ldloc_S, local.LocalIndex);
+            if (propertyType == typeof(decimal))
+            {
+                ilGenerator.LogAndEmit(OpCodes.Ldsfld, _zeroDecimal);
+            }
+            else if (propertyType.IsEnum)
+            {
+                ilGenerator.EmitSetDefaultValueForPrimitiveTypes(propertyType.GetEnumUnderlyingType());
+            }
+            else
+            {
+                LocalBuilder local = ilGenerator.DeclareLocal(propertyType);
+                ilGenerator.LogAndEmit(OpCodes.Ldloca_S, local.LocalIndex);
+                ilGenerator.LogAndEmit(OpCodes.Initobj, local.LocalType);
+                ilGenerator.LogAndEmit(OpCodes.Ldloc, local.LocalIndex);
+            }
         }
 
         private static Dictionary<string, MethodInfo> InitReaderValueGetters()