From b66350fde7ad1c13d3942e30da99afde2637641c Mon Sep 17 00:00:00 2001 From: Olmo del Corral Date: Wed, 25 Sep 2019 23:17:28 +0200 Subject: [PATCH] fixes after .Net Core 3 --- Signum.Entities/DynamicQuery/ResultTable.cs | 2 +- Signum.Utilities/Csv.cs | 2 +- Signum.Utilities/ExpressionExpanderAttributes.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Signum.Entities/DynamicQuery/ResultTable.cs b/Signum.Entities/DynamicQuery/ResultTable.cs index a6ba5f3237..9379d5267c 100644 --- 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 { - get { return (Lite)Table.entityColumn!.Values[Index]; } + get { return (Lite)Table.entityColumn!.Values[Index]!; } } public Lite? TryEntity diff --git a/Signum.Utilities/Csv.cs b/Signum.Utilities/Csv.cs index fb29cce89d..812c84a2f8 100644 --- a/Signum.Utilities/Csv.cs +++ b/Signum.Utilities/Csv.cs @@ -323,7 +323,7 @@ public static T ReadLine(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 index 0a325cbf12..91d1d2d33d 100644 --- 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); }