fixes for .Net 6

signumsoftware · Nov 8, 2021 · 0669737 · 0669737 · olmobrutall · Nov 8, 2021
1 parent 11f2a0d
commit 0669737
Show file tree

Hide file tree

Showing 5 changed files with 483 additions and 517 deletions.
diff --git a/Signum.Engine.Extensions/Dynamic/DynamicCSSOverrideLogic.cs b/Signum.Engine.Extensions/Dynamic/DynamicCSSOverrideLogic.cs
@@ -29,7 +29,6 @@ public static void Start(SchemaBuilder sb)
         }
     }
 }
-}
 
 // In order to work this module, you should apply below mentioned changes to your index.cshtml file
 /*

diff --git a/Signum.Engine/Linq/ExpressionVisitor/DbExpressionNominator.cs b/Signum.Engine/Linq/ExpressionVisitor/DbExpressionNominator.cs
@@ -837,8 +837,12 @@ protected override Expression VisitBinary(BinaryExpression b)
                 b.Left is MemberExpression leftSide && leftSide.Member is PropertyInfo piLeft && ReflectionTools.PropertyEquals(piLeft, piDayNumber) &&
                 b.Right is MemberExpression rightSide && rightSide.Member is PropertyInfo piRight && ReflectionTools.PropertyEquals(piRight, piDayNumber))
             {
+                var diff = TrySqlDifference(SqlEnums.day, b.Type, leftSide.Expression!, rightSide.Expression!);
+                if (diff == null)
+                    return b;
 
-                return TrySqlDifference(SqlEnums.day, b.Type, leftSide.Expression!, rightSide.Expression!) ?? b;
+
+                return Add(new SqlCastExpression(typeof(int), diff));
             }
 
             b = SmartEqualizer.UnwrapPrimaryKeyBinary(b);
@@ -1610,7 +1614,7 @@ protected override Expression VisitMethodCall(MethodCallExpression m)
             case "DateTimeExtensions.Quarter": return TrySqlFunction(null, GetDatePart(), m.Type, new SqlLiteralExpression(SqlEnums.quarter), m.Arguments.Single());
             case "DateTimeExtensions.WeekNumber": return TrySqlFunction(null, GetDatePart(), m.Type, new SqlLiteralExpression(SqlEnums.week), m.Arguments.Single());
 
-            case "DateTimeExtensions.ToDate": return TrySqlCast(m.Type, m.GetArgument("dateTime"));
+            case "DateTimeExtensions.ToDateOnly": return TrySqlCast(m.Type, m.GetArgument("dateTime"));
             case "DateTimeExtensions.ToDateTime": return TrySqlCast(m.Type, m.GetArgument("date"));
             case "DateOnly.FromDateTime":return  TrySqlCast(m.Type, m.GetArgument("dateTime"));
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,6 @@ public static void Start(SchemaBuilder sb) @@
             }
         }
     }
-    }
     // In order to work this module, you should apply below mentioned changes to your index.cshtml file
     /*
@@ Expand Down @@