MoveArchive allow empty directory and

continueOnError for clean files

Adaptation/.editorconfig

@@ -76,13 +76,18 @@ csharp_using_directive_placement = outside_namespace
 dotnet_code_quality_unused_parameters = all
 dotnet_code_quality_unused_parameters = non_public # IDE0060: Remove unused parameter
 dotnet_code_quality.CAXXXX.api_surface = private, internal
+dotnet_diagnostic.CA1816.severity = none # CA1816: Call GC.SuppressFinalize correctly
 dotnet_diagnostic.CA1825.severity = warning # CA1823: Avoid zero-length array allocations
 dotnet_diagnostic.CA1829.severity = warning # CA1829: Use Length/Count property instead of Count() when available
 dotnet_diagnostic.CA1834.severity = warning # CA1834: Consider using 'StringBuilder.Append(char)' when applicable
+dotnet_diagnostic.CA1846.severity = none # CA1846: Prefer AsSpan over Substring
+dotnet_diagnostic.CA1847.severity = none # CA1847: Use string.Contains(char) instead of string.Contains(string) with single characters
 dotnet_diagnostic.IDE0001.severity = warning # IDE0001: Simplify name
 dotnet_diagnostic.IDE0002.severity = warning # Simplify (member access) - System.Version.Equals("1", "2"); Version.Equals("1", "2");
+dotnet_diagnostic.IDE0004.severity = warning # IDE0004: Cast is redundant.
 dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary
 dotnet_diagnostic.IDE0047.severity = warning # IDE0047: Parentheses can be removed
+dotnet_diagnostic.IDE0049.severity = warning # Use language keywords instead of framework type names for type references (IDE0049)
 dotnet_diagnostic.IDE0060.severity = warning # IDE0060: Remove unused parameter
 dotnet_naming_rule.abstract_method_should_be_pascal_case.severity = warning
 dotnet_naming_rule.abstract_method_should_be_pascal_case.style = pascal_case
@@ -215,7 +220,7 @@ dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
 dotnet_style_parentheses_in_other_operators = never_if_unnecessary
 dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
 dotnet_style_predefined_type_for_locals_parameters_members = true
-dotnet_style_predefined_type_for_member_access = true
+dotnet_style_predefined_type_for_member_access = true:warning
 dotnet_style_prefer_auto_properties = true:warning
 dotnet_style_prefer_compound_assignment = true:warning
 dotnet_style_prefer_conditional_expression_over_assignment = false

Adaptation/FileHandlers/Archive/FileRead.cs

@@ -115,7 +115,7 @@ public class FileRead : Shared.FileRead, IFileRead
         }
     }
 
-    private void MoveArchive(DateTime dateTime)
+    private void MoveArchive(string reportFullPath, DateTime dateTime)
     {
         if (dateTime == DateTime.MinValue)
         { }
@@ -128,12 +128,17 @@ public class FileRead : Shared.FileRead, IFileRead
         string jobIdDirectory = Path.Combine(_JobIdParentDirectory, _Logistics.JobID);
         if (!Directory.Exists(jobIdDirectory))
             _ = Directory.CreateDirectory(jobIdDirectory);
-        string[] matchDirectories = new string[] { GetDirectoriesRecursively(jobIdDirectory, logisticsSequence).FirstOrDefault() };
+        if (!Directory.GetDirectories(jobIdDirectory).Any())
-        if ((matchDirectories is null) || matchDirectories.Length != 1)
+            File.Copy(reportFullPath, Path.Combine(destinationArchiveDirectory, Path.GetFileName(reportFullPath)));
-            throw new Exception("Didn't find directory by logistics sequence");
+        else
-        string sourceDirectory = Path.GetDirectoryName(matchDirectories[0]);
+        {
-        destinationArchiveDirectory = Path.Combine(destinationArchiveDirectory, Path.GetFileName(sourceDirectory));
+            string[] matchDirectories = GetDirectoriesRecursively(jobIdDirectory, logisticsSequence).ToArray();
-        Directory.Move(sourceDirectory, destinationArchiveDirectory);
+            if (matchDirectories.Length != 1)
+                throw new Exception("Didn't find directory by logistics sequence");
+            string sourceDirectory = Path.GetDirectoryName(matchDirectories[0]);
+            destinationArchiveDirectory = Path.Combine(destinationArchiveDirectory, Path.GetFileName(sourceDirectory));
+            Directory.Move(sourceDirectory, destinationArchiveDirectory);
+        }
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
@@ -146,7 +151,7 @@ public class FileRead : Shared.FileRead, IFileRead
         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            MoveArchive(dateTime);
+            MoveArchive(reportFullPath, dateTime);
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }

Adaptation/FileHandlers/Processed/FileRead.cs

@@ -118,7 +118,7 @@ public class FileRead : Shared.FileRead, IFileRead
         if (!Directory.Exists(jobIdDirectory))
             _ = Directory.CreateDirectory(jobIdDirectory);
         string[] matchDirectories = GetInProcessDirectory(jobIdDirectory);
-        if ((matchDirectories is null) || matchDirectories.Length != 1)
+        if (matchDirectories.Length != 1)
             throw new Exception("Didn't find directory by logistics sequence");
         if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime)
             File.SetLastWriteTime(reportFullPath, fileInfo.CreationTime);

Adaptation/MET08THFTIRSTRATUS-Development.yml

@@ -92,10 +92,11 @@ steps:
   - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
     workingDirectory: Adaptation
     displayName: "Core Build - Adaptation"
-  
+
   - powershell: Get-ChildItem .\ -include TestResults -Recurse | foreach ($_) { remove-item $_.fullname -Force -Recurse }
     workingDirectory: "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)"
-    displayName: 'PowerShell Script'
+    displayName: "PowerShell Script"
+    continueOnError: true
 
   - script: "dotnet test --configuration $(Configuration)"
     workingDirectory: Adaptation

Adaptation/MET08THFTIRSTRATUS.yml

@@ -89,10 +89,11 @@ steps:
   - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
     workingDirectory: Adaptation
     displayName: "Core Build - Adaptation"
-  
+
   - powershell: Get-ChildItem .\ -include TestResults -Recurse | foreach ($_) { remove-item $_.fullname -Force -Recurse }
     workingDirectory: "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)"
-    displayName: 'PowerShell Script'
+    displayName: "PowerShell Script"
+    continueOnError: true
 
   - script: "dotnet test --configuration $(Configuration)"
     workingDirectory: Adaptation