Merge branch 'master' into dotnet3

# Conflicts: # Signum.Engine/Basics/ExceptionLogic.cs # Signum.Engine/Connection/Connector.cs # Signum.Engine/Connection/FieldReader.cs # Signum.Engine/EntityCache.cs # Signum.Engine/Signum.Engine.csproj # Signum.Entities/DynamicQuery/ResultTable.cs # Signum.Entities/EnumEntity.cs # Signum.Entities/Signum.Entities.csproj # Signum.React/Filters/SignumFilters.cs # Signum.Utilities/Extensions/EnumExtensions.cs
signumsoftware · Sep 25, 2019 · 59050df · 59050df
2 parents a4abea6 + 3c0bf87
commit 59050df
Show file tree

Hide file tree

Showing 78 changed files with 1,435 additions and 1,065 deletions.
diff --git a/Signum.Engine/Administrator.cs b/Signum.Engine/Administrator.cs
@@ -41,7 +41,7 @@ from c in t.Columns()
                  select new DiffColumn
                  {
                      Name = c.name,
-                     SqlDbType = SchemaSynchronizer.ToSqlDbType(c.Type().name),
+                     SqlDbType = SchemaSynchronizer.ToSqlDbType(c.Type()!.name),
                      UserTypeName = null,
                      Identity = c.is_identity,
                      Nullable = c.is_nullable,

diff --git a/Signum.Engine/Basics/ExceptionLogic.cs b/Signum.Engine/Basics/ExceptionLogic.cs
@@ -14,8 +14,6 @@ namespace Signum.Engine.Basics
 {
 	public static class ExceptionLogic
 	{
-		public static Func<string>? GetCurrentVersion;
-
 		public static void Start(SchemaBuilder sb)
 		{
 			if (sb.NotDefined(MethodInfo.GetCurrentMethod()))
@@ -117,7 +115,7 @@ static ExceptionEntity SaveForceNew(this ExceptionEntity entity)
 
 		static readonly Variable<string?> overridenEnvironment = Statics.ThreadVariable<string?>("exceptionEnviroment");
 
-		public static IDisposable OverrideEnviroment(string newEnviroment)
+		public static IDisposable OverrideEnviroment(string? newEnviroment)
 		{
 			string? oldEnviroment = overridenEnvironment.Value;
 			overridenEnvironment.Value = newEnviroment;

diff --git a/Signum.Engine/CodeGeneration/EntityCodeGenerator.cs b/Signum.Engine/CodeGeneration/EntityCodeGenerator.cs
@@ -498,7 +498,7 @@ protected virtual string GetTicksColumnAttribute(DiffTable table)
 
         protected virtual string? GetPrimaryKeyAttribute(DiffTable table)
         {
-            DiffColumn primaryKey = GetPrimaryKeyColumn(table);
+            DiffColumn? primaryKey = GetPrimaryKeyColumn(table);
 
             if (primaryKey == null)
                 return null;
@@ -529,7 +529,7 @@ protected virtual string GetTicksColumnAttribute(DiffTable table)
             return null;
         }
 
-        protected virtual DiffColumn GetPrimaryKeyColumn(DiffTable table)
+        protected virtual DiffColumn? GetPrimaryKeyColumn(DiffTable table)
         {
             return table.Columns.Values.SingleOrDefaultEx(a => a.PrimaryKey);
         }