fixes after .Net Core 3

signumsoftware · Sep 25, 2019 · b66350f · b66350f
1 parent 59050df
commit b66350f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Signum.Entities/DynamicQuery/ResultTable.cs b/Signum.Entities/DynamicQuery/ResultTable.cs
@@ -435,7 +435,7 @@ internal ResultRow(int index, ResultTable table)
 
         public Lite<Entity> Entity
         {
-            get { return (Lite<Entity>)Table.entityColumn!.Values[Index]; }
+            get { return (Lite<Entity>)Table.entityColumn!.Values[Index]!; }
         }
 
         public Lite<Entity>? TryEntity

diff --git a/Signum.Utilities/Csv.cs b/Signum.Utilities/Csv.cs
@@ -323,7 +323,7 @@ public static T ReadLine<T>(string csvLine, CultureInfo? culture = null, CsvRead
                     }
                     else
                     {
-                        var list = (IList)Activator.CreateInstance(member.MemberInfo.ReturningType());
+                        var list = (IList)Activator.CreateInstance(member.MemberInfo.ReturningType())!;
 
                         for (int j = i; j < vals.Count; j++)
                         {

diff --git a/Signum.Utilities/ExpressionExpanderAttributes.cs b/Signum.Utilities/ExpressionExpanderAttributes.cs
@@ -114,7 +114,7 @@ public static void ReplaceExpressionUntyped(MemberInfo methodOrProperty, LambdaE
             if (attr == null)
                 throw new InvalidOperationException($"The member {methodOrProperty.Name} has not {nameof(ExpressionFieldAttribute)}");
 
-            var fi = methodOrProperty.DeclaringType.GetField(attr.Name, BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
+            var fi = methodOrProperty.DeclaringType!.GetField(attr.Name, BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)!;
 
             fi.SetValue(null, newExpression);
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                         else
                         {
-                            var list = (IList)Activator.CreateInstance(member.MemberInfo.ReturningType());
+                            var list = (IList)Activator.CreateInstance(member.MemberInfo.ReturningType())!;
                             for (int j = i; j < vals.Count; j++)
                             {
@@ Expand Down @@