#53 get the package ready for release

Author: kccarter76

SubSonic.Core.DataAccessLayer/SubSonic.Core.DataAccessLayer.csproj

@@ -57,7 +57,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.6" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.6" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.6" />
-    <PackageReference Include="SubSonic.Core.Abstractions" Version="4.2.0-beta.4" />
+    <PackageReference Include="SubSonic.Core.Abstractions" Version="4.2.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
     <PackageReference Include="System.Data.Common" Version="4.3.0" />
     <PackageReference Condition="'$(TargetFramework)'=='netstandard2.0'" Include="System.Data.DataSetExtensions" Version="4.5.0" />

SubSonic.Core.DataAccessLayer/src/Builders/DbNavigationPropertyBuilder.cs

@@ -119,9 +119,12 @@ private string[] GetForeignKeys(Type type)
 
         private string[] GetForeignKeys(Expression expression)
         {
-            if(expression.IsNotNull())
+            if(expression is MemberExpression TheMember)
             {
-                return Ext.GetForeignKeyName((PropertyInfo)((MemberExpression)expression).Member);
+                if (TheMember.Member is PropertyInfo property)
+                {
+                    return Ext.GetForeignKeyName(property);
+                }
             }
             return Array.Empty<string>();
         }

SubSonic.Core.DataAccessLayer/src/Builders/DbSqlQueryBuilder/DbSqlQueryBuilderBuildMethods.cs

@@ -73,8 +73,12 @@ public Expression BuildSelect(MethodCallExpression call)
 
                 if (!(predicate is null))
                 {
+#if NETSTANDARD2_0
                     method = method ?? typeof(Queryable).GetGenericMethod(nameof(Queryable.Where), 
-                        new[] { DbTable.Type.GenericTypeArguments[0] }, 
+#elif NETSTANDARD2_1
+                    method ??= typeof(Queryable).GetGenericMethod(nameof(Queryable.Where),
+#endif
+                    new[] { DbTable.Type.GenericTypeArguments[0] }, 
                         DbTable.Type,
                         predicate.GetType());
 
@@ -186,9 +190,9 @@ private Expression BuildSelect(Expression expression, IEnumerable<DbColumnDeclar
 
             return expression;
         }
-        #endregion
+#endregion
 
-        #region Build Where
+#region Build Where
         public Expression BuildWhere(DbExpression expression, LambdaExpression predicate)
         {
             if (expression is null)
@@ -229,9 +233,9 @@ public Expression BuildWhereFindByIDPredicate(DbExpression expression, object[]
 
             return BuildWhere(expression, predicate);
         }
-        #endregion
+#endregion
 
-        #region Build Joins
+#region Build Joins
         public Expression BuildJoin(JoinType type, Expression left, Expression right)
         {
             if (left is DbSelectExpression select)
@@ -252,9 +256,9 @@ public Expression BuildJoin(JoinType type, Expression left, Expression right)
 
             throw new NotSupportedException();
         }
-        #endregion
+#endregion
 
-        #region Lambda
+#region Lambda
         public Expression BuildLambda(Expression body, LambdaType @call, params string[] properties)
         {
             switch (call)
@@ -370,7 +374,7 @@ public Expression BuildLogicalBinary(Expression body, string property, object va
                 return DbWherePredicateBuilder.GetBodyExpression(body, DbWherePredicateBuilder.GetComparisonExpression(left, right, @operator), @group);
             }
         }
-        #endregion
+#endregion
 
         public IDbQuery ToQuery(Expression expression)
         {

SubSonic.Core.DataAccessLayer/src/Extensions/Internal/DatabaseReaders.cs

@@ -31,10 +31,10 @@ public static object LoadInstanceOf(this IDataRecord data, object entity)
                 }
             }
 
-            if (entity is IEntityProxy)
+            if (entity is IEntityProxy proxy)
             {
-                ((IEntityProxy)entity).IsNew = false;
-                ((IEntityProxy)entity).IsDirty = false;
+                proxy.IsNew = false;
+                proxy.IsDirty = false;
             }
 
             return entity;
@@ -51,8 +51,7 @@ public static object ActivateAndLoadInstanceOf(this IDataRecord data, Type entit
                 throw new ArgumentNullException(nameof(data));
             }
 
-            object entity = null;
-
+            object entity;
             if (SubSonicContext.DbOptions.EnableProxyGeneration &&
                 SubSonicContext.DbModel.IsEntityModelRegistered(entityType))
             {

SubSonic.Core.DataAccessLayer/src/Schema/DbRelationshipMap.cs

@@ -51,6 +51,11 @@ public IEnumerable<string> GetForeignKeys(IDbEntityModel entityModel)
         {
             if (RelationshipType == DbRelationshipType.HasManyWithMany)
             {
+                if (entityModel is null)
+                {
+                    throw Error.ArgumentNull(nameof(entityModel));
+                }
+
                 PropertyInfo property = IsLookupMapping
                     ? LookupModel.EntityModelType.GetProperty(entityModel.Name)
                     : ForeignModel.EntityModelType.GetProperty(ForeignModel.Name);

SubSonic.Tests/SubSonic.Tests.csproj

@@ -20,9 +20,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="SubSonic.Core.Abstractions" Version="4.2.0-beta.4" />
+    <PackageReference Include="SubSonic.Core.Abstractions" Version="4.2.0" />
     <PackageReference Include="SubSonic.Extensions.SqlServer" Version="4.2.0" />
-    <PackageReference Include="SubSonic.Extensions.Test" Version="4.2.1-beta.6" />
+    <PackageReference Include="SubSonic.Extensions.Test" Version="4.2.1" />
   </ItemGroup>
 
   <ItemGroup>