Merge branch 'net7'

Author: olmobrutall

Signum.Analyzer/Signum.Analyzer.Test/Signum.Analyzer.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <Platforms>AnyCPU;x64</Platforms>
     <NoWarn>NU1201</NoWarn>

Signum.Engine.Extensions/Authorization/AzureADLogic.cs

@@ -546,13 +546,10 @@ public MicrosoftGraphCreateUserContext(User user)
     public string? SID => null;
 }
 
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
 public class ActiveDirectoryUser
 {
-    public string DisplayName;
-    public string UPN;
-    public Guid ObjectID;
-
-    public string JobTitle;
+    public required string DisplayName;
+    public required string UPN;
+    public required Guid ObjectID;
+    public required string JobTitle;
 }
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.

Signum.Engine.Extensions/Cache/Broadcast/AzureServiceBusBroadcast.cs

@@ -117,14 +117,11 @@ public override string ToString()
 
 }
 
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
 public class AzureInvalidationMessage
 {
-    public DateTime CreationDate;
-    public string OriginMachineName;
-    public string OriginApplicationName;
-    public string MethodName;
-
-    public string Argument { get; internal set; }
+    public required DateTime CreationDate;
+    public required string OriginMachineName;
+    public required string OriginApplicationName;
+    public required string MethodName;
+    public required string Argument;
 }
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.

Signum.Engine.Extensions/MachineLearning/PredictorAlgorithm.cs

@@ -190,28 +190,25 @@ public void SetCodifications(PredictorCodification[] codifications)
     }
 }
 
-#pragma warning disable CS8618 // Non-nullable field is uninitialized.
 public class MainQuery
 {
-    public QueryRequest QueryRequest { get; internal set; }
-    public ResultTable ResultTable { get; internal set; }
-    public Func<ResultRow, object?[]> GetParentKey { get; internal set; }
+    public required QueryRequest QueryRequest { get; set; }
+    public required ResultTable ResultTable { get; set; }
+    public required Func<ResultRow, object?[]> GetParentKey { get; set; }
 }
-#pragma warning restore CS8618 // Non-nullable field is uninitialized.
 
-#pragma warning disable CS8618 // Non-nullable field is uninitialized.
 public class SubQuery
 {
-    public PredictorSubQueryEntity SubQueryEntity;
-    public QueryRequest QueryGroupRequest;
-    public ResultTable ResultTable;
-    public Dictionary<object?[], Dictionary<object?[], object?[]>> GroupedValues;
+    public required PredictorSubQueryEntity SubQueryEntity;
+    public required QueryRequest QueryGroupRequest;
+    public required ResultTable ResultTable;
+    public required Dictionary<object?[], Dictionary<object?[], object?[]>> GroupedValues;
 
 
-    public ResultColumn[] SplitBy { get; internal set; }
-    public ResultColumn[] ValueColumns { get; internal set; }
+    public required ResultColumn[] SplitBy { get; set; }
+    public required ResultColumn[] ValueColumns { get; set; }
     //From ColumnIndex (i.e: [3->0, 4->1)
-    public Dictionary<int, int> ColumnIndexToValueIndex { get; internal set; }
+    public required Dictionary<int, int> ColumnIndexToValueIndex { get; set; }
 }
 #pragma warning restore CS8618 // Non-nullable field is uninitialized.
 

Signum.Engine.Extensions/MachineLearning/PredictorLogicQuery.cs

@@ -17,6 +17,7 @@ public static void RetrieveData(PredictorTrainingContext ctx)
             {
                 QueryRequest = mainQueryRequest,
                 ResultTable = mainResult,
+                GetParentKey = null!,
             };
 
             if (!mainQueryRequest.GroupResults)

Signum.Engine.Extensions/Migrations/SqlMigrationRunner.cs

@@ -371,12 +371,11 @@ public static void SquashMigrationHistory()
         SafeConsole.WriteLineColor(ConsoleColor.Green, "Initial Migration saved and marked as executed");
     }
 
-#pragma warning disable CS8618 // Non-nullable field is uninitialized.
     public class MigrationInfo
     {
-        public string? FileName;
-        public string Version;
-        public string Comment;
+        public required string? FileName;
+        public required string Version;
+        public required string Comment;
 
         public bool IsExecuted;
 
@@ -385,5 +384,4 @@ public override string ToString()
             return Version;
         }
     }
-#pragma warning restore CS8618 // Non-nullable field is uninitialized.
 }

Signum.Engine.Extensions/Processes/ProcessRunner.cs

@@ -517,29 +517,27 @@ public override string ToString()
 
 
 
-#pragma warning disable CS8618 // Non-nullable field is uninitialized.
 public class ProcessLogicState
 {
-    public int MaxDegreeOfParallelism;
-    public int? InitialDelayMilliseconds;
-    public string MachineName;
-    public string ApplicationName;
-    public bool Running;
-    public bool JustMyProcesses;
-    public DateTime? NextPlannedExecution;
-    public List<ExecutionState> Executing;
+    public required int MaxDegreeOfParallelism;
+    public required int? InitialDelayMilliseconds;
+    public required string MachineName;
+    public required string ApplicationName;
+    public required bool Running;
+    public required bool JustMyProcesses;
+    public required DateTime? NextPlannedExecution;
+    public required List<ExecutionState> Executing;
 }
 
 public class ExecutionState
 {
-    public Lite<ProcessEntity> Process;
-    public ProcessState State;
-    public bool IsCancellationRequested;
-    public decimal? Progress;
-    public string MachineName;
-    public string ApplicationName; 
+    public required Lite<ProcessEntity> Process;
+    public required ProcessState State;
+    public required bool IsCancellationRequested;
+    public required decimal? Progress;
+    public required string MachineName;
+    public required string ApplicationName; 
 }
