update Nullable Reference Types VS 16.2

Author: olmobrutall

Signum.Engine/BulkInserter.cs

@@ -59,7 +59,7 @@ public static int BulkInsertQueryIds<T, K>(this IEnumerable<T> entities,
             int? timeout = null,
             string? message = null)
             where T : Entity
-            where K : object
+            where K : notnull
         {
             using (HeavyProfiler.Log(nameof(BulkInsertQueryIds), () => typeof(T).TypeName()))
             using (Transaction tr = new Transaction())

Signum.Engine/DynamicQuery/ExpressionContainer.cs

@@ -108,7 +108,7 @@ public ExtensionDictionaryInfo<T, KVP, K, V> RegisterDictionary<T, KVP, K, V>(
             Expression<Func<KVP, V>> valueSelector,
             ResetLazy<HashSet<K>>? allKeys = null)
             where T : Entity
-            where K : object
+            where K : notnull
         {
             var mei = new ExtensionDictionaryInfo<T, KVP, K, V>(collectionSelector, keySelector, valueSelector,
                 allKeys ?? GetAllKeysLazy<T, KVP, K>(collectionSelector, keySelector));
@@ -126,7 +126,7 @@ public ExtensionDictionaryInfo<M, KVP, K, V> RegisterDictionaryInEmbedded<T, M,
                 ResetLazy<HashSet<K>>? allKeys = null)
             where T : Entity
             where M : ModifiableEntity
-            where K : object
+            where K : notnull
         {
             var mei = new ExtensionDictionaryInfo<M, KVP, K, V>(collectionSelector, keySelector, valueSelector,
                 allKeys ?? GetAllKeysLazy<T, KVP, K>(CombineSelectors(embeddedSelector, collectionSelector), keySelector));
@@ -173,7 +173,7 @@ public interface IExtensionDictionaryInfo
     }
 
     public class ExtensionDictionaryInfo<T, KVP, K, V> : IExtensionDictionaryInfo
-        where K : object
+        where K : notnull
     {
         public ResetLazy<HashSet<K>> AllKeys;
 

Signum.Engine/Engine/Synchronizer.cs

@@ -14,7 +14,7 @@ public static void Synchronize<K, N, O>(
           Action<K, N>? createNew,
           Action<K, O>? removeOld,
           Action<K, N, O>? merge)
-            where K : object
+            where K : notnull
         {
             HashSet<K> keys = new HashSet<K>();
             keys.UnionWith(oldDictionary.Keys);
@@ -48,7 +48,7 @@ public static void SynchronizeProgressForeach<K, N, O>(
           Action<K, N, O>? merge,
           bool showProgress = true,
           bool transactional = true)
-            where K : object
+            where K : notnull
         {
             HashSet<K> keys = new HashSet<K>();
             keys.UnionWith(oldDictionary.Keys);
@@ -120,7 +120,7 @@ public static void SynchronizeReplacing<N, O>(
             Func<K, N, O, SqlPreCommand?>? mergeBoth)
             where O : class
             where N : class
-            where K : object
+            where K : notnull
         {
             return newDictionary.OuterJoinDictionaryCC(oldDictionary, (key, newVal, oldVal) =>
             {

Signum.Engine/Linq/ExpressionVisitor/DbExpressionNominator.cs

@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Data;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
@@ -61,6 +62,7 @@ static internal HashSet<Expression> Nominate(Expression? expression, out Express
             return n.candidates;
         }
 
+        [return: NotNullIfNotNull("expression")]
         static internal Expression? FullNominate(Expression? expression)
         {
             DbExpressionNominator n = new DbExpressionNominator { isFullNominate = true };
@@ -69,6 +71,7 @@ static internal HashSet<Expression> Nominate(Expression? expression, out Express
             return result;
         }
 
+        [return: NotNullIfNotNull("expression")]
         static internal Expression? FullNominateNotNullable(Expression? expression)
         {
             DbExpressionNominator n = new DbExpressionNominator { isFullNominate = true, isNotNullRoot = expression };

Signum.Engine/Linq/ExpressionVisitor/DbExpressionVisitor.cs

@@ -99,7 +99,7 @@ protected internal virtual Expression VisitTypeEntity(TypeEntityExpression typeF
 
         [DebuggerStepThrough]
         protected static ReadOnlyDictionary<K, V> Visit<K, V>(ReadOnlyDictionary<K, V> dictionary, Func<V, V> newValue)
-            where K : object
+            where K : notnull
             where V : class
         {
             Dictionary<K, V>? alternate = null;

Signum.Engine/Linq/ExpressionVisitor/QueryBinder.cs

@@ -1324,7 +1324,7 @@ private ProjectionExpression GetTableValuedFunctionProjection(MethodCallExpressi
 
             var functionName = mce.Method.GetCustomAttribute<SqlMethodAttribute>().Name ?? mce.Method.Name;
 
-            var argumens = mce.Arguments.Select(DbExpressionNominator.FullNominate).ToList();
+            var argumens = mce.Arguments.Select(a => DbExpressionNominator.FullNominate(a)!).ToList();
 
             SqlTableValuedFunctionExpression tableExpression = new SqlTableValuedFunctionExpression(functionName, table, tableAlias, argumens);
 
@@ -2425,7 +2425,7 @@ public void FillColumnAssigments(List<ColumnAssignment> assignments, ParameterEx
 
         private Exception InvalidBody()
         {
-            throw new InvalidOperationException("The only allowed expressions on UnsafeInsert are: object initializers, calling method 'SetMixin', or or calling 'Administrator.SetReadonly'");
+            throw new InvalidOperationException("The only allowed expressions on UnsafeInsert are: notnull initializers, calling method 'SetMixin', or or calling 'Administrator.SetReadonly'");
         }
 
         private ColumnAssignment[] AdaptAssign(Expression colExpression, Expression exp)

Signum.Engine/Schema/SchemaBuilder/SchemaBuilderSettings.cs

@@ -13,6 +13,7 @@
 using System.Collections.Concurrent;
 using Signum.Utilities.ExpressionTrees;
 using System.Runtime.CompilerServices;
+using Signum.Utilities.Reflection;
 
 namespace Signum.Engine.Maps
 {
@@ -224,8 +225,8 @@ private IsNullable GetIsNullablePrivate(PropertyRoute propertyRoute)
             if (propertyRoute.Type.IsValueType)
                 return propertyRoute.Type.IsNullable() ? IsNullable.Yes : IsNullable.No;
 
-            var nullable = FieldAttribute<NullableAttribute>(propertyRoute);
-            if (nullable != null && nullable.IsNullableMain == true)
+            var nullable = propertyRoute.FieldInfo?.IsNullable();
+            if (nullable == true)
                 return IsNullable.Yes;
 
             return IsNullable.No;

Signum.Engine/Signum.Engine.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <LangVersion>preview</LangVersion>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NullableContextOptions>enable</NullableContextOptions>
+    <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>    
     <Platforms>x64;x86;AnyCPU</Platforms>
   </PropertyGroup>

Signum.Entities/DynamicQuery/Tokens/ExtensionDictionaryToken.cs

@@ -8,7 +8,7 @@ namespace Signum.Entities.DynamicQuery
 {
     [Serializable]
     public class ExtensionDictionaryToken<T, K, V> : QueryToken
-        where K : object
+        where K : notnull
     {
         QueryToken parent;
         public override QueryToken? Parent => parent;

Signum.Entities/Reflection/EntityStructuralEqualityComparer.cs

@@ -97,7 +97,7 @@ public override int GetHashCode(T obj)
     }
 
     public class ClassStructuralEqualityComparer<T> : EqualityComparer<T>, ICompletableComparer
-        where T: object
+        where T: notnull
     {
         public Dictionary<string, PropertyComparer<T>> Properties;