Merge remote-tracking branch 'origin/develop' into 122_Partitions

# Conflicts:
#	ifrs17/Utils/ActivityLog.ipynb

ifrs17/Utils/ActivityLog.ipynb

@@ -300,8 +300,6 @@
                 "\n",
                 "\n    public string Source {get; init;}",
                 "\n",
-                "\n    public ImportFile() : base(){;}",
-                "\n",
                 "\n    public ImportFile(FileImportOptions options, IDataSetImportVariable importVariable, ISessionVariable session)",
                 "\n    {",
                 "\n        Options = options;",
@@ -489,7 +487,7 @@
                 "\n            FileImportOptions fio => await ReportInputAndUpdateActivityAsync<FileImportOptions, ImportFile>(log, fio, \"Import from File \"),",
                 "\n            StringImportOptions sgio => await ReportInputAndUpdateActivityAsync<StringImportOptions, ImportString>(log, sgio, \"Import from String\"),",
                 "\n            StreamImportOptions smio => await ReportInputAndUpdateActivityAsync<StreamImportOptions, ImportStream>(log, smio, \"Import from Stream\"),",
-                "\n            DataSetImportOptions dsio => await ReportInputAndUpdateActivityAsync<DataSetImportOptions, ImportDataSet>(log, dsio, \"Import fro Data Set\"),",
+                "\n            DataSetImportOptions dsio => await ReportInputAndUpdateActivityAsync<DataSetImportOptions, ImportDataSet>(log, dsio, \"Import from Data Set\"),",
                 "\n            _ => null,",
                 "\n        };",
                 "\n        if (activity is null) throw new Exception(\"Import Options object is not an instance of an appropriate class.\");",
@@ -510,15 +508,14 @@
                 "\n                                .WithDataSetReader(ImportVariable)",
                 "\n                                .WithOptions(options)",
                 "\n                                .InitializeImportDataAsync() as TImport;",
-                "\n            activity = activity with {SourceId = import.Id, ",
-                "\n                                    Category = categoryMessage};",
+                "\n            activity = activity with {SourceId = import.Id, Category = categoryMessage};",
                 "\n            await DataSource.UpdateAsync<TImport>(import.RepeatOnce());",
                 "\n        }",
                 "\n        catch (Exception e)",
                 "\n        {",
                 "\n            activity = activity with {SourceId = null, ",
-                "\n\t\t\t\t\t\t\t\t\tCategory = categoryMessage,",
-                "\n                                    ExceptionMessage = e.Message};",
+                "\n                Category = categoryMessage, ",
+                "\n                ExceptionMessage = e.Message};",
                 "\n        }",
                 "\n        return activity;",
                 "\n    }",
@@ -588,4 +585,4 @@
             "outputs": []
         }
     ]
-}
+}