-#pragma warning restore CS8618 // Non-nullable field is uninitialized.
 
 
 

Signum.Engine.Extensions/Scheduler/ScheduleTaskRunner.cs

@@ -346,34 +346,32 @@ public ScheduledTaskPair(ScheduledTaskEntity scheduledTask, DateTime nextDate)
 
 
 
-#pragma warning disable CS8618 // Non-nullable field is uninitialized.
 public class SchedulerState
 {
-    public bool Running;
-    public int? InitialDelayMilliseconds;
-    public TimeSpan SchedulerMargin;
-    public DateTime? NextExecution;
-    public List<SchedulerItemState> Queue;
-    public string MachineName;
-    public string ApplicationName;
-
-    public List<SchedulerRunningTaskState> RunningTask;
+    public required bool Running;
+    public required int? InitialDelayMilliseconds;
+    public required TimeSpan SchedulerMargin;
+    public required DateTime? NextExecution;
+    public required List<SchedulerItemState> Queue;
+    public required string MachineName;
+    public required string ApplicationName;
+
+    public required List<SchedulerRunningTaskState> RunningTask;
 }
 
 public class SchedulerItemState
 {
-    public Lite<ScheduledTaskEntity> ScheduledTask;
-    public string Rule;
-    public DateTime NextDate;
+    public required Lite<ScheduledTaskEntity> ScheduledTask;
+    public required string Rule;
+    public required DateTime NextDate;
 }
 
 public class SchedulerRunningTaskState
 {
-    public Lite<ScheduledTaskLogEntity> SchedulerTaskLog;
-    public DateTime StartTime;
-    public string Remarks;
+    public required Lite<ScheduledTaskLogEntity> SchedulerTaskLog;
+    public required DateTime StartTime;
+    public required string Remarks;
 }
-#pragma warning restore CS8618 // Non-nullable field is uninitialized.
 
 public class ScheduledTaskContext
 {

Signum.Engine.Extensions/Signum.Engine.Extensions.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<RootNamespace>Signum.Engine</RootNamespace>
 		<Nullable>enable</Nullable>
 		<WarningsAsErrors>nullable</WarningsAsErrors>

Signum.Engine.Extensions/Translation/TranslatedInstanceLogic.cs

@@ -457,15 +457,15 @@ public static FileContent ExportExcelFile(Type type, CultureInfo culture)
             .ToDictionary();
 
         var list = result
-            .OrderBy(a=>a.Key.Instance.Id)
-            .ThenBy(a=>a.Key.Route.PropertyInfo!.MetadataToken).Select(r => new ExcelRow
-        {
-            Instance = r.Key.Instance.Key(),
-            Path = r.Key.Route.PropertyString(),
-            RowId = r.Key.RowId?.ToString(),
-            Original = r.Value.OriginalText,
-            Translated = r.Value.TranslatedText
-        }).ToList();
+            .OrderBy(a => a.Key.Instance.Id)
+            .ThenBy(a => a.Key.Route.PropertyInfo!.MetadataToken).Select(r => new ExcelRow
+            {
+                Instance = r.Key.Instance.Key(),
+                Path = r.Key.Route.PropertyString(),
+                RowId = r.Key.RowId?.ToString(),
+                Original = r.Value.OriginalText,
+                Translated = r.Value.TranslatedText
+            }).ToList();
 
         return new FileContent(
             fileName: "{0}.{1}.View.xlsx".FormatWith(TypeLogic.GetCleanName(type), culture.Name),
@@ -651,13 +651,12 @@ internal TranslatableElement(Lite<Entity> entity, PropertyRoute route, MList<T>.
     }
 }
 
-#pragma warning disable CS8618 // Non-nullable field is uninitialized.
 public class TranslationRecord
 {
-    public CultureInfo Culture;
-    public LocalizedInstanceKey Key;
-    public string TranslatedText;
-    public string OriginalText;
+    public required CultureInfo Culture;
+    public required LocalizedInstanceKey Key;
+    public required string TranslatedText;
+    public required string OriginalText;
 
     public override string ToString()
     {
@@ -667,9 +666,9 @@ public override string ToString()
 
 public class InstanceChanges
 {
-    public Lite<Entity> Instance { get; set; }
+    public required Lite<Entity> Instance { get; set; }
 
-    public Dictionary<IndexedPropertyRoute, Dictionary<CultureInfo, PropertyRouteConflict>> RouteConflicts { get; set; }
+    public required Dictionary<IndexedPropertyRoute, Dictionary<CultureInfo, PropertyRouteConflict>> RouteConflicts { get; set; }
 
     public override string ToString()
     {
@@ -721,7 +720,7 @@ public class PropertyRouteConflict
     public string? OldOriginal;
     public string? OldTranslation;
 
-    public string Original;
+    public required string Original;
     public List<AutomaticTranslation> AutomaticTranslations = new List<AutomaticTranslation>();
 
     public override string ToString()
@@ -732,11 +731,11 @@ public override string ToString()
 
 class ExcelRow
 {
-    public string Instance; 
-    public string Path;
-    public string? RowId; 
-    public string Original; 
-    public string? Translated; 
+    public required string Instance; 
+    public required string Path;
+    public required string? RowId; 
+    public required string Original; 
+    public required string? Translated; 
 }
 
 public struct LocalizedInstanceKey : IEquatable<LocalizedInstanceKey>
@@ -786,8 +785,7 @@ public string RouteAndRowId()
 
 public class TranslatedTypeSummary
 {
-    public Type Type;
-    public CultureInfo CultureInfo;
-    public TranslatedSummaryState? State;
+    public required Type Type;
+    public required CultureInfo CultureInfo;
+    public required TranslatedSummaryState? State;
 }
-#pragma warning restore CS8618 // Non-nullable field is uninitialized.