Removed save-open-insight-file to use process-data-standard-format instead

EDA logic

.gitignore

@@ -331,11 +331,15 @@ ASALocalRun/
 ##
 ## Visual Studio Code
 ##
-*/!.vscode/extensions.json
-*/!.vscode/launch.json
-*/!.vscode/settings.json
-*/!.vscode/tasks.json
-*/.vscode/*
-*/.vscode/ReportGenerator/*
+**/.vscode/*
+!**/.vscode/extensions.json
+!**/.vscode/format-report.json
+!**/.vscode/launch.json
+!**/.vscode/settings.json
+!**/.vscode/tasks.json
+!**/.vscode/mklink.md
 
 *.lnk
+
+.kanbn
+Adaptation/.kanbn

.vscode/settings.json

@@ -1,12 +1,55 @@
 {
-    "cSpell.words": [
-        "Epuipment",
-        "Idrv",
-        "Irng",
-        "Rcpe",
-        "RESIMAPCDE",
-        "Rsens",
-        "Smpl",
-        "Vrng"
-    ]
+  "files.eol": "\n",
+  "[markdown]": {
+    "editor.wordWrap": "off"
+  },
+  "cSpell.words": [
+    "PDSF",
+    "Syncthing"
+  ],
+  "files.exclude": {
+    "**/node_modules": true
+  },
+  "files.watcherExclude": {
+    "**/node_modules": true
+  },
+  "foam.files.ignore": [
+    ".foam/**/*",
+    ".stfolder/**/*",
+    "**/_layouts/**/*",
+    "**/_site/**/*",
+    "**/.vscode/**/*",
+    "**/node_modules/**/*"
+  ],
+  "kanbn.showBurndownButton": false,
+  "kanbn.showSprintButton": false,
+  "foam.links.hover.enable": false,
+  "foam.placeholders.exclude": [
+    ".kanbn/Archive/**/*"
+  ],
+  "foam.orphans.exclude": [
+    ".journal/**/*"
+  ],
+  "foam.graph.style": {
+    "background": "#202020",
+    "node": {
+      "wired": "green",
+      "wireless": "orange",
+      "person": "white",
+      "topic": "#bc2a3c",
+      "kanbn": "#ff7b00",
+      "basic-note": "#773b93",
+      "daily-note": "#ff9d00",
+      "note": "#f2cb1d",
+      "placeholder": "#ff9d00",
+      "tag": "#0494c1",
+      "bug": "#bc2a3c",
+      "epic": "#ff7b00",
+      "feature": "#773b93",
+      "issue": "#ff9d00",
+      "task": "#f2cb1d",
+      "test-case": "#ff9d00",
+      "user-story": "#0494c1"
+    }
+  }
 }

Adaptation/.editorconfig

@@ -1,3 +1,19 @@
+[*.md]
+end_of_line = crlf
+file_header_template = unset
+indent_size = 2
+indent_style = space
+insert_final_newline = false
+root = true
+tab_width = 2
+[*.csproj]
+end_of_line = crlf
+file_header_template = unset
+indent_size = 2
+indent_style = space
+insert_final_newline = false
+root = true
+tab_width = 2
 [*.cs]
 csharp_indent_block_contents = true
 csharp_indent_braces = false
@@ -76,19 +92,38 @@ 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.CA1510.severity = none # CA1510: Use 'ArgumentNullException.ThrowIfNull' instead of explicitly throwing a new exception instance
 dotnet_diagnostic.CA1816.severity = none # CA1816: Call GC.SuppressFinalize correctly
-dotnet_diagnostic.CA1825.severity = warning # CA1823: Avoid zero-length array allocations
+dotnet_diagnostic.CA1825.severity = warning # CA1825: 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.CA1854.severity = warning # CA1854: Prefer a 'TryGetValue' call over a Dictionary indexer access guarded by a 'ContainsKey' check to avoid double lookup
+dotnet_diagnostic.CA1860.severity = error # CA1860: Prefer comparing 'Count' to 0 rather than using 'Any()', both for clarity and for performance
+dotnet_diagnostic.CA1861.severity = none # CA1861: Prefer 'static readonly' fields over constant array arguments
+dotnet_diagnostic.CA1862.severity = none # CA1862: Prefer using 'string.Equals(string, StringComparison)' to perform a case-insensitive comparison, but keep in mind that this might cause subtle changes in behavior, so make sure to conduct thorough testing after applying the suggestion, or if culturally sensitive comparison is not required, consider using 'StringComparison.OrdinalIgnoreCase'
+dotnet_diagnostic.CA1864.severity = none # CA1864: To avoid double lookup, call 'TryAdd' instead of calling 'Add' with a 'ContainsKey' guard
+dotnet_diagnostic.CA1866.severity = none # CA1866: Use 'string.EndsWith(char)' instead of 'string.EndsWith(string)' when you have a string with a single char
+dotnet_diagnostic.CA1869.severity = none # CA1869: Avoid creating a new 'JsonSerializerOptions' instance for every serialization operation. Cache and reuse instances instead.
+dotnet_diagnostic.CA2254.severity = none # CA2254: The logging message template should not vary between calls to 'LoggerExtensions.LogInformation(ILogger, string?, params object?[])'
 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.IDE0028.severity = none # IDE0028: Collection initialization can be simplified
+dotnet_diagnostic.IDE0031.severity = warning # Use null propagation (IDE0031)
 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_diagnostic.IDE0200.severity = warning # IDE0200: Lambda expression can be removed
+dotnet_diagnostic.IDE0270.severity = none # IDE0270: Null check can be simplified
+dotnet_diagnostic.IDE0290.severity = none # Use primary constructor [Distance]csharp(IDE0290)
+dotnet_diagnostic.IDE0300.severity = none # IDE0300: Collection initialization can be simplified
+dotnet_diagnostic.IDE0301.severity = none #IDE0301: Collection initialization can be simplified
+dotnet_diagnostic.IDE0305.severity = none # IDE0305: Collection initialization can be simplified
+dotnet_diagnostic.MSTEST0037.severity = error # MSTEST0037: Use proper 'Assert' methods
+dotnet_diagnostic.SYSLIB1045.severity = none # SYSLIB1045: diagnostics for regex source generation
 dotnet_naming_rule.abstract_method_should_be_pascal_case.severity = warning
 dotnet_naming_rule.abstract_method_should_be_pascal_case.style = pascal_case
 dotnet_naming_rule.abstract_method_should_be_pascal_case.symbols = abstract_method

Adaptation/.kanbn/board.css

@@ -0,0 +1,7 @@
+.kanbn-task-data-workload {
+  display: none;
+}
+.kanbn-task-data-relation {
+  display: block;
+  color: #198038;
+}

Adaptation/.kanbn/index.md

@@ -0,0 +1,21 @@
+---
+type: "Kanban"
+startedColumns:
+  - 'In Progress'
+completedColumns:
+  - Done
+dateFormat: mm/dd
+taskTemplate: '^+^_${overdue ? ''^R'' : ''''}${name}^: ${relations ? (''\n^-^/^g'' + relations.reduce((accumulator, currentValue) => accumulator.task + currentValue.task + '' '', '''')) : ''''}'
+created: "2024-01-14T02:18:19.123Z"
+updated: "2024-04-11T16:09:57.765Z"
+---
+
+# MET08RESIMAPCDE
+
+## Backlog
+
+## Todo
+
+## In Progress
+
+## Done

Adaptation/.vscode/Reactor.js

@@ -1,22 +0,0 @@
-// (self.length != 0) ?
-//     self :
-//     (getContextData('2', 'cds.PROCESS_JOBID', '') == '-') ?
-//         self :
-//         getContextData('2', 'cds.PROCESS_JOBID', '')
-
-getValue(self, self.length, $('dcp.CDE5/RsM/MesEntity', ''), $('dcp.CDE5/RsM/Recipe', ''), getContextData('2', 'cds.PROCESS_JOBID', ''));
-
-function getValue(value, length, mesEntity, recipe, processJobId) {
-    if (recipe.toUpperCase() === 'STANDARD \\ RLOW_STD')
-        return mesEntity;
-    else if (recipe.toUpperCase() === 'STANDARD \\ RMID_STD')
-        return mesEntity;
-    else if (recipe.toUpperCase() === 'STANDARD \\ RHI_STD')
-        return mesEntity;
-    else if (recipe.toUpperCase() === 'STANDARD \\ THINSPC')
-        return mesEntity;
-    else if (length === 0)
-        return processJobId;
-    else
-        return value;
-}

Adaptation/.vscode/launch.json

@@ -4,7 +4,13 @@
       "name": ".NET Core Attach",
       "type": "coreclr",
       "request": "attach",
-      "processId": 19112
+      "processId": 21452
+    },
+    {
+        "type": "node",
+        "request": "launch",
+        "name": "node Launch Current Opened File",
+        "program": "${file}"
     }
   ]
 }

Adaptation/.vscode/mklink.md

@@ -0,0 +1,5 @@
+# mklink
+
+```bash
+mklink /J "T:\MET08RESISRP2100\06_SourceCode\MET08RESISRP2100\Adaptation\.kanbn" "D:\5-Other-Small\Kanban\MET08RESISRP2100"
+```

Adaptation/.vscode/psn.js

@@ -1,22 +0,0 @@
-// (self.length != 0) ?
-//     self :
-//     (getContextData('2', 'cds.PRODUCT', '') == '-') ?
-//         self :
-//         getContextData('2', 'cds.PRODUCT', '')
-
-getValue(self, self.length, getContextData('2', 'cds.PRODUCT', ''), $('dcp.CDE5/RsM/Recipe', ''));
-
-function getValue(value, length, product, recipe) {
-    if (recipe.toUpperCase() === 'STANDARD \\ RLOW_STD')
-        return 'RLOW_STD';
-    else if (recipe.toUpperCase() === 'STANDARD \\ RMID_STD')
-        return 'RMID_STD';
-    else if (recipe.toUpperCase() === 'STANDARD \\ RHI_STD')
-        return 'RHI_STD';
-    else if (recipe.toUpperCase() === 'STANDARD \\ THINSPC')
-        return 'THINSPC';
-    else if (length === 0)
-        return product;
-    else
-        return value;
-}

Adaptation/.vscode/settings.json

@@ -1,4 +1,7 @@
 {
+    "[markdown]": {
+        "editor.wordWrap": "off"
+    },
     "cSpell.words": [
         "datauniqueid",
         "Epuipment",

Adaptation/.vscode/tasks.json

@@ -2,41 +2,139 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "build",
+            "label": "Build",
             "command": "dotnet",
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/MET08RESIMAPCDE.Tests.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "publish",
+            "label": "Test-Debug",
             "command": "dotnet",
             "type": "process",
             "args": [
-                "publish",
-                "${workspaceFolder}/MET08RESIMAPCDE.Tests.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "test",
+                "-c",
+                "Debug"
             ],
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "watch",
+            "label": "Test-Release",
             "command": "dotnet",
             "type": "process",
             "args": [
-                "watch",
-                "run",
-                "${workspaceFolder}/MET08RESIMAPCDE.Tests.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "test",
+                "-c",
+                "Release"
             ],
             "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Format",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "format",
+                "--report",
+                ".vscode",
+                "--verbosity",
+                "detailed",
+                "--severity",
+                "warn"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Format-Whitespaces",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "format",
+                "whitespace"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Nuget Clear",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "nuget",
+                "locals",
+                "all",
+                "--clear"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "MSBuild for EAF Deployment Packages",
+            "command": "C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe",
+            "type": "process",
+            "args": [
+                "/target:Build",
+                "/restore:True",
+                "/p:RestoreSources=https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/%3Bhttps://tfs.intra.infineon.com/tfs/FactoryIntegration/_packaging/EAF/nuget/v3/index.json%3Bhttps://tfs.intra.infineon.com/tfs/FactoryIntegration/_packaging/EAF%40Local/nuget/v3/index.json%3Bhttps://api.nuget.org/v3/index.json",
+                "/detailedsummary",
+                "/consoleloggerparameters:PerformanceSummary;ErrorsOnly;",
+                "/property:Configuration=Debug;TargetFrameworkVersion=v4.8",
+                "../MET08RESIMAPCDE.csproj"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Project",
+            "type": "shell",
+            "command": "code ../MET08RESIMAPCDE.csproj",
+            "problemMatcher": []
+        },
+        {
+            "label": "Readme",
+            "type": "shell",
+            "command": "code ../README.md",
+            "problemMatcher": []
+        },
+        {
+            "label": "File-Folder-Helper AOT s X Day-Helper-2025-03-20",
+            "type": "shell",
+            "command": "L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net8.0/win-x64/publish/File-Folder-Helper.exe",
+            "args": [
+                "s",
+                "X",
+                "L:/DevOps/EAF-Mesa-Integration/MET08RESIMAPCDE",
+                "Day-Helper-2025-03-20",
+                "false",
+                "4"
+            ],
+            "problemMatcher": []
+        },
+        {
+            "label": "Git Config",
+            "type": "shell",
+            "command": "code ../.git/config",
+            "problemMatcher": []
+        },
+        {
+            "label": "Kanbn Console",
+            "type": "npm",
+            "script": "kanbn.board",
+            "problemMatcher": []
+        },
+        {
+            "label": "Kanbn Write Boad",
+            "type": "shell",
+            "command": "& kanbn board -j | L:/Git/kanbn2md/kanbn2md.exe >.kanbn/board.md",
+            "problemMatcher": []
+        },
+        {
+            "label": "Kanbn Write json",
+            "type": "npm",
+            "script": "kanbn.board.json",
+            "problemMatcher": []
         }
     ]
 }

Adaptation/FileHandlers/APC/FileRead.cs

@@ -14,8 +14,8 @@ namespace Adaptation.FileHandlers.APC;
 public class FileRead : Shared.FileRead, IFileRead
 {
 
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<Shared.Metrology.WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
         _MinFileLength = 10;
         _NullData = string.Empty;
@@ -120,15 +120,15 @@ public class FileRead : Shared.FileRead, IFileRead
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
-        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
         SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             FileCopy(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/Archive/FileRead.cs

@@ -18,8 +18,8 @@ public class FileRead : Shared.FileRead, IFileRead
     private readonly string _JobIdParentDirectory;
     private readonly string _JobIdArchiveParentDirectory;
 
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<Shared.Metrology.WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
         _MinFileLength = 10;
         _NullData = string.Empty;
@@ -118,17 +118,18 @@ public class FileRead : Shared.FileRead, IFileRead
     private void MoveArchive(string reportFullPath, DateTime dateTime)
     {
         if (dateTime == DateTime.MinValue)
-        { }
+            throw new ArgumentNullException(nameof(dateTime));
         string logisticsSequence = _Logistics.Sequence.ToString();
+        string day = $"{_Logistics.DateTimeFromSequence:yyyy-MM-dd}";
         string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
-        string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}{@"\"}{_Logistics.DateTimeFromSequence:yyyy-MM-dd}";
-        string destinationArchiveDirectory = Path.Combine(_JobIdArchiveParentDirectory, _Logistics.JobID, weekDirectory);
+        string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}";
+        string destinationArchiveDirectory = Path.Combine(_JobIdArchiveParentDirectory, _Logistics.JobID, weekDirectory, day);
         if (!Directory.Exists(destinationArchiveDirectory))
             _ = Directory.CreateDirectory(destinationArchiveDirectory);
         string jobIdDirectory = Path.Combine(_JobIdParentDirectory, _Logistics.JobID);
         if (!Directory.Exists(jobIdDirectory))
             _ = Directory.CreateDirectory(jobIdDirectory);
-        if (!Directory.GetDirectories(jobIdDirectory).Any())
+        if (Directory.GetDirectories(jobIdDirectory).Length == 0)
             File.Copy(reportFullPath, Path.Combine(destinationArchiveDirectory, Path.GetFileName(reportFullPath)));
         else
         {
@@ -144,15 +145,15 @@ public class FileRead : Shared.FileRead, IFileRead
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
-        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
         SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             MoveArchive(reportFullPath, dateTime);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/CellInstanceConnectionName.cs

@@ -9,23 +9,22 @@ namespace Adaptation.FileHandlers;
 public class CellInstanceConnectionName
 {
 
-    internal static IFileRead Get(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted)
+    internal static IFileRead Get(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<Shared.Metrology.WS.Results>> staticRuns, bool useCyclicalForDescription, int? connectionCount)
     {
         IFileRead result = cellInstanceConnectionName switch
         {
-            nameof(APC) => new APC.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(Archive) => new Archive.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(DownloadRsMFile) => new DownloadRsMFile.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(Dummy) => new Dummy.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(IQSSi) => new IQSSi.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(MoveMatchingFiles) => new MoveMatchingFiles.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(OpenInsight) => new OpenInsight.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(OpenInsightMetrologyViewer) => new OpenInsightMetrologyViewer.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(OpenInsightMetrologyViewerAttachments) => new OpenInsightMetrologyViewerAttachments.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(txt) => new txt.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(Processed) => new Processed.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(RsM) => new RsM.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(SPaCe) => new SPaCe.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
+            nameof(APC) => new APC.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(Archive) => new Archive.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(DownloadRsMFile) => new DownloadRsMFile.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(Dummy) => new Dummy.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(IQSSi) => new IQSSi.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(MoveMatchingFiles) => new MoveMatchingFiles.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(OpenInsight) => new OpenInsight.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(OpenInsightMetrologyViewer) => new OpenInsightMetrologyViewer.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(OpenInsightMetrologyViewerAttachments) => new OpenInsightMetrologyViewerAttachments.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(Processed) => new Processed.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(RsM) => new RsM.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(SPaCe) => new SPaCe.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
             _ => throw new Exception($"\"{cellInstanceConnectionName}\" not mapped")
         };
         return result;

Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs

@@ -22,8 +22,8 @@ public class FileRead : Shared.FileRead, IFileRead
     private readonly HttpClient _HttpClient;
     private readonly string _StaticFileServer;
 
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<Shared.Metrology.WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
         _MinFileLength = 10;
         _NullData = string.Empty;
@@ -110,14 +110,7 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
-    {
-        if (reportFullPath is null)
-        { }
-        if (dateTime == DateTime.MinValue)
-        { }
-        throw new Exception(string.Concat("See ", nameof(Callback)));
-    }
+    private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime) => throw new Exception(string.Concat("See ", nameof(Callback)));
 
     private void DownloadRsMFileAsync()
     {
@@ -223,13 +216,13 @@ public class FileRead : Shared.FileRead, IFileRead
                     possibleDownload.Add(new(matchNginxFileSystemDateTime, targetFileInfo, alternateFileInfo, targetFileName));
                     break;
                 }
-                if (possibleDownload.Any())
+                if (possibleDownload.Count != 0)
                     break;
             }
-            if (possibleDownload.Any())
+            if (possibleDownload.Count != 0)
                 break;
         }
-        if (possibleDownload.Any())
+        if (possibleDownload.Count != 0)
         {
             possibleDownload = (from l in possibleDownload orderby l.Item1 select l).ToList();
             alternateFileInfo = possibleDownload[0].Item3;

Adaptation/FileHandlers/Dummy/FileRead.cs

@@ -23,8 +23,8 @@ public class FileRead : Shared.FileRead, IFileRead
     private int _LastDummyRunIndex;
     private readonly string[] _CellNames;
 
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<Shared.Metrology.WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
         _MinFileLength = 10;
         _NullData = string.Empty;
@@ -157,7 +157,7 @@ public class FileRead : Shared.FileRead, IFileRead
         if (!Directory.Exists(inProcessDirectory))
             _ = Directory.CreateDirectory(inProcessDirectory);
         files = Directory.GetFiles(inProcessDirectory, "*", SearchOption.AllDirectories);
-        if (files.Any())
+        if (files.Length != 0)
         {
             if (files.Length > 250)
                 throw new Exception("Safety net!");

Adaptation/FileHandlers/IQSSi/FileRead.cs

@@ -14,8 +14,8 @@ namespace Adaptation.FileHandlers.IQSSi;
 public class FileRead : Shared.FileRead, IFileRead
 {
 
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<Shared.Metrology.WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
         _MinFileLength = 10;
         _NullData = string.Empty;
@@ -118,18 +118,16 @@ public class FileRead : Shared.FileRead, IFileRead
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
-        if (dateTime == DateTime.MinValue)
-        { }
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
-        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
         SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             FileCopy(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs

@@ -5,6 +5,7 @@ using Adaptation.Shared.Duplicator;
 using Adaptation.Shared.Methods;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -13,11 +14,67 @@ using System.Threading;
 
 namespace Adaptation.FileHandlers.MoveMatchingFiles;
 
+#nullable enable
+
 public class FileRead : Shared.FileRead, IFileRead
 {
 
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    internal class PreWith
+    {
+
+        internal string ErrFile { get; private set; }
+        internal string CheckFile { get; private set; }
+        internal string MatchingFile { get; private set; }
+        internal string CheckDirectory { get; private set; }
+        internal string NoWaitDirectory { get; private set; }
+
+        internal PreWith(string checkDirectory,
+                         string checkFile,
+                         string errFile,
+                         string matchingFile,
+                         string noWaitDirectory)
+        {
+            ErrFile = errFile;
+            CheckFile = checkFile;
+            MatchingFile = matchingFile;
+            CheckDirectory = checkDirectory;
+            NoWaitDirectory = noWaitDirectory;
+        }
+
+    }
+
+    internal class Pre
+    {
+
+        internal string MatchingFile { get; private set; }
+        internal string CheckFile { get; private set; }
+
+        internal Pre(string matchingFile, string checkFile)
+        {
+            MatchingFile = matchingFile;
+            CheckFile = checkFile;
+        }
+
+    }
+
+    internal class Post
+    {
+
+        internal string ErrFile { get; private set; }
+        internal string CheckFile { get; private set; }
+
+        internal Post(string checkFile, string errFile)
+        {
+            ErrFile = errFile;
+            CheckFile = checkFile;
+        }
+
+    }
+
+    private readonly ProcessDataStandardFormatMapping _ProcessDataStandardFormatMapping;
+
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<Shared.Metrology.WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
         _MinFileLength = 10;
         _NullData = string.Empty;
@@ -28,6 +85,12 @@ public class FileRead : Shared.FileRead, IFileRead
             throw new Exception(cellInstanceConnectionName);
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
+        string processDataStandardFormatMappingOldColumnNames = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Process.Data.Standard.Format.Mapping.Old.Column.Names");
+        string processDataStandardFormatMappingNewColumnNames = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Process.Data.Standard.Format.Mapping.New.Column.Names");
+        string processDataStandardFormatMappingColumnIndices = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Process.Data.Standard.Format.Mapping.Column.Indices");
+        _ProcessDataStandardFormatMapping = GetProcessDataStandardFormatMapping(processDataStandardFormatMappingOldColumnNames,
+                                                                                processDataStandardFormatMappingNewColumnNames,
+                                                                                processDataStandardFormatMappingColumnIndices);
     }
 
     void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception)
@@ -42,7 +105,8 @@ public class FileRead : Shared.FileRead, IFileRead
         Move(extractResults);
     }
 
-    void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null);
+    void IFileRead.WaitForThread() =>
+        WaitForThread(thread: null, threadExceptions: null);
 
     string IFileRead.GetEventDescription()
     {
@@ -89,7 +153,7 @@ public class FileRead : Shared.FileRead, IFileRead
         DateTime dateTime = DateTime.Now;
         results = GetExtractResult(reportFullPath, dateTime);
         if (results.Item3 is null)
-            results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(results.Item1, Array.Empty<Test>(), JsonSerializer.Deserialize<JsonElement[]>("[]"), results.Item4);
+            results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(results.Item1, Array.Empty<Test>(), JsonSerializer.Deserialize<JsonElement[]>("[]") ?? throw new Exception(), results.Item4);
         if (results.Item3.Length > 0 && _IsEAFHosted)
             WritePDSF(this, results.Item3);
         UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks);
@@ -105,7 +169,73 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    private static List<string> GetSearchDirectories(int numberLength, string parentDirectory)
+    private static ProcessDataStandardFormatMapping GetProcessDataStandardFormatMapping(string processDataStandardFormatMappingOldColumnNames, string processDataStandardFormatMappingNewColumnNames, string processDataStandardFormatMappingColumnIndices)
+    {
+        ProcessDataStandardFormatMapping result;
+        string[] segmentsB;
+        List<string> distinct = new();
+        Dictionary<string, string> keyValuePairs = new();
+        string args4 = "Time,HeaderUniqueId,UniqueId,Date,Id,Lot";
+        string args5 = "";
+        string args6 = "StandardDeviationPercentage,SheetRhoVariation,CDE5";
+        string args7 = "Test|EventId,Run|Title,Employee|Operator,EquipId|Equipment,Recipe|RecipeName,FileName|TheFileName,DataReject|DataRejectSigma,Merit|MeritGOF,T|Th,StdDev|StandardDeviationPercentage";
+        // string args8 = "Time,A_LOGISTICS,B_LOGISTICS,Test,Count,Index,MesEntity,Date,Employee,Lot,PSN,Reactor,Recipe,AutoOptimizeGain,AutoProbeHeightSet,Avg,DataReject,DLRatio,Merit,Pt,R,ResistivitySpec,Rs,SemiRadial,StdDev,T,Temp,Engineer,EquipId,FileName,HeaderUniqueId,Id,Layer,RDS,Run,UniqueId,Zone,SheetRhoVariation";
+        // string args9 = "Time,A_LOGISTICS,B_LOGISTICS,Count,Sequence,MesEntity,Index,Title,TheFileName,Project,RecipeName,LotID,WfrID,Is_TF_DataFile,Directory,Time,Date,Temp,TCRPercent,NOrP,Avg,Dev,Min,Max,Operator,Equipment,Engineer,AreaOrDiamScan,WaferShape,BNBand,TemplateFile,XSize,YSize,CalibrationFactor,MsmtMode,DataType,DataUnit,NumProbePoints,SingleOrDualProbeConfig,NumberActPrbPts,Rsens,IdrvMx,VinGain,DataRejectSigma,MeritThreshold,PrbChgNumber,PrbName,WaferSize,EdgeEx,Xll,Yll,Xur,Yur,X,Y,CutCorners,DiamThScan,DiamStart,DiamEnd,DiamStep,FlatOrNotch,FollowMajorFlat,AutoOrManualLoad,RangeOrIndividual,PauseAfterEveryRun,AutoPrint,Plot,BulkSampleThk,Unit,RangeFrom,RangeTo,CassetteSlotSelected,R,Th,Data,Rs,RsA,RsB,NumberSample,PointX,PointY,Irng,Vrng,ChiSq,MeritGOF,DataIntegrity,RDS,PSN,Reactor,Layer,Zone,Employee,InferredLot,StandardDeviationPercentage,SheetRhoVariation,EventId";
+        // string args10 = "0,1,2,95,3,6,5,16,24,-1,87,88,10,-1,-1,20,43,-1,84,-1,72,-1,75,-1,93,73,17,26,25,8,-1,-1,89,86,7,-1,90,94";
+        string[] segments = args7.Split(',');
+        ReadOnlyCollection<string> ignoreColumns = new(args4.Split(','));
+        ReadOnlyCollection<string> backfillColumns = new(args5.Split(','));
+        ReadOnlyCollection<string> indexOnlyColumns = new(args6.Split(','));
+        ReadOnlyCollection<string> newColumnNames = new(processDataStandardFormatMappingNewColumnNames.Split(','));
+        ReadOnlyCollection<string> oldColumnNames = new(processDataStandardFormatMappingOldColumnNames.Split(','));
+        ReadOnlyCollection<int> columnIndices = new(processDataStandardFormatMappingColumnIndices.Split(',').Select(int.Parse).ToArray());
+        foreach (string segment in segments)
+        {
+            segmentsB = segment.Split('|');
+            if (segmentsB.Length != 2)
+                continue;
+            if (distinct.Contains(segmentsB[0]))
+                continue;
+            distinct.Add(segmentsB[0]);
+            keyValuePairs.Add(segmentsB[0], segmentsB[1]);
+        }
+        result = new(backfillColumns: backfillColumns,
+                     columnIndices: columnIndices,
+                     newColumnNames: newColumnNames,
+                     ignoreColumns: ignoreColumns,
+                     indexOnlyColumns: indexOnlyColumns,
+                     keyValuePairs: new(keyValuePairs),
+                     oldColumnNames: oldColumnNames);
+        return result;
+    }
+
+    private static ReadOnlyCollection<PreWith> GetPreWithCollection(ReadOnlyCollection<Pre> preCollection)
+    {
+        List<PreWith> results = new();
+        string errFile;
+        PreWith preWith;
+        string? checkDirectory;
+        string noWaitDirectory;
+        foreach (Pre pre in preCollection)
+        {
+            errFile = string.Concat(pre.CheckFile, ".err");
+            checkDirectory = Path.GetDirectoryName(pre.CheckFile);
+            if (string.IsNullOrEmpty(checkDirectory))
+                continue;
+            if (!Directory.Exists(checkDirectory))
+                _ = Directory.CreateDirectory(checkDirectory);
+            noWaitDirectory = Path.Combine(checkDirectory, "NoWaitDirectory");
+            preWith = new(checkDirectory: checkDirectory,
+                          checkFile: pre.CheckFile,
+                          errFile: errFile,
+                          matchingFile: pre.MatchingFile,
+                          noWaitDirectory: noWaitDirectory);
+            results.Add(preWith);
+        }
+        return results.AsReadOnly();
+    }
+
+    private static ReadOnlyCollection<string> GetSearchDirectories(int numberLength, string parentDirectory)
     {
         List<string> results = new();
         string[] directories = Directory.GetDirectories(parentDirectory, "*", SearchOption.TopDirectoryOnly);
@@ -116,114 +246,11 @@ public class FileRead : Shared.FileRead, IFileRead
             results.Add(directory);
         }
         results.Sort();
-        return results;
+        return results.AsReadOnly();
     }
 
-    private List<string> GetMatchingFiles(long ticks, string reportFullPath, List<string> searchDirectories)
+    private static void CreatePointerFile(int numberLength, string parentDirectory, ReadOnlyCollection<string> matchingFiles)
     {
-        List<string> results = new();
-        string[] found;
-        string fileName = Path.GetFileName(reportFullPath);
-        foreach (string searchDirectory in searchDirectories)
-        {
-            for (int i = 0; i < int.MaxValue; i++)
-            {
-                found = Directory.GetFiles(searchDirectory, fileName, SearchOption.AllDirectories);
-                if (found.Any())
-                {
-                    results.AddRange(found);
-                    break;
-                }
-                if (new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds > _BreakAfterSeconds)
-                    break;
-            }
-        }
-        return results;
-    }
-
-    private static List<(string matchingFile, string checkFile)> GetCollection(int numberLength, string parentDirectory, List<string> matchingFiles)
-    {
-        List<(string matchingFile, string checkFile)> results = new();
-        string checkFile;
-        int parentDirectoryLength = parentDirectory.Length;
-        foreach (string matchingFile in matchingFiles)
-        {
-            checkFile = $"{matchingFile[0]}{matchingFile.Substring(parentDirectoryLength + numberLength + 1)}";
-            results.Add(new(matchingFile, checkFile));
-        }
-        return results;
-    }
-
-    private static List<(string, string, string, string, string)> GetCollection(List<(string matchingFile, string checkFile)> collection)
-    {
-        List<(string, string, string, string, string)> results = new();
-        string errFile;
-        string checkDirectory;
-        string noWaitDirectory;
-        foreach ((string matchingFile, string checkFile) in collection)
-        {
-            errFile = string.Concat(checkFile, ".err");
-            checkDirectory = Path.GetDirectoryName(checkFile);
-            if (!Directory.Exists(checkDirectory))
-                _ = Directory.CreateDirectory(checkDirectory);
-            noWaitDirectory = Path.Combine(checkDirectory, "NoWaitDirectory");
-            results.Add(new(matchingFile, checkFile, errFile, checkDirectory, noWaitDirectory));
-        }
-        return results;
-    }
-
-    private void MoveCollection(DateTime dateTime, List<(string matchingFile, string checkFile)> collection)
-    {
-        long preWait;
-        List<(string checkFile, string errFile)> postCollection = new();
-        foreach ((string matchingFile, string checkFile, string errFile, string checkDirectory, string noWaitDirectory) in GetCollection(collection))
-        {
-            File.Move(matchingFile, checkFile);
-            if (Directory.Exists(noWaitDirectory))
-            {
-                postCollection.Add(new(checkFile, errFile));
-                continue;
-            }
-            if (_FileConnectorConfiguration?.FileHandleWaitTime is null)
-                preWait = DateTime.Now.AddMilliseconds(1234).Ticks;
-            else
-                preWait = DateTime.Now.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
-            for (short i = 0; i < short.MaxValue; i++)
-            {
-                if (DateTime.Now.Ticks > preWait)
-                    break;
-                Thread.Sleep(500);
-            }
-            for (int i = 0; i < int.MaxValue; i++)
-            {
-                if (File.Exists(errFile))
-                    throw new Exception(File.ReadAllText(errFile));
-                if (!File.Exists(checkFile))
-                    break;
-                if (new TimeSpan(DateTime.Now.Ticks - dateTime.Ticks).TotalSeconds > _BreakAfterSeconds)
-                    throw new Exception($"Not all files were consumed after {_BreakAfterSeconds} second(s)!");
-                Thread.Sleep(500);
-            }
-        }
-        if (postCollection.Any())
-        {
-            Thread.Sleep(500);
-            StringBuilder stringBuilder = new();
-            foreach ((string checkFile, string errFile) in postCollection)
-            {
-                if (File.Exists(errFile))
-                    _ = stringBuilder.AppendLine(File.ReadAllText(errFile));
-                if (File.Exists(checkFile))
-                    _ = stringBuilder.AppendLine($"<{checkFile}> was not consumed by the end!");
-            }
-            if (stringBuilder.Length > 0)
-                throw new Exception(stringBuilder.ToString());
-        }
-    }
-
-    private static void CreatePointerFile(int numberLength, string parentDirectory, List<string> matchingFiles)
-    {
-#nullable enable
         string checkFile;
         string writeFile;
         string? directoryName;
@@ -239,28 +266,132 @@ public class FileRead : Shared.FileRead, IFileRead
                 continue;
             File.AppendAllLines(writeFile, new string[] { parentDirectory, matchingFile, directoryName, checkFile });
         }
-#nullable disable
+    }
+
+    private static ReadOnlyCollection<Pre> GetPreCollection(int numberLength, string parentDirectory, ReadOnlyCollection<string> matchingFiles)
+    {
+        List<Pre> results = new();
+        Pre pre;
+        string checkFile;
+        int parentDirectoryLength = parentDirectory.Length;
+        foreach (string matchingFile in matchingFiles)
+        {
+            checkFile = $"{matchingFile[0]}{matchingFile.Substring(parentDirectoryLength + numberLength + 1)}";
+            pre = new(matchingFile, checkFile);
+            results.Add(pre);
+        }
+        return results.AsReadOnly();
+    }
+
+    private void MoveCollection(DateTime dateTime, ProcessDataStandardFormat processDataStandardFormat, ReadOnlyCollection<PreWith> preWithCollection)
+    {
+        ReadOnlyCollection<Post> postCollection = GetPostCollection(dateTime, processDataStandardFormat, preWithCollection);
+        if (postCollection.Count != 0)
+        {
+            Thread.Sleep(500);
+            StringBuilder stringBuilder = new();
+            foreach (Post post in postCollection)
+            {
+                if (File.Exists(post.ErrFile))
+                    _ = stringBuilder.AppendLine(File.ReadAllText(post.ErrFile));
+                if (File.Exists(post.CheckFile))
+                    _ = stringBuilder.AppendLine($"<{post.CheckFile}> was not consumed by the end!");
+            }
+            if (stringBuilder.Length > 0)
+                throw new Exception(stringBuilder.ToString());
+        }
+    }
+
+    private ReadOnlyCollection<Post> GetPostCollection(DateTime dateTime, ProcessDataStandardFormat processDataStandardFormat, ReadOnlyCollection<PreWith> preWithCollection)
+    {
+        List<Post> results = new();
+        Post post;
+        long preWait;
+        foreach (PreWith preWith in preWithCollection)
+        {
+            if (!_IsEAFHosted)
+                continue;
+            if (!_StaticRuns.TryGetValue(_Logistics.Sequence, out List<Shared.Metrology.WS.Results>? wsResults))
+                wsResults = null;
+            ProcessDataStandardFormat.Write(preWith.CheckFile, processDataStandardFormat, wsResults);
+            File.Delete(preWith.MatchingFile);
+            if (Directory.Exists(preWith.NoWaitDirectory))
+            {
+                post = new(preWith.CheckFile, preWith.ErrFile);
+                results.Add(post);
+                continue;
+            }
+            if (_FileConnectorConfiguration?.FileHandleWaitTime is null)
+                preWait = DateTime.Now.AddMilliseconds(1234).Ticks;
+            else
+                preWait = DateTime.Now.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
+            for (short i = 0; i < short.MaxValue; i++)
+            {
+                if (DateTime.Now.Ticks > preWait)
+                    break;
+                Thread.Sleep(500);
+            }
+            for (int i = 0; i < int.MaxValue; i++)
+            {
+                if (File.Exists(preWith.ErrFile))
+                    throw new Exception(File.ReadAllText(preWith.ErrFile));
+                if (!File.Exists(preWith.CheckFile))
+                    break;
+                if (new TimeSpan(DateTime.Now.Ticks - dateTime.Ticks).TotalSeconds > _BreakAfterSeconds)
+                    throw new Exception($"Not all files were consumed after {_BreakAfterSeconds} second(s)!");
+                Thread.Sleep(500);
+            }
+        }
+        return results.AsReadOnly();
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
-        Tuple<string, Test[], JsonElement[], List<FileInfo>> results = new(string.Empty, null, null, new List<FileInfo>());
-        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
-        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
+        Tuple<string, Test[], JsonElement[], List<FileInfo>> results = new(string.Empty, Array.Empty<Test>(), Array.Empty<JsonElement>(), new List<FileInfo>());
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, _ProcessDataStandardFormatMapping);
+        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
+        if (!_IsEAFHosted)
+            ProcessDataStandardFormat.Write("../../.pdsf", processDataStandardFormat, wsResults: null);
         SetFileParameterLotIDToLogisticsMID();
         int numberLength = 2;
         long ticks = dateTime.Ticks;
         string parentParentDirectory = GetParentParent(reportFullPath);
-        List<string> searchDirectories = GetSearchDirectories(numberLength, parentParentDirectory);
-        List<string> matchingFiles = GetMatchingFiles(ticks, reportFullPath, searchDirectories);
+        ReadOnlyCollection<string> searchDirectories = GetSearchDirectories(numberLength, parentParentDirectory);
+        ReadOnlyCollection<string> matchingFiles = GetMatchingFiles(ticks, reportFullPath, searchDirectories);
         if (matchingFiles.Count != searchDirectories.Count)
             throw new Exception($"Didn't find all files after {_BreakAfterSeconds} second(s)!");
-        try
-        { CreatePointerFile(numberLength, parentParentDirectory, matchingFiles); }
-        catch (Exception) { }
-        List<(string matchingFile, string checkFile)> collection = GetCollection(numberLength, parentParentDirectory, matchingFiles);
-        MoveCollection(dateTime, collection);
+        if (_IsEAFHosted)
+        {
+            try
+            { CreatePointerFile(numberLength, parentParentDirectory, matchingFiles); }
+            catch (Exception) { }
+        }
+        ReadOnlyCollection<Pre> preCollection = GetPreCollection(numberLength, parentParentDirectory, matchingFiles);
+        ReadOnlyCollection<PreWith> preWithCollection = GetPreWithCollection(preCollection);
+        MoveCollection(dateTime, processDataStandardFormat, preWithCollection);
         return results;
     }
 
+    private ReadOnlyCollection<string> GetMatchingFiles(long ticks, string reportFullPath, ReadOnlyCollection<string> searchDirectories)
+    {
+        List<string> results = new();
+        string[] found;
+        string fileName = Path.GetFileName(reportFullPath);
+        foreach (string searchDirectory in searchDirectories)
+        {
+            for (int i = 0; i < int.MaxValue; i++)
+            {
+                found = Directory.GetFiles(searchDirectory, fileName, SearchOption.AllDirectories);
+                if (found.Length != 0)
+                {
+                    results.AddRange(found);
+                    break;
+                }
+                if (new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds > _BreakAfterSeconds)
+                    break;
+            }
+        }
+        return results.AsReadOnly();
+    }
+
 }

Adaptation/FileHandlers/OpenInsight/FileRead.cs

@@ -9,7 +9,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.Json;
 
 namespace Adaptation.FileHandlers.OpenInsight;
@@ -18,26 +17,22 @@ public class FileRead : Shared.FileRead, IFileRead
 {
 
     private readonly string _IqsConnectionString;
-    private readonly string _OpenInsightFilePattern;
     private readonly string _OpenInsightApiECDirectory;
-    private readonly string _OpenInsightApiIFXDirectory;
 
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
         _MinFileLength = 10;
-        _NullData = string.Empty;
         _Logistics = new(this);
+        _NullData = string.Empty;
         if (_FileParameter is null)
             throw new Exception(cellInstanceConnectionName);
         if (_ModelObjectParameterDefinitions is null)
             throw new Exception(cellInstanceConnectionName);
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
-        _OpenInsightApiIFXDirectory = @"\\messdv002.na.infineon.com\Candela\Archive\API";
-        _OpenInsightApiECDirectory = @"\\messv02ecc1.ec.local\EC_Metrology_Si\Archive\API";
         _IqsConnectionString = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "IQS.ConnectionString");
-        _OpenInsightFilePattern = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.FilePattern");
+        _OpenInsightApiECDirectory = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.Api.EC.Directory");
     }
 
     void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception)
@@ -115,95 +110,69 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    internal static string GetLines(Logistics logistics, List<txt.Description> descriptions)
-    {
-        StringBuilder results = new();
-        txt.Description x = descriptions[0];
-        char del = x.MesEntity == x.Reactor ? '\t' : '~';
-        _ = results.Append(x.UniqueId).Append(del).
-            Append(x.Run).Append(del).
-            Append(x.Date).Append(del).
-            Append(x.Lot).Append(del).
-            Append(x.Recipe).Append(del).
-            Append(x.Reactor).Append(del).
-            Append(x.RDS).Append(del).
-            Append(x.PSN).Append(del).
-            Append(x.Layer).Append(del).
-            Append(x.Zone).Append(del).
-            Append(logistics.MesEntity).Append(del).
-            Append(x.Employee).Append(del).
-            Append(x.Engineer).Append(del).
-            Append(x.DLRatio).Append(del).
-            Append(x.Temp).Append(del).
-            Append(x.AutoOptimizeGain).Append(del).
-            Append(x.AutoProbeHeightSet).Append(del).
-            Append(x.DataReject).Append(del).
-            Append(x.FileName).Append(del).
-            Append(x.Avg).Append(del).
-            Append(x.StdDev).Append(del).
-            Append(x.SemiRadial).Append(del);
-        foreach (txt.Description description in descriptions)
-        {
-            _ = results.Append(description.Pt).Append(del).
-                Append(description.R).Append(del).
-                Append(description.T).Append(del).
-                Append(description.Rs).Append(del).
-                Append(description.Merit).Append(del);
-        };
-        return results.ToString();
-    }
-
-    private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, string logistics, List<txt.Description> descriptions, Test[] tests)
+    private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, ProcessDataStandardFormat processDataStandardFormat, List<RsM.Description> descriptions, Test[] tests)
     {
+        string duplicateFile;
         bool isDummyRun = false;
         List<(Shared.Properties.IScopeInfo, string)> collection = new();
-        string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
-        string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation);
-        if (parentParent.Contains(_CellInstanceName))
-            parentParent = Path.GetDirectoryName(parentParent);
-        string duplicateDirectory = Path.Combine(parentParent, "Data");
+        string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
         if (!Directory.Exists(duplicateDirectory))
             _ = Directory.CreateDirectory(duplicateDirectory);
-        string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
-        if (descriptions.Any() && tests.Any())
+        string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
+        if (!Directory.Exists(Path.Combine(duplicateDirectory, "1")))
         {
-            string lines = GetLines(_Logistics, descriptions);
-            if (!string.IsNullOrEmpty(lines))
+            string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation);
+            if (parentParent.Contains(_CellInstanceName))
+                parentParent = Path.GetDirectoryName(parentParent);
+            duplicateDirectory = Path.Combine(parentParent, "Data");
+            if (!Directory.Exists(duplicateDirectory))
+                _ = Directory.CreateDirectory(duplicateDirectory);
+        }
+        if (descriptions.Count == 0 || tests.Length == 0)
+            duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
+        else
+        {
+            long? subgroupId;
+            string fileName = Path.GetFileName(reportFullPath);
+            long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks;
+            long preWait = _FileConnectorConfiguration?.FileHandleWaitTime is null ? dateTime.AddMilliseconds(1234).Ticks : dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
+            if (string.IsNullOrEmpty(descriptions[0].Reactor) || string.IsNullOrEmpty(descriptions[0].PSN))
+                subgroupId = null;
+            else
+                (subgroupId, int? _, string _) = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0], breakAfter, preWait);
+            if (_StaticRuns.TryGetValue(_Logistics.Sequence, out List<WS.Results> wsResults))
             {
-                int? count;
-                long? subGroupId;
-                long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks;
-                long preWait = _FileConnectorConfiguration?.FileHandleWaitTime is null ? dateTime.AddMilliseconds(1234).Ticks : dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
-                if (string.IsNullOrEmpty(descriptions[0].Reactor) || string.IsNullOrEmpty(descriptions[0].PSN))
-                    (subGroupId, count) = (null, null);
-                else
-                    (subGroupId, count, string _) = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0], breakAfter, preWait);
-                if (subGroupId is null)
-                    collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), lines));
-                else if (count is null)
-                    collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} {_OpenInsightFilePattern}"), lines));
-                else
-                    collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} E{count.Value} {_OpenInsightFilePattern}"), lines));
-                string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
-                FromIQS.Save(_OpenInsightApiECDirectory, _OpenInsightApiIFXDirectory, _Logistics, reportFullPath, logistics, descriptions.First(), lines, subGroupId, weekOfYear);
+                if (wsResults is null || wsResults.Count != 1)
+                    throw new NullReferenceException($"{nameof(wsResults)} {wsResults?.Count} != 1 {_Logistics.Sequence}!");
+                lock (_StaticRuns)
+                    wsResults[0] = WS.Results.Get(wsResults[0], subgroupId);
             }
+            if (!fileName.StartsWith("Viewer"))
+                duplicateFile = Path.Combine(duplicateDirectory, $"{subgroupId} {fileName}".TrimStart());
+            else
+                duplicateFile = Path.Combine(duplicateDirectory, $"{$"Viewer {subgroupId}".TrimEnd()} {fileName.Replace("Viewer", string.Empty)}");
+            string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
+            FromIQS.Save(_OpenInsightApiECDirectory, _Logistics, reportFullPath, processDataStandardFormat, descriptions.First(), subgroupId, weekOfYear);
         }
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
+        {
+            File.Copy(reportFullPath, duplicateFile, overwrite: true);
             WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);
+        }
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
-        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
         SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
-        List<txt.Description> descriptions = txt.ProcessData.GetDescriptions(jsonElements);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
+        List<RsM.Description> descriptions = RsM.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            SaveOpenInsightFile(reportFullPath, dateTime, pdsf.Item1, descriptions, tests);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
+            SaveOpenInsightFile(reportFullPath, dateTime, processDataStandardFormat, descriptions, tests);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/OpenInsight/FromIQS.cs

@@ -1,5 +1,6 @@
 using Adaptation.Shared;
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Globalization;
@@ -16,51 +17,175 @@ public class FromIQS
 
 #nullable enable
 
-    private static string GetCommandText(Logistics logistics, txt.Description description, string dateTime, long? subGroupId)
-    {
-        StringBuilder result = new();
-        _ = result
-                .AppendLine(" select ")
-                .AppendLine("       se.f_sgrp se_sgrp, ")
-                .AppendLine("       se.f_sgtm se_sgtm, ")
-                .AppendLine("       se.f_tsno se_tsno, ")
-                .AppendLine("       se.f_val se_val, ")
-                .AppendLine("       rd.f_name rd_name, ")
-                .AppendLine("       jd.f_name jd_name, ")
-                .AppendLine("       pl.f_name pl_name, ")
-                .AppendLine("       pd.f_name pd_name, ")
-                .AppendLine("       td.f_test td_test, ")
-                .AppendLine("       td.f_name td_name, ")
-                .AppendLine("       (select count(ev.f_evnt) ")
-                .AppendLine("       from [spcepiworld].[dbo].[evnt_inf] ev ")
-                .AppendLine("       where ev.f_prcs = rd.f_prcs ")
-                .AppendLine("         and ev.f_part = pd.f_part ")
-                .AppendLine("         and ev.f_sgtm = se.f_sgtm) ev_count ")
-                .AppendLine(" from [spcepiworld].[dbo].[sgrp_ext] se ")
-                .AppendLine(" join [spcepiworld].[dbo].[prcs_dat] rd ")
-                .AppendLine("   on se.f_prcs = rd.f_prcs ")
-                .AppendLine(" join [spcepiworld].[dbo].[job_dat] jd ")
-                .AppendLine("   on se.f_job = jd.f_job ")
-                .AppendLine(" join [spcepiworld].[dbo].[part_lot] pl ")
-                .AppendLine("   on se.f_lot = pl.f_lot ")
-                .AppendLine(" join [spcepiworld].[dbo].[part_dat] pd ")
-                .AppendLine("   on se.f_part = pd.f_part ")
-                .AppendLine(" join [spcepiworld].[dbo].[test_dat] td  ")
-                .AppendLine("   on se.f_test = td.f_test ")
-                .AppendLine(" where se.f_flag = 0 ");
+    private static string GetCommandText(DateTime dateTime)
+    { // cSpell:disable
+        List<string> results = new();
+        TimeSpan timeSpan = new(dateTime.ToUniversalTime().AddDays(-1).Ticks - new DateTime(1970, 01, 01).Ticks);
+        long infinityQS = (long)Math.Floor(timeSpan.TotalSeconds);
+        results.Add(" select count_se_sgtm CountSeSgtm, ");
+        results.Add("        dateadd(HH, -7, (dateadd(SS, convert(bigint, max_se_sgtm), '19700101'))) DateTime, ");
+        results.Add("        max_max_se_test MaxMaxSeTest, ");
+        results.Add("        ( ");
+        results.Add("          select td.f_name ");
+        results.Add("          from [SPCEPIWORLD].[dbo].[TEST_DAT] td ");
+        results.Add("          where td.f_test = max_max_se_test ");
+        results.Add("        ) MaxMaxSeTestName, ");
+        results.Add("        max_max_se_val MaxMaxSeVal, ");
+        results.Add("        max_se_lot MaxSeLot, ");
+        results.Add("        ( ");
+        results.Add("          select pl.f_name ");
+        results.Add("          from [SPCEPIWORLD].[dbo].[PART_LOT] pl ");
+        results.Add("          where max_se_lot = pl.f_lot ");
+        results.Add("        ) MaxSeLotName, ");
+        results.Add("        max_se_part MaxSePart, ");
+        results.Add("        ( ");
+        results.Add("          select rd.f_name ");
+        results.Add("          from [SPCEPIWORLD].[dbo].[PART_DAT] rd ");
+        results.Add("          where max_se_part = rd.f_part ");
+        results.Add("        ) MaxSePartName, ");
+        results.Add("        max_se_prcs MaxSePrcs, ");
+        results.Add("        ( ");
+        results.Add("          select rd.f_name ");
+        results.Add("          from [SPCEPIWORLD].[dbo].[PRCS_DAT] rd ");
+        results.Add("          where max_se_prcs = rd.f_prcs ");
+        results.Add("        ) MaxSePrcsName, ");
+        results.Add("        max_se_sgrp MaxSeSgrp, ");
+        results.Add("        min_min_se_test MinMinSeTest, ");
+        results.Add("        ( ");
+        results.Add("          select td.f_name ");
+        results.Add("          from [SPCEPIWORLD].[dbo].[TEST_DAT] td ");
+        results.Add("          where td.f_test = min_min_se_test ");
+        results.Add("        ) MinMinSeTestName, ");
+        results.Add("        min_min_se_val MinMinSeVal, ");
+        results.Add("        min_se_sgrp MinSeSgrp ");
+        results.Add(" from ( ");
+        results.Add("   select count_se_sgtm, ");
+        results.Add("          max_se_lot, ");
+        results.Add("          max_se_part, ");
+        results.Add("          max_se_prcs, ");
+        results.Add("          max_se_sgrp, ");
+        results.Add("          max_se_sgtm, ");
+        results.Add("          min_se_sgrp, ");
+        results.Add("          max(max_se_val) max_max_se_val, ");
+        results.Add("          min(min_se_val) min_min_se_val, ");
+        results.Add("          max(max_se_test) max_max_se_test, ");
+        results.Add("          min(min_se_test) min_min_se_test ");
+        results.Add("   from ( ");
+        results.Add("     select count_se_sgtm, ");
+        results.Add("            max_se_lot, ");
+        results.Add("            max_se_val, ");
+        results.Add("            min_se_val, ");
+        results.Add("            max_se_part, ");
+        results.Add("            max_se_prcs, ");
+        results.Add("            max_se_sgrp, ");
+        results.Add("            max_se_sgtm, ");
+        results.Add("            max_se_test, ");
+        results.Add("            min_se_sgrp, ");
+        results.Add("            min_se_test ");
+        results.Add("     from ( ");
+        results.Add("         select ");
+        results.Add("             max(se.f_lot) max_se_lot, ");
+        results.Add("             max(se.f_val) max_se_val, ");
+        results.Add("             min(se.f_lot) min_se_lot, ");
+        results.Add("             min(se.f_val) min_se_val, ");
+        results.Add("             max(se.f_part) max_se_part, ");
+        results.Add("             max(se.f_prcs) max_se_prcs, ");
+        results.Add("             max(se.f_sgrp) max_se_sgrp, ");
+        results.Add("             max(se.f_sgtm) max_se_sgtm, ");
+        results.Add("             max(se.f_test) max_se_test, ");
+        results.Add("             min(se.f_part) min_se_part, ");
+        results.Add("             min(se.f_prcs) min_se_prcs, ");
+        results.Add("             min(se.f_sgrp) min_se_sgrp, ");
+        results.Add("             min(se.f_sgtm) min_se_sgtm, ");
+        results.Add("             min(se.f_test) min_se_test, ");
+        results.Add("             count(se.f_sgtm) count_se_sgtm ");
+        results.Add("         from [spcepiworld].[dbo].[sgrp_ext] se ");
+        results.Add("         where se.f_tsno = 1 ");
+        results.Add("           and se.f_flag = 0 ");
+        results.Add($"           and se.f_sgtm > {infinityQS} ");
+        results.Add("         group by se.f_sgtm, se.f_prcs, se.f_lot, se.f_test, se.f_val ");
+        results.Add("     ) qa ");
+        results.Add("     where qa.count_se_sgtm > 1 ");
+        results.Add("       and min_se_lot = max_se_lot ");
+        results.Add("       and min_se_val = max_se_val ");
+        results.Add("       and min_se_val = max_se_val ");
+        results.Add("       and min_se_part = max_se_part ");
+        results.Add("       and min_se_prcs = max_se_prcs ");
+        results.Add("       and min_se_sgtm = max_se_sgtm ");
+        results.Add("       and min_se_test = max_se_test ");
+        results.Add("   ) qb ");
+        results.Add("   group by count_se_sgtm, ");
+        results.Add("            max_se_lot, ");
+        results.Add("            max_se_part, ");
+        results.Add("            max_se_prcs, ");
+        results.Add("            max_se_sgrp, ");
+        results.Add("            max_se_sgtm, ");
+        results.Add("            min_se_sgrp ");
+        results.Add("            ");
+        results.Add(" ) qc ");
+        results.Add(" order by max_se_sgrp desc ");
+        results.Add(" for json path ");
+        return string.Join(Environment.NewLine, results);
+    } // cSpell:restore
+
+    private static string GetCommandText(Logistics logistics, RsM.Description description, string dateTime, long? subGroupId)
+    { // cSpell:disable
+        List<string> results = new();
+        results.Add(" select iq.ev_count, iq.cl_count, iq.sl_count, iq.se_sgrp, iq.se_sgtm, iq.se_tsno, iq.td_test, iq.pr_name, iq.jd_name, iq.pl_name, iq.pd_name, iq.td_name, iq.se_val ");
+        results.Add(" from ( ");
+        results.Add(" select ");
+        results.Add("       se.f_sgrp se_sgrp, ");
+        results.Add("       se.f_sgtm se_sgtm, ");
+        results.Add("       se.f_tsno se_tsno, ");
+        results.Add("       se.f_val se_val, ");
+        results.Add("       pr.f_name pr_name, ");
+        results.Add("       jd.f_name jd_name, ");
+        results.Add("       pl.f_name pl_name, ");
+        results.Add("       pd.f_name pd_name, ");
+        results.Add("       td.f_test td_test, ");
+        results.Add("       td.f_name td_name, ");
+        results.Add("       (select count(cl.f_part) ");
+        results.Add("       from [spcepiworld].[dbo].[ctrl_lim] cl ");
+        results.Add("       where cl.f_part = pd.f_part ");
+        results.Add("         and cl.f_test = td.f_test ");
+        results.Add("       ) cl_count, ");
+        results.Add("       (select count(sl.f_part) ");
+        results.Add("       from [spcepiworld].[dbo].[spec_lim] sl ");
+        results.Add("       where sl.f_part = pd.f_part ");
+        results.Add("         and sl.f_test = td.f_test ");
+        results.Add("       ) sl_count, ");
+        results.Add("       (select count(ev.f_evnt) ");
+        results.Add("       from [spcepiworld].[dbo].[evnt_inf] ev ");
+        results.Add("       where ev.f_prcs = pr.f_prcs ");
+        results.Add("         and ev.f_part = pd.f_part ");
+        results.Add("         and ev.f_sgtm = se.f_sgtm ");
+        results.Add("       ) ev_count ");
+        results.Add(" from [spcepiworld].[dbo].[sgrp_ext] se ");
+        results.Add(" join [spcepiworld].[dbo].[prcs_dat] pr ");
+        results.Add("   on se.f_prcs = pr.f_prcs ");
+        results.Add(" join [spcepiworld].[dbo].[job_dat] jd ");
+        results.Add("   on se.f_job = jd.f_job ");
+        results.Add(" join [spcepiworld].[dbo].[part_lot] pl ");
+        results.Add("   on se.f_lot = pl.f_lot ");
+        results.Add(" join [spcepiworld].[dbo].[part_dat] pd ");
+        results.Add("   on se.f_part = pd.f_part ");
+        results.Add(" join [spcepiworld].[dbo].[test_dat] td ");
+        results.Add("   on se.f_test = td.f_test ");
+        results.Add(" where se.f_flag = 0 ");
         if (subGroupId is not null)
-            _ = result.Append("   and se.f_sgrp = ").Append(subGroupId).AppendLine("  ");
+            results.Add($"   and se.f_sgrp = {subGroupId}  ");
         if (!string.IsNullOrEmpty(description.RDS))
-            _ = result.Append("   and pl.f_name = '").Append(description.RDS).AppendLine("' ");
-        _ = result
-                .Append("   and rd.f_name = '").Append(description.Reactor).AppendLine("' ")
-                .Append("   and pd.f_name = '").Append(description.PSN).AppendLine("' ")
-                .AppendLine("   and jd.f_name in ('CDE1', 'CDE2', 'CDE3', 'CDE4', 'CDE5', 'CDE6') ")
-                .Append("   and jd.f_name = '").Append(logistics.MesEntity).AppendLine("' ")
-                .Append("   and dateadd(HH, -7, (dateadd(SS, convert(bigint, se.f_sgtm), '19700101'))) = '").Append(dateTime).AppendLine("' ")
-                .AppendLine("   for json path ");
-        return result.ToString();
-    }
+            results.Add($"   and pl.f_name = '{description.RDS}' ");
+        results.Add($"   and pr.f_name = '{description.Reactor}' ");
+        results.Add($"   and pd.f_name = '{description.PSN}' ");
+        results.Add("   and jd.f_name in ('CDE1', 'CDE2', 'CDE3', 'CDE4', 'CDE5', 'CDE6') ");
+        results.Add($"   and jd.f_name = '{logistics.MesEntity}' ");
+        results.Add($"   and dateadd(HH, -7, (dateadd(SS, convert(bigint, se.f_sgtm), '19700101'))) = '{dateTime}' ");
+        results.Add(" ) as iq ");
+        results.Add(" order by iq.ev_count desc, iq.cl_count desc, iq.sl_count desc, iq.se_sgrp, iq.se_tsno, iq.td_test ");
+        results.Add(" for json path ");
+        return string.Join(Environment.NewLine, results);
+    } // cSpell:restore
 
     private static StringBuilder GetForJsonPath(string connectionString, string commandText)
     {
@@ -74,32 +199,104 @@ public class FromIQS
         return stringBuilder;
     }
 
-    internal static (long?, int?, string) GetCommandText(string connectionString, Logistics logistics, txt.Description description, long breakAfter, long preWait)
+    private static string GetCommandText(List<long> subGroups)
+    { // cSpell:disable
+        List<string> results = new();
+        results.Add(" update [spcepiworld].[dbo].[sgrp_ext] ");
+        results.Add(" set f_flag = 1 ");
+        results.Add(" where f_flag = 0 ");
+        results.Add($"   and f_sgrp in ({string.Join($",{Environment.NewLine} ", subGroups)}) ");
+        return string.Join(Environment.NewLine, results);
+    } // cSpell:enable
+
+    private static int? ExecuteNonQuery(string connectionString, string commandText)
     {
-        string dateTime;
+        int? result;
+        if (string.IsNullOrEmpty(connectionString))
+            result = null;
+        else
+        {
+            using SqlConnection sqlConnection = new(connectionString);
+            sqlConnection.Open();
+            using SqlCommand sqlCommand = new(commandText, sqlConnection);
+            result = sqlCommand.ExecuteNonQuery();
+        }
+        return result;
+    }
+
+    private static void FlagDuplicates(string connectionString, string json)
+    {
+        JsonElement[]? jsonElements = JsonSerializer.Deserialize<JsonElement[]>(json);
+        JsonSerializerOptions jsonSerializerOptions = new() { PropertyNameCaseInsensitive = true };
+        if (jsonElements is not null && jsonElements.Length != 0 && jsonElements[0].ValueKind == JsonValueKind.Object)
+        {
+            Root? root;
+            List<long> collection = new();
+            JsonElement[] array = jsonElements.ToArray();
+            foreach (JsonElement jsonElement in array)
+            {
+                root = JsonSerializer.Deserialize<Root>(jsonElement.ToString(), jsonSerializerOptions);
+                if (root is null || root.MaxSeSgrp < 1)
+                    continue;
+                if (collection.Count > 99)
+                    break;
+                collection.Add(root.MaxSeSgrp);
+            }
+            if (collection.Count > 0)
+            {
+                string commandText = GetCommandText(collection);
+                File.WriteAllText("D:/.sql", commandText);
+                _ = ExecuteNonQuery(connectionString, commandText);
+            }
+        }
+    }
+
+    internal static (long?, int?, string) GetCommandText(string connectionString, Logistics logistics, RsM.Description description, long breakAfter, long preWait)
+    {
+        DateTime dateTime;
         int? count = null;
         string commandText;
         long? result = null;
-        string dateFormat = txt.Description.GetDateFormat();
+        StringBuilder stringBuilder;
+        string dateFormat = RsM.Description.GetDateFormat();
         if (DateTime.TryParseExact(description.Date, dateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime dateTimeParsed))
-            dateTime = dateTimeParsed.ToString("yyyy-MM-dd HH:mm:ss");
+            dateTime = dateTimeParsed;
         else if (DateTime.TryParse(description.Date, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTimeParsed))
-            dateTime = dateTimeParsed.ToString("yyyy-MM-dd HH:mm:ss");
+            dateTime = dateTimeParsed;
         else
-            dateTime = logistics.DateTimeFromSequence.ToString("yyyy-MM-dd HH:mm:ss");
-        commandText = GetCommandText(logistics, description, dateTime, subGroupId: null);
+            dateTime = logistics.DateTimeFromSequence;
+        commandText = GetCommandText(dateTime);
+        try
+        {
+            stringBuilder = GetForJsonPath(connectionString, commandText);
+            if (stringBuilder.Length > 0)
+                FlagDuplicates(connectionString, stringBuilder.ToString());
+        }
+        catch (Exception)
+        { stringBuilder = new(); }
+        _ = stringBuilder.Clear();
+        commandText = GetCommandText(logistics, description, dateTime.ToString("yyyy-MM-dd HH:mm:ss"), subGroupId: null);
         for (short i = 0; i < short.MaxValue; i++)
         {
             if (DateTime.Now.Ticks > preWait)
                 break;
             Thread.Sleep(100);
         }
-        StringBuilder stringBuilder = new();
         for (short z = 0; z < short.MaxValue; z++)
         {
             stringBuilder = GetForJsonPath(connectionString, commandText);
             if (stringBuilder.Length > 0)
+            {
+                long postBreakAfter = DateTime.Now.AddSeconds(5).Ticks;
+                for (short y = 0; y < short.MaxValue; y++)
+                {
+                    if (DateTime.Now.Ticks > postBreakAfter)
+                        break;
+                    Thread.Sleep(250);
+                }
+                stringBuilder = GetForJsonPath(connectionString, commandText);
                 break;
+            }
             if (DateTime.Now.Ticks > breakAfter)
                 // throw new Exception($"After {breakAfterSeconds} seconds, didn't find sub group id!");
                 break;
@@ -110,18 +307,17 @@ public class FromIQS
         else
         {
             JsonElement[]? jsonElements = JsonSerializer.Deserialize<JsonElement[]>(stringBuilder.ToString());
-            if (jsonElements is null || !jsonElements.Any() || jsonElements[0].ValueKind != JsonValueKind.Object)
+            if (jsonElements is null || jsonElements.Length == 0 || jsonElements[0].ValueKind != JsonValueKind.Object)
                 commandText = stringBuilder.ToString();
             else
             {
                 JsonProperty[] jsonProperties = jsonElements[0].EnumerateObject().ToArray();
-                if (!jsonProperties.Any() || jsonProperties[0].Name != "se_sgrp" || !long.TryParse(jsonProperties[0].Value.ToString(), out long subGroupId))
+                if (jsonProperties.Length == 0 || jsonProperties[3].Name != "se_sgrp" || !long.TryParse(jsonProperties[3].Value.ToString(), out long subGroupId))
                     commandText = stringBuilder.ToString();
                 else
                 {
                     result = subGroupId;
-                    commandText = GetCommandText(logistics, description, dateTime, subGroupId);
-                    if (jsonProperties.Any() && jsonProperties[10].Name == "ev_count" && int.TryParse(jsonProperties[10].Value.ToString(), out int evCount))
+                    if (jsonProperties.Length != 0 && jsonProperties[0].Name == "ev_count" && int.TryParse(jsonProperties[0].Value.ToString(), out int evCount))
                         count = evCount;
                 }
             }
@@ -129,7 +325,7 @@ public class FromIQS
         return new(result, count, commandText);
     }
 
-    private static string GetJson(Logistics logistics, string logisticLines, txt.Description description)
+    private static string GetJson(Logistics logistics, ProcessDataStandardFormat processDataStandardFormat, RsM.Description description)
     {
         string result;
         StringBuilder stringBuilder = new();
@@ -149,7 +345,7 @@ public class FromIQS
         string safeValue;
         string[] segments;
         string serializerValue;
-        foreach (string line in logisticLines.Split(new string[] { Environment.NewLine }, StringSplitOptions.None))
+        foreach (string line in processDataStandardFormat.Logistics)
         {
             segments = line.Split('\t');
             if (segments.Length < 2)
@@ -180,40 +376,115 @@ public class FromIQS
         return result;
     }
 
-    internal static void Save(string openInsightApiECDirectory, string openInsightApiIFXDirectory, Logistics logistics, string reportFullPath, string logisticLines, txt.Description description, string lines, long? subGroupId, string weekOfYear)
+    internal static void Save(string openInsightApiECDirectory, Logistics logistics, string reportFullPath, ProcessDataStandardFormat processDataStandardFormat, RsM.Description description, long? subGroupId, string weekOfYear)
     {
         string checkFile;
         string fileName = Path.GetFileName(reportFullPath);
-        string json = GetJson(logistics, logisticLines, description);
+        string json = GetJson(logistics, processDataStandardFormat, description);
         string? ecPathRoot = Path.GetPathRoot(openInsightApiECDirectory);
-        string? ifxPathRoot = Path.GetPathRoot(openInsightApiIFXDirectory);
         bool ecExists = ecPathRoot is not null && Directory.Exists(ecPathRoot);
-        bool ifxExists = ifxPathRoot is not null && Directory.Exists(ifxPathRoot);
         string weekYear = $"{logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}";
         string ecDirectory = Path.Combine(openInsightApiECDirectory, weekYear, $"-{description.PSN}", $"-{description.Reactor}", $"-{description.RDS}", $"-{subGroupId}");
-        string ifxDirectory = Path.Combine(openInsightApiIFXDirectory, weekYear, $"-{description.PSN}", $"-{description.Reactor}", $"-{description.RDS}", $"-{subGroupId}");
         if (ecExists && !Directory.Exists(ecDirectory))
             _ = Directory.CreateDirectory(ecDirectory);
-        if (ifxExists && !Directory.Exists(ifxDirectory))
-            _ = Directory.CreateDirectory(ifxDirectory);
         checkFile = Path.Combine(ecDirectory, fileName);
         if (ecExists && !File.Exists(checkFile))
             File.Copy(reportFullPath, checkFile);
-        checkFile = Path.Combine(ifxDirectory, fileName);
-        if (ifxExists && !File.Exists(checkFile))
-            File.Copy(reportFullPath, checkFile);
-        checkFile = Path.Combine(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.txt");
-        if (ecExists && !File.Exists(checkFile))
-            File.WriteAllText(checkFile, lines);
-        checkFile = Path.Combine(ifxDirectory, $"{logistics.DateTimeFromSequence.Ticks}.txt");
-        if (ifxExists && !File.Exists(checkFile))
-            File.WriteAllText(checkFile, lines);
         checkFile = Path.Combine(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.json");
         if (ecExists && !File.Exists(checkFile))
             File.WriteAllText(checkFile, json);
-        checkFile = Path.Combine(ifxDirectory, $"{logistics.DateTimeFromSequence.Ticks}.json");
-        if (ifxExists && !File.Exists(checkFile))
-            File.WriteAllText(checkFile, json);
+    }
+
+    private static string GetCommandText(string[] iqsCopyValues)
+    { // cSpell:disable
+        List<string> results = new();
+        if (iqsCopyValues.Length != 4)
+            throw new NotSupportedException();
+        string find = iqsCopyValues[1];
+        string replace = iqsCopyValues[3];
+        results.Add(" select pd.f_name [Part Name], ");
+        results.Add("        null [Part Revision], ");
+        results.Add($"       '{replace}' [Test Name], ");
+        results.Add("        null [Description], ");
+        results.Add("        null [Lot Number], ");
+        results.Add("        null [Job Name], ");
+        results.Add("        null [Process Name], ");
+        results.Add("        case when sl.f_url = 0 then null else sl.f_url end [Reasonable Limit (Upper)], ");
+        results.Add("        case when sl.f_url = 0 then 0 else 1 end [Alarm Reasonable Limit (Upper)], ");
+        results.Add("        case when sl.f_usl = 0 then null else sl.f_usl end [Specification Limit (Upper)], ");
+        results.Add("        case when sl.f_usl = 0 then 0 else 1 end [Alarm Specification Limit (Upper)], ");
+        results.Add("        case when sl.f_ugb = 0 then null else sl.f_ugb end [Warning Limit (Upper)], ");
+        results.Add("        case when sl.f_ugb = 0 then 0 else 1 end [Alarm Warning Limit (Upper)], ");
+        results.Add("        case when sl.f_tar = 0 then null else sl.f_tar end [Specification Limit (Target)], ");
+        results.Add("        case when sl.f_lgb = 0 then null else sl.f_lgb end [Warning Limit (Lower)], ");
+        results.Add("        case when sl.f_lgb = 0 then 0 else 1 end [Alarm Warning Limit (Lower)], ");
+        results.Add("        case when sl.f_lsl = 0 then null else sl.f_lsl end [Specification Limit (Lower)], ");
+        results.Add("        case when sl.f_lsl = 0 then 0 else 1 end [Alarm Specification Limit (Lower)], ");
+        results.Add("        case when sl.f_lrl = 0 then null else sl.f_lrl end [Reasonable Limit (Lower)], ");
+        results.Add("        case when sl.f_lrl = 0 then 0 else 1 end [Alarm Reasonable Limit (Lower)], ");
+        results.Add("        td.f_name [Original Test Name], ");
+        results.Add("        td.f_test [Test Id], ");
+        results.Add("        ( ");
+        results.Add("          select count(sl_b.f_spec) ");
+        results.Add("          from [spcepiworld].[dbo].[spec_lim] sl_b ");
+        results.Add("          join [spcepiworld].[dbo].[part_dat] pd_b ");
+        results.Add("          on sl_b.f_part = pd_b.f_part ");
+        results.Add("          join [spcepiworld].[dbo].[test_dat] td_b ");
+        results.Add("          on sl_b.f_test = td_b.f_test ");
+        results.Add("          where sl_b.f_prcs = 0 ");
+        results.Add($"         and td_b.f_name = '{replace}' ");
+        results.Add("          and pd_b.f_name = pd.f_name ");
+        results.Add("          and sl_b.f_url = sl.f_url ");
+        results.Add("          and sl_b.f_usl = sl.f_usl ");
+        results.Add("          and sl_b.f_ugb = sl.f_ugb ");
+        results.Add("          and sl_b.f_tar = sl.f_tar ");
+        results.Add("          and sl_b.f_lgb = sl.f_lgb ");
+        results.Add("          and sl_b.f_lsl = sl.f_lsl ");
+        results.Add("          and sl_b.f_lrl = sl.f_lrl ");
+        results.Add("          group by sl_b.f_spec ");
+        results.Add("        ) count ");
+        results.Add(" from [spcepiworld].[dbo].[spec_lim] sl ");
+        results.Add(" join [spcepiworld].[dbo].[part_dat] pd ");
+        results.Add("   on sl.f_part = pd.f_part ");
+        results.Add(" join [spcepiworld].[dbo].[test_dat] td ");
+        results.Add("   on sl.f_test = td.f_test ");
+        results.Add(" where sl.f_prcs = 0 ");
+        results.Add($"   and td.f_name = '{find}' ");
+        results.Add("   and isnull(( ");
+        results.Add("        select count(sl_b.f_spec) ");
+        results.Add("        from [spcepiworld].[dbo].[spec_lim] sl_b ");
+        results.Add("        join [spcepiworld].[dbo].[part_dat] pd_b ");
+        results.Add("        on sl_b.f_part = pd_b.f_part ");
+        results.Add("        join [spcepiworld].[dbo].[test_dat] td_b ");
+        results.Add("        on sl_b.f_test = td_b.f_test ");
+        results.Add("        where sl_b.f_prcs = 0 ");
+        results.Add($"       and td_b.f_name = '{replace}' ");
+        results.Add("        and pd_b.f_name = pd.f_name ");
+        results.Add("        and sl_b.f_url = sl.f_url ");
+        results.Add("        and sl_b.f_usl = sl.f_usl ");
+        results.Add("        and sl_b.f_ugb = sl.f_ugb ");
+        results.Add("        and sl_b.f_tar = sl.f_tar ");
+        results.Add("        and sl_b.f_lgb = sl.f_lgb ");
+        results.Add("        and sl_b.f_lsl = sl.f_lsl ");
+        results.Add("        and sl_b.f_lrl = sl.f_lrl ");
+        results.Add("        group by sl_b.f_spec ");
+        results.Add("   ), 0) = 0 ");
+        results.Add(" for json path ");
+        return string.Join(Environment.NewLine, results);
+    } // cSpell:restore
+
+    internal static void SaveCopy(string fileConnectorConfigurationSourceFileLocation, string connectionString, string name, string[] iqsCopyValues)
+    {
+        string checkFile = Path.Combine(fileConnectorConfigurationSourceFileLocation, $"{name}.json");
+        if (!File.Exists(checkFile))
+        {
+            string commandText = GetCommandText(iqsCopyValues);
+            StringBuilder stringBuilder = GetForJsonPath(connectionString, commandText);
+            if (stringBuilder.Length != 0)
+                File.WriteAllText(checkFile, stringBuilder.ToString());
+            else
+                File.WriteAllText(Path.Combine(fileConnectorConfigurationSourceFileLocation, $"{name}.sql"), commandText);
+        }
     }
 
 #nullable disable

Adaptation/FileHandlers/OpenInsight/Root.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.OpenInsight;
+
+public class Root
+{
+
+    public long CountSeSgtm { get; } // [JsonPropertyName("count_se_sgtm")]
+    public DateTime DateTime { get; } // [JsonPropertyName("date_time")]
+    public long MaxMaxSeTest { get; } // [JsonPropertyName("max_max_se_test")]
+    public string MaxMaxSeTestName { get; } // [JsonPropertyName("max_max_se_test_name")]
+    public double MaxMaxSeVal { get; } // [JsonPropertyName("max_max_se_val")]
+    public long MaxSeLot { get; } // [JsonPropertyName("max_se_lot")]
+    public string MaxSeLotName { get; } // [JsonPropertyName("max_se_lot_name")]
+    public long MaxSePart { get; } // [JsonPropertyName("max_se_part")]
+    public string MaxSePartName { get; } // [JsonPropertyName("max_se_part_name")]
+    public long MaxSePrcs { get; } // [JsonPropertyName("max_se_prcs")]
+    public string MaxSePrcsName { get; } // [JsonPropertyName("max_se_prcs_name")]
+    public long MaxSeSgrp { get; } // [JsonPropertyName("max_se_sgrp")]
+    public long MinMinSeTest { get; } // [JsonPropertyName("min_min_se_test")]
+    public string MinMinSeTestName { get; } // [JsonPropertyName("min_min_se_test_name")]
+    public double MinMinSeVal { get; } // [JsonPropertyName("min_min_se_val")]
+    public long MinSeSgrp { get; } // [JsonPropertyName("min_se_sgrp")]
+
+    [JsonConstructor]
+    public Root(long countSeSgtm, DateTime dateTime, long maxMaxSeTest, string maxMaxSeTestName, double maxMaxSeVal, long maxSeLot, string maxSeLotName, long maxSePart, string maxSePartName, long maxSePrcs, string maxSePrcsName, long maxSeSgrp, long minMinSeTest, string minMinSeTestName, double minMinSeVal, long minSeSgrp)
+    {
+        CountSeSgtm = countSeSgtm;
+        DateTime = dateTime;
+        MaxMaxSeTest = maxMaxSeTest;
+        MaxMaxSeTestName = maxMaxSeTestName;
+        MaxMaxSeVal = maxMaxSeVal;
+        MaxSeLot = maxSeLot;
+        MaxSeLotName = maxSeLotName;
+        MaxSePart = maxSePart;
+        MaxSePartName = maxSePartName;
+        MaxSePrcs = maxSePrcs;
+        MaxSePrcsName = maxSePrcsName;
+        MaxSeSgrp = maxSeSgrp;
+        MinMinSeTest = minMinSeTest;
+        MinMinSeTestName = minMinSeTestName;
+        MinMinSeVal = minMinSeVal;
+        MinSeSgrp = minSeSgrp;
+    }
+
+}

Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs

@@ -6,6 +6,7 @@ using Adaptation.Shared.Methods;
 using Adaptation.Shared.Metrology;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
@@ -16,9 +17,10 @@ public class FileRead : Shared.FileRead, IFileRead
 {
 
     private readonly string _OpenInsightMetrologyViewerAPI;
+    private readonly string _OpenInsightMetrologyViewerFileShare;
 
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
         _MinFileLength = 10;
         _NullData = string.Empty;
@@ -30,6 +32,7 @@ public class FileRead : Shared.FileRead, IFileRead
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
         _OpenInsightMetrologyViewerAPI = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerAPI");
+        _OpenInsightMetrologyViewerFileShare = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerFileShare");
     }
 
     void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception)
@@ -107,35 +110,44 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    private void SendData(DateTime dateTime, List<txt.Description> descriptions)
+    private void SendData(string reportFullPath, DateTime dateTime, List<RsM.Description> descriptions)
     {
-        if (dateTime == DateTime.MinValue)
-        { }
+        string checkDirectory;
         WSRequest wsRequest = new(this, _Logistics, descriptions);
-        (string json, WS.Results wsResults) = WS.SendData(_OpenInsightMetrologyViewerAPI, wsRequest);
-        if (!wsResults.Success)
-            throw new Exception(wsResults.ToString());
-        _Log.Debug(wsResults.HeaderID);
+        int weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
+        string directory = Path.Combine(_OpenInsightMetrologyViewerFileShare, dateTime.Year.ToString(), $"WW{weekOfYear:00}");
+        checkDirectory = Path.Combine(directory, _Logistics.Sequence.ToString());
+        if (!Directory.Exists(checkDirectory))
+            _ = Directory.CreateDirectory(checkDirectory);
+        File.Copy(reportFullPath, Path.Combine(checkDirectory, Path.GetFileName(reportFullPath)), overwrite: true);
+        (string jsonResults, WS.Results wsResults) = WS.SendData(_OpenInsightMetrologyViewerAPI, _Logistics.Sequence, directory, wsRequest);
+        if (wsResults.Success is null || !wsResults.Success.Value)
+            throw new Exception(jsonResults);
+        _Log.Debug(wsResults.HeaderId);
         lock (_StaticRuns)
         {
             if (!_StaticRuns.ContainsKey(_Logistics.Sequence))
                 _StaticRuns.Add(_Logistics.Sequence, new());
-            _StaticRuns[_Logistics.Sequence].Add(json);
+            _StaticRuns[_Logistics.Sequence].Add(wsResults);
         }
+        checkDirectory = Path.Combine(directory, $"-{wsResults.HeaderId}");
+        if (!Directory.Exists(checkDirectory))
+            _ = Directory.CreateDirectory(checkDirectory);
+        File.Copy(reportFullPath, Path.Combine(checkDirectory, Path.GetFileName(reportFullPath)), overwrite: true);
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
-        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
         SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
-        List<txt.Description> descriptions = txt.ProcessData.GetDescriptions(jsonElements);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
+        List<RsM.Description> descriptions = RsM.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            SendData(dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
+            SendData(reportFullPath, dateTime, descriptions);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs

@@ -4,8 +4,6 @@ using Adaptation.Shared.Properties;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text.Json;
 
 namespace Adaptation.FileHandlers.OpenInsightMetrologyViewer;
 
@@ -27,7 +25,7 @@ public class WSRequest
     public string EquipId { get; set; }
     public string FileName { get; set; }
     public string FilePath { get; set; }
-    public string Id { get; set; }
+    public int Id { get; set; }
     public string Layer { get; set; }
     public string LotId { get; set; }
     public string Op { get; set; }
@@ -42,18 +40,18 @@ public class WSRequest
     public string Temp { get; set; }
     public string UniqueId { get; set; }
     public string Zone { get; set; }
-    public List<txt.Detail> Details { get; protected set; }
+    public List<RsM.Detail> Details { get; protected set; }
 
     [Obsolete("For json")] public WSRequest() { }
 
-    internal WSRequest(IFileRead fileRead, Logistics logistics, List<txt.Description> descriptions)
+#pragma warning disable IDE0060
+    internal WSRequest(IFileRead fileRead, Logistics logistics, List<RsM.Description> descriptions, string processDataStandardFormat = null)
+#pragma warning restore IDE0060
     {
-        Id = "-1";
-        if (fileRead is null)
-        { }
+        Id = -1;
         CellName = logistics.MesEntity;
-        Details = new List<txt.Detail>();
-        if (descriptions[0] is not txt.Description x)
+        Details = new List<RsM.Detail>();
+        if (descriptions[0] is not RsM.Description x)
             throw new Exception();
         //Header
         {
@@ -81,10 +79,10 @@ public class WSRequest
             UniqueId = x.UniqueId;
             Zone = x.Zone;
         }
-        txt.Detail detail;
-        foreach (txt.Description description in descriptions)
+        RsM.Detail detail;
+        foreach (RsM.Description description in descriptions)
         {
-            detail = new txt.Detail
+            detail = new RsM.Detail
             {
                 HeaderUniqueId = description.HeaderUniqueId,
                 Merit = description.Merit,
@@ -97,28 +95,40 @@ public class WSRequest
             Details.Add(detail);
         }
         Date ??= logistics.DateTimeFromSequence.ToString();
-        if (UniqueId is null && Details.Any())
-            UniqueId = Details[0].HeaderUniqueId;
+        UniqueId = $"{logistics.JobID}_{logistics.MID}_{logistics.DateTimeFromSequence:yyyyMMddHHmmssffff}";
+        for (int i = 0; i < Details.Count; i++)
+        {
+            Details[i].HeaderUniqueId = UniqueId;
+            Details[i].UniqueId = $"{logistics.JobID}_{logistics.MID}_{logistics.DateTimeFromSequence:yyyyMMddHHmmssffff}_Item-{i + 1}";
+        }
         string onlyWSRequest = string.Empty;
         FilePath = onlyWSRequest;
     }
 
-    internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, DateTime dateTime, string json, List<txt.Description> descriptions, string matchDirectory)
+    internal static long GetHeaderId(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, string openInsightMetrologyViewerFileShare, int weekOfYear, WS.Results results, List<RsM.Description> descriptions)
     {
-        if (dateTime == DateTime.MinValue)
-        { }
-        if (string.IsNullOrEmpty(json))
+        long result;
+        if (results is not null && results.HeaderId is not null)
+            result = results.HeaderId.Value;
+        else
         {
             WSRequest wsRequest = new(fileRead, logistics, descriptions);
-            (json, WS.Results wsResults) = WS.SendData(openInsightMetrologyViewerAPI, wsRequest);
-            if (!wsResults.Success)
+            string directory = Path.Combine(openInsightMetrologyViewerFileShare, logistics.DateTimeFromSequence.Year.ToString(), $"WW{weekOfYear:00}");
+            (_, WS.Results wsResults) = WS.SendData(openInsightMetrologyViewerAPI, logistics.Sequence, directory, wsRequest);
+            if (wsResults.Success is null || !wsResults.Success.Value)
                 throw new Exception(wsResults.ToString());
+            result = wsResults.HeaderId.Value;
         }
-        WS.Results metrologyWSRequest = JsonSerializer.Deserialize<WS.Results>(json, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
-        long wsResultsHeaderID = metrologyWSRequest.HeaderID;
+        return result;
+    }
+
+#pragma warning disable IDE0060
+    internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, List<RsM.Description> descriptions, string matchDirectory, WS.Results results, string headerIdDirectory)
+#pragma warning restore IDE0060
+    {
         string[] txtFiles = Directory.GetFiles(matchDirectory, "*.txt", SearchOption.TopDirectoryOnly);
         if (txtFiles.Length != 1)
-            throw new Exception($"Invalid source file count for <{wsResultsHeaderID}>!{Environment.NewLine}{json}");
+            throw new Exception($"Invalid source file count for <{results.HeaderId}>!");
         List<string> pdfFiles = new();
         pdfFiles.AddRange(Directory.GetFiles(matchDirectory, "*.pdf_old", SearchOption.TopDirectoryOnly));
         foreach (string pdfFile in pdfFiles)
@@ -128,12 +138,13 @@ public class WSRequest
         foreach (string pdfFile in pdfFiles)
             File.Move(pdfFile, Path.ChangeExtension(pdfFile, ".pdf_old"));
         pdfFiles.Clear();
-
         if (pdfFiles.Count == 0)
             throw new Exception("Invalid *.pdf file count!");
         List<WS.Attachment> headerAttachments = new()
-        { new WS.Attachment(descriptions[0].HeaderUniqueId, "Data.pdf", pdfFiles[0]) };
-        WS.AttachFiles(openInsightMetrologyViewerAPI, wsResultsHeaderID, headerAttachments, dataAttachments: null);
+        {
+            new WS.Attachment(results, headerIdDirectory, $"{logistics.JobID}_{logistics.MID}_{logistics.DateTimeFromSequence:yyyyMMddHHmmssffff}", "Data.pdf", pdfFiles[0])
+        };
+        WS.AttachFiles(openInsightMetrologyViewerAPI, headerAttachments, dataAttachments: null);
     }
 
 }

Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs

@@ -5,6 +5,7 @@ using Adaptation.Shared.Duplicator;
 using Adaptation.Shared.Methods;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
@@ -14,11 +15,11 @@ namespace Adaptation.FileHandlers.OpenInsightMetrologyViewerAttachments;
 public class FileRead : Shared.FileRead, IFileRead
 {
 
-    private readonly string _JobIdParentDirectory;
     private readonly string _OpenInsightMetrologyViewerAPI;
+    private readonly string _OpenInsightMetrologyViewerFileShare;
 
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<Shared.Metrology.WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
         _MinFileLength = 10;
         _NullData = string.Empty;
@@ -29,8 +30,8 @@ public class FileRead : Shared.FileRead, IFileRead
             throw new Exception(cellInstanceConnectionName);
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
-        _JobIdParentDirectory = GetJobIdParentDirectory(_FileConnectorConfiguration.SourceFileLocation);
         _OpenInsightMetrologyViewerAPI = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerAPI");
+        _OpenInsightMetrologyViewerFileShare = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerFileShare");
     }
 
     void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception)
@@ -108,42 +109,69 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    private void PostOpenInsightMetrologyViewerAttachments(string reportFullPath, DateTime dateTime, List<txt.Description> descriptions)
+#nullable enable
+
+    private string? GetHeaderIdDirectory(long headerId)
     {
-        if (string.IsNullOrEmpty(reportFullPath))
-        { }
-        if (dateTime == DateTime.MinValue)
-        { }
-        string jobIdDirectory = Path.Combine(_JobIdParentDirectory, _Logistics.JobID);
+        string? result = null;
+        int weekNum;
+        string year;
+        string weekDirectory;
+        string checkDirectory;
+        DateTime[] dateTimes = new DateTime[] { _Logistics.DateTimeFromSequence, _Logistics.DateTimeFromSequence.AddDays(-6.66) };
+        foreach (DateTime dateTime in dateTimes)
+        {
+            year = dateTime.Year.ToString();
+            weekNum = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
+            weekDirectory = Path.Combine(_OpenInsightMetrologyViewerFileShare, dateTime.Year.ToString(), $"WW{weekNum:00}");
+            if (!Directory.Exists(weekDirectory))
+                _ = Directory.CreateDirectory(weekDirectory);
+            checkDirectory = Path.Combine(weekDirectory, $"-{headerId}");
+            if (!Directory.Exists(checkDirectory))
+                continue;
+            result = checkDirectory;
+            break;
+        }
+        return result;
+    }
+
+    private void PostOpenInsightMetrologyViewerAttachments(List<RsM.Description> descriptions)
+    {
+        Shared.Metrology.WS.Results? results;
+        string jobIdDirectory = Path.Combine(Path.GetDirectoryName(_FileConnectorConfiguration.AlternateTargetFolder) ?? throw new Exception(), _Logistics.JobID);
         if (!Directory.Exists(jobIdDirectory))
             _ = Directory.CreateDirectory(jobIdDirectory);
-        string json;
         string[] matchDirectories = GetInProcessDirectory(jobIdDirectory);
-        if (!_StaticRuns.ContainsKey(_Logistics.Sequence))
-            json = string.Empty;
+        if (!_StaticRuns.TryGetValue(_Logistics.Sequence, out List<Shared.Metrology.WS.Results>? wsResults))
+            results = null;
         else
         {
-            if (_StaticRuns[_Logistics.Sequence].Count != 1)
-                throw new Exception($"{nameof(_StaticRuns)} has too many values for {_Logistics.Sequence}!");
-            json = _StaticRuns[_Logistics.Sequence][0];
-            lock (_StaticRuns)
-                _ = _StaticRuns.Remove(_Logistics.Sequence);
+            if (wsResults is null || wsResults.Count != 1)
+                throw new NullReferenceException($"{nameof(wsResults)} {wsResults?.Count} != 1 {_Logistics.Sequence}!");
+            results = wsResults[0];
         }
-        OpenInsightMetrologyViewer.WSRequest.PostOpenInsightMetrologyViewerAttachments(this, _Logistics, _OpenInsightMetrologyViewerAPI, dateTime, json, descriptions, matchDirectories[0]);
+        int weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
+        long headerId = !_IsEAFHosted ? -1 : OpenInsightMetrologyViewer.WSRequest.GetHeaderId(this, _Logistics, _OpenInsightMetrologyViewerAPI, _OpenInsightMetrologyViewerFileShare, weekOfYear, results, descriptions);
+        string? headerIdDirectory = GetHeaderIdDirectory(headerId);
+        if (string.IsNullOrEmpty(headerIdDirectory))
+            throw new Exception($"Didn't find header id directory <{headerId}>");
+        OpenInsightMetrologyViewer.WSRequest.PostOpenInsightMetrologyViewerAttachments(this, _Logistics, _OpenInsightMetrologyViewerAPI, descriptions, matchDirectories[0], results, headerIdDirectory);
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
+        if (dateTime == DateTime.MinValue)
+            throw new ArgumentNullException(nameof(dateTime));
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
-        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
         SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
-        List<txt.Description> descriptions = txt.ProcessData.GetDescriptions(jsonElements);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
+        List<RsM.Description> descriptions = RsM.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            PostOpenInsightMetrologyViewerAttachments(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
+            PostOpenInsightMetrologyViewerAttachments(descriptions);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/Processed/FileRead.cs

@@ -17,8 +17,8 @@ public class FileRead : Shared.FileRead, IFileRead
     private readonly string _JobIdParentDirectory;
     private readonly string _JobIdProcessParentDirectory;
 
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<Shared.Metrology.WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
         _MinFileLength = 10;
         _NullData = string.Empty;
@@ -108,10 +108,10 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    private void DirectoryMove(string reportFullPath, DateTime dateTime, List<txt.Description> descriptions)
+    private void DirectoryMove(string reportFullPath, DateTime dateTime, List<RsM.Description> descriptions)
     {
         if (dateTime == DateTime.MinValue)
-        { }
+            throw new ArgumentNullException(nameof(dateTime));
         FileInfo fileInfo = new(reportFullPath);
         string logisticsSequence = _Logistics.Sequence.ToString();
         string jobIdDirectory = Path.Combine(_JobIdParentDirectory, _Logistics.JobID);
@@ -129,23 +129,50 @@ public class FileRead : Shared.FileRead, IFileRead
         string destinationJobIdDirectory = Path.Combine(_JobIdProcessParentDirectory, _Logistics.JobID, directoryName);
         string sequenceDirectory = Path.Combine(destinationJobIdDirectory, logisticsSequence);
         string jsonFileName = Path.Combine(sequenceDirectory, $"{Path.GetFileNameWithoutExtension(reportFullPath)}.json");
+        MoveMatchingFile(jobIdDirectory, matchDirectories[0]);
         Directory.Move(matchDirectories[0], destinationJobIdDirectory);
         if (!Directory.Exists(sequenceDirectory))
             _ = Directory.CreateDirectory(sequenceDirectory);
         File.Copy(reportFullPath, Path.Combine(sequenceDirectory, Path.GetFileName(reportFullPath)), overwrite: true);
         File.WriteAllText(jsonFileName, json);
+        lock (_StaticRuns)
+            _ = _StaticRuns.Remove(_Logistics.Sequence);
+    }
+
+    private static void MoveMatchingFile(string jobIdDirectory, string matchDirectory)
+    {
+        string checkFile;
+        string jobIdDirectoryFileName;
+        string matchDirectoryFileName;
+        string[] jobIdDirectoryFiles = Directory.GetFiles(jobIdDirectory, "*", SearchOption.TopDirectoryOnly);
+        string[] matchDirectoryFiles = Directory.GetFiles(matchDirectory, "*", SearchOption.TopDirectoryOnly);
+        foreach (string jobIdDirectoryFile in jobIdDirectoryFiles)
+        {
+            jobIdDirectoryFileName = Path.GetFileName(jobIdDirectoryFile);
+            foreach (string matchDirectoryFile in matchDirectoryFiles)
+            {
+                matchDirectoryFileName = Path.GetFileName(matchDirectoryFile);
+                if (jobIdDirectoryFileName.StartsWith(matchDirectoryFileName))
+                {
+                    checkFile = Path.Combine(matchDirectory, jobIdDirectoryFileName);
+                    if (File.Exists(checkFile))
+                        continue;
+                    File.Move(jobIdDirectoryFile, checkFile);
+                }
+            }
+        }
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
-        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
         SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
-        List<txt.Description> descriptions = txt.ProcessData.GetDescriptions(jsonElements);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
+        List<RsM.Description> descriptions = RsM.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             DirectoryMove(reportFullPath, dateTime, descriptions);
         else if (!_IsEAFHosted)

Adaptation/FileHandlers/RsM/Description.cs

@@ -181,7 +181,7 @@ public class Description : IDescription, Shared.Properties.IDescription
     List<IDescription> IDescription.GetDescriptions(IFileRead fileRead, Logistics logistics, List<Test> tests, IProcessData iProcessData)
     {
         List<IDescription> results = new();
-        if (iProcessData is null || !iProcessData.Details.Any() || iProcessData is not ProcessData processData)
+        if (iProcessData is null || iProcessData.Details.Count == 0 || iProcessData is not ProcessData processData)
             results.Add(GetDefault(fileRead, logistics));
         else
         {

Adaptation/FileHandlers/RsM/FileRead.cs

@@ -5,7 +5,6 @@ using Adaptation.Shared.Methods;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text.Json;
 using System.Text.RegularExpressions;
 
@@ -16,8 +15,8 @@ public class FileRead : Shared.FileRead, IFileRead
 
     private long? _TickOffset;
 
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<Shared.Metrology.WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), true, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
         _MinFileLength = 10;
         _NullData = string.Empty;
@@ -28,6 +27,8 @@ public class FileRead : Shared.FileRead, IFileRead
             throw new Exception(cellInstanceConnectionName);
         if (_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
+        if (_IsEAFHosted)
+            NestExistingFiles(_FileConnectorConfiguration);
     }
 
     void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception) => Move(extractResults);
@@ -95,35 +96,46 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
+#nullable enable
+
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
-        Tuple<string, Test[], JsonElement[], List<FileInfo>> results = new(string.Empty, null, null, new List<FileInfo>());
-        _TickOffset ??= new FileInfo(reportFullPath).LastWriteTime.Ticks - dateTime.Ticks;
+        Tuple<string, Test[], JsonElement[], List<FileInfo>> results = new(string.Empty, Array.Empty<Test>(), Array.Empty<JsonElement>(), new List<FileInfo>());
+        _TickOffset ??= 0; // new FileInfo(reportFullPath).LastWriteTime.Ticks - dateTime.Ticks;
         _Logistics = new Logistics(this, _TickOffset.Value, reportFullPath, useSplitForMID: true);
         SetFileParameterLotIDToLogisticsMID();
         if (_Logistics.FileInfo.Length < _MinFileLength)
             results.Item4.Add(_Logistics.FileInfo);
         else
         {
-            IProcessData iProcessData = new ProcessData(this, _Logistics, results.Item4);
-            if (iProcessData is not ProcessData processData)
+            Run? run = Run.Get(_Logistics, results.Item4);
+            if (run is null)
                 throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks));
-            string mid;
-            if (!string.IsNullOrEmpty(processData.Employee) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN))
-                mid = processData.Employee;
+            IProcessData iProcessData = new ProcessData(this, _Logistics, results.Item4, run);
+            if (iProcessData is not ProcessData processData)
+                results = new(string.Concat("B) No Data - ", dateTime.Ticks), Array.Empty<Test>(), Array.Empty<JsonElement>(), results.Item4);
             else
             {
-                mid = string.Concat(processData.Reactor, "-", processData.RDS, "-", processData.PSN);
-                mid = Regex.Replace(mid, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0];
+                string mid;
+                if (!string.IsNullOrEmpty(processData.Run) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN))
+                    mid = processData.Run;
+                else if (!string.IsNullOrEmpty(processData.Employee) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN))
+                    mid = processData.Employee;
+                else
+                {
+                    mid = string.Concat(processData.Reactor, "-", processData.RDS, "-", processData.PSN);
+                    mid = Regex.Replace(mid, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0];
+                }
+                SetFileParameterLotID(mid);
+                _Logistics.Update(mid, processData.Reactor);
+                string logBody = processData.LogBody;
+                if (iProcessData.Details.Count > 0)
+                    results = iProcessData.GetResults(this, _Logistics, results.Item4);
+                else
+                    results = new(string.Concat("C) No Data - ", dateTime.Ticks), Array.Empty<Test>(), Array.Empty<JsonElement>(), results.Item4);
+                if (!_IsEAFHosted)
+                    results = new(logBody, results.Item2, results.Item3, results.Item4);
             }
-            SetFileParameterLotID(mid);
-            _Logistics.Update(mid, processData.Reactor);
-            string logBody = processData.LogBody;
-            if (!iProcessData.Details.Any())
-                throw new Exception(string.Concat("B) No Data - ", dateTime.Ticks));
-            results = iProcessData.GetResults(this, _Logistics, results.Item4);
-            if (!_IsEAFHosted)
-                results = new(logBody, results.Item2, results.Item3, results.Item4);
         }
         return results;
     }

Adaptation/FileHandlers/RsM/Line1.cs

@@ -0,0 +1,29 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Line1
+{
+
+    [JsonConstructor]
+    public Line1(string title) =>
+        Title = title;
+
+    [JsonPropertyName("Title")] public string Title { get; }
+
+    internal static Line1 Get(string[] segments)
+    {
+        Line1 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line1))]
+internal partial class Line1SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line10.cs

@@ -0,0 +1,40 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Line10
+{
+
+    [JsonConstructor]
+    public Line10(string diamThScan, string diamStart, string diamEnd, string diamStep)
+    {
+        DiamThScan = diamThScan;
+        DiamStart = diamStart;
+        DiamEnd = diamEnd;
+        DiamStep = diamStep;
+    }
+
+    [JsonPropertyName("Diam ThScan")] public string DiamThScan { get; }
+    [JsonPropertyName("Diam Start")] public string DiamStart { get; }
+    [JsonPropertyName("Diam End")] public string DiamEnd { get; }
+    [JsonPropertyName("Diam Step")] public string DiamStep { get; }
+
+    internal static Line10 Get(string[] segments)
+    {
+        Line10 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0],
+                     collection.Count < 2 ? string.Empty : collection[1],
+                     collection.Count < 3 ? string.Empty : collection[2],
+                     collection.Count < 4 ? string.Empty : collection[3]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line10))]
+internal partial class Line10SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line11.cs

@@ -0,0 +1,55 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Line11
+{
+
+    [JsonConstructor]
+    public Line11(string flatOrNotch, string followMajorFlat, string autoOrManualLoad, string rangeOrIndividual, string pauseAfterEveryRun, string autoPrint, string plot, string bulkSampleThk, string unit)
+    {
+        FlatOrNotch = flatOrNotch;
+        FollowMajorFlat = followMajorFlat;
+        AutoOrManualLoad = autoOrManualLoad;
+        RangeOrIndividual = rangeOrIndividual;
+        PauseAfterEveryRun = pauseAfterEveryRun;
+        AutoPrint = autoPrint;
+        Plot = plot;
+        BulkSampleThk = bulkSampleThk;
+        Unit = unit;
+    }
+
+    [JsonPropertyName("FlatOrNotch")] public string FlatOrNotch { get; }
+    [JsonPropertyName("FollowMajorFlat")] public string FollowMajorFlat { get; }
+    [JsonPropertyName("AutoOrManualLoad")] public string AutoOrManualLoad { get; }
+    [JsonPropertyName("RangeOrIndvdual")] public string RangeOrIndividual { get; }
+    [JsonPropertyName("PauseAfterEveryRun")] public string PauseAfterEveryRun { get; }
+    [JsonPropertyName("AutoPrint")] public string AutoPrint { get; }
+    [JsonPropertyName("Plot")] public string Plot { get; }
+    [JsonPropertyName("BulkSmplThk")] public string BulkSampleThk { get; }
+    [JsonPropertyName("Unit")] public string Unit { get; }
+
+    internal static Line11 Get(string[] segments)
+    {
+        Line11 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0],
+                     collection.Count < 2 ? string.Empty : collection[1],
+                     collection.Count < 3 ? string.Empty : collection[2],
+                     collection.Count < 4 ? string.Empty : collection[3],
+                     collection.Count < 5 ? string.Empty : collection[4],
+                     collection.Count < 6 ? string.Empty : collection[5],
+                     collection.Count < 7 ? string.Empty : collection[6],
+                     collection.Count < 8 ? string.Empty : collection[7],
+                     collection.Count < 9 ? string.Empty : collection[8]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line11))]
+internal partial class Line11SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line12.cs

@@ -0,0 +1,34 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Line12
+{
+
+    [JsonConstructor]
+    public Line12(string rangeFrom, string rangeTo)
+    {
+        RangeFrom = rangeFrom;
+        RangeTo = rangeTo;
+    }
+
+    [JsonPropertyName("RangeFrom")] public string RangeFrom { get; }
+    [JsonPropertyName("RangeTo")] public string RangeTo { get; }
+
+    internal static Line12 Get(string[] segments)
+    {
+        Line12 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0],
+                     collection.Count < 2 ? string.Empty : collection[1]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line12))]
+internal partial class Line12SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line13.cs

@@ -0,0 +1,29 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Line13
+{
+
+    [JsonConstructor]
+    public Line13(string cassetteSlotSelected) =>
+        CassetteSlotSelected = cassetteSlotSelected;
+
+    [JsonPropertyName("CassSlotSelected")] public string CassetteSlotSelected { get; }
+
+    internal static Line13 Get(string[] segments)
+    {
+        Line13 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line13))]
+internal partial class Line13SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line2.cs

@@ -0,0 +1,46 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Line2
+{
+
+    [JsonConstructor]
+    public Line2(string fileName, string project, string recipeName, string lotID, string wfrID, string is_TF_DataFile)
+    {
+        FileName = fileName;
+        Project = project;
+        RecipeName = recipeName;
+        LotID = lotID;
+        WfrID = wfrID;
+        Is_TF_DataFile = is_TF_DataFile;
+    }
+
+    [JsonPropertyName("FileName")] public string FileName { get; }
+    [JsonPropertyName("Proj")] public string Project { get; }
+    [JsonPropertyName("Rcpe")] public string RecipeName { get; }
+    [JsonPropertyName("LotID")] public string LotID { get; }
+    [JsonPropertyName("WfrID")] public string WfrID { get; }
+    [JsonPropertyName("Is_TF_DataFile")] public string Is_TF_DataFile { get; }
+
+    internal static Line2 Get(string[] segments)
+    {
+        Line2 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0],
+                     collection.Count < 2 ? string.Empty : collection[1],
+                     collection.Count < 3 ? string.Empty : collection[2],
+                     collection.Count < 4 ? string.Empty : collection[3],
+                     collection.Count < 5 ? string.Empty : collection[4],
+                     collection.Count < 6 ? string.Empty : collection[5]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line2))]
+internal partial class Line2SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line3.cs

@@ -0,0 +1,29 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Line3
+{
+
+    [JsonConstructor]
+    public Line3(string directory) =>
+        Directory = directory;
+
+    [JsonPropertyName("Directory")] public string Directory { get; }
+
+    internal static Line3 Get(string[] segments)
+    {
+        Line3 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line3))]
+internal partial class Line3SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line4.cs

@@ -0,0 +1,43 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Line4
+{
+
+    [JsonConstructor]
+    public Line4(string time, string date, string temp, string tCRPercent, string nOrP)
+    {
+        Time = time;
+        Date = date;
+        Temp = temp;
+        TCRPercent = tCRPercent;
+        NOrP = nOrP;
+    }
+
+    [JsonPropertyName("Time")] public string Time { get; }
+    [JsonPropertyName("Date")] public string Date { get; }
+    [JsonPropertyName("Temp")] public string Temp { get; }
+    [JsonPropertyName("TCR%")] public string TCRPercent { get; }
+    [JsonPropertyName("N|P")] public string NOrP { get; }
+
+    internal static Line4 Get(string[] segments)
+    {
+        Line4 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0],
+                     collection.Count < 2 ? string.Empty : collection[1],
+                     collection.Count < 3 ? string.Empty : collection[2],
+                     collection.Count < 4 ? string.Empty : collection[3],
+                     collection.Count < 5 ? string.Empty : collection[4]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line4))]
+internal partial class Line4SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line4B.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+#nullable enable
+
+internal record Line4B
+{
+
+    [JsonConstructor]
+    public Line4B(string avg, string dev, string min, string max)
+    {
+        Avg = avg;
+        Dev = dev;
+        Min = min;
+        Max = max;
+    }
+
+    [JsonPropertyName("Avg")] public string Avg { get; }
+    [JsonPropertyName("Dev")] public string Dev { get; }
+    [JsonPropertyName("Min")] public string Min { get; }
+    [JsonPropertyName("Max")] public string Max { get; }
+
+    internal static Line4B? Get(string[] segments)
+    {
+        Line4B? result;
+        if (segments.Length < 2)
+            result = null;
+        else
+        {
+            string[] segmentsB = segments[1].Split(new string[] { " " }, StringSplitOptions.RemoveEmptyEntries);
+            result = new(segmentsB.Length < 2 ? string.Empty : segmentsB[1],
+                         segmentsB.Length < 4 ? string.Empty : segmentsB[3],
+                         segmentsB.Length < 6 ? string.Empty : segmentsB[5],
+                         segmentsB.Length < 8 ? string.Empty : segmentsB[7]);
+        }
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line4B))]
+internal partial class Line4BSourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line5.cs

@@ -0,0 +1,34 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Line5
+{
+
+    [JsonConstructor]
+    public Line5(string @operator, string equipment)
+    {
+        Operator = @operator;
+        Equipment = equipment;
+    }
+
+    [JsonPropertyName("Operator")] public string Operator { get; }
+    [JsonPropertyName("Epuipment")] public string Equipment { get; }
+
+    internal static Line5 Get(string[] segments)
+    {
+        Line5 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0],
+                     collection.Count < 2 ? string.Empty : collection[1]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line5))]
+internal partial class Line5SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line6.cs

@@ -0,0 +1,29 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Line6
+{
+
+    [JsonConstructor]
+    public Line6(string engineer) =>
+        Engineer = engineer;
+
+    [JsonPropertyName("Engineer")] public string Engineer { get; }
+
+    internal static Line6 Get(string[] segments)
+    {
+        Line6 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line6))]
+internal partial class Line6SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line7.cs

@@ -0,0 +1,58 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Line7
+{
+
+    [JsonConstructor]
+    public Line7(string areaOrDiamScan, string waferShape, string bNBand, string templateFile, string xSize, string ySize, string calibrationFactor, string msmtMode, string dataType, string dataUnit)
+    {
+        AreaOrDiamScan = areaOrDiamScan;
+        WaferShape = waferShape;
+        BNBand = bNBand;
+        TemplateFile = templateFile;
+        XSize = xSize;
+        YSize = ySize;
+        CalibrationFactor = calibrationFactor;
+        MsmtMode = msmtMode;
+        DataType = dataType;
+        DataUnit = dataUnit;
+    }
+
+    [JsonPropertyName("AreaOrDiamScan")] public string AreaOrDiamScan { get; }
+    [JsonPropertyName("WaferShape")] public string WaferShape { get; }
+    [JsonPropertyName("dNBand")] public string BNBand { get; }
+    [JsonPropertyName("TemplateFile")] public string TemplateFile { get; }
+    [JsonPropertyName("xsize")] public string XSize { get; }
+    [JsonPropertyName("ysize")] public string YSize { get; }
+    [JsonPropertyName("CalibFactor")] public string CalibrationFactor { get; }
+    [JsonPropertyName("MsmtMode")] public string MsmtMode { get; }
+    [JsonPropertyName("DataType")] public string DataType { get; }
+    [JsonPropertyName("DataUnit")] public string DataUnit { get; }
+
+    internal static Line7 Get(string[] segments)
+    {
+        Line7 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0],
+                     collection.Count < 2 ? string.Empty : collection[1],
+                     collection.Count < 3 ? string.Empty : collection[2],
+                     collection.Count < 4 ? string.Empty : collection[3],
+                     collection.Count < 5 ? string.Empty : collection[4],
+                     collection.Count < 6 ? string.Empty : collection[5],
+                     collection.Count < 7 ? string.Empty : collection[6],
+                     collection.Count < 8 ? string.Empty : collection[7],
+                     collection.Count < 9 ? string.Empty : collection[8],
+                     collection.Count < 10 ? string.Empty : collection[9]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line7))]
+internal partial class Line7SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line8.cs

@@ -0,0 +1,58 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Line8
+{
+
+    [JsonConstructor]
+    public Line8(string numProbePoints, string singleOrDualProbeConfig, string numberActPrbPts, string rsens, string idrvMx, string vinGain, string dataRejectSigma, string meritThreshold, string prbChgNumber, string prbName)
+    {
+        NumProbePoints = numProbePoints;
+        SingleOrDualProbeConfig = singleOrDualProbeConfig;
+        NumberActPrbPts = numberActPrbPts;
+        Rsens = rsens;
+        IdrvMx = idrvMx;
+        VinGain = vinGain;
+        DataRejectSigma = dataRejectSigma;
+        MeritThreshold = meritThreshold;
+        PrbChgNumber = prbChgNumber;
+        PrbName = prbName;
+    }
+
+    [JsonPropertyName("NumProbePoints")] public string NumProbePoints { get; }
+    [JsonPropertyName("SingleOrDualProbeConfig")] public string SingleOrDualProbeConfig { get; }
+    [JsonPropertyName("#ActPrbPts")] public string NumberActPrbPts { get; }
+    [JsonPropertyName("Rsens")] public string Rsens { get; }
+    [JsonPropertyName("IdrvMx")] public string IdrvMx { get; }
+    [JsonPropertyName("VinGain")] public string VinGain { get; }
+    [JsonPropertyName("DataRejectSigma")] public string DataRejectSigma { get; }
+    [JsonPropertyName("MeritThreshold")] public string MeritThreshold { get; }
+    [JsonPropertyName("PrbChg#")] public string PrbChgNumber { get; }
+    [JsonPropertyName("PrbName")] public string PrbName { get; }
+
+    internal static Line8 Get(string[] segments)
+    {
+        Line8 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0],
+                     collection.Count < 2 ? string.Empty : collection[1],
+                     collection.Count < 3 ? string.Empty : collection[2],
+                     collection.Count < 4 ? string.Empty : collection[3],
+                     collection.Count < 5 ? string.Empty : collection[4],
+                     collection.Count < 6 ? string.Empty : collection[5],
+                     collection.Count < 7 ? string.Empty : collection[6],
+                     collection.Count < 8 ? string.Empty : collection[7],
+                     collection.Count < 9 ? string.Empty : collection[8],
+                     collection.Count < 10 ? string.Empty : collection[9]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line8))]
+internal partial class Line8SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Line9.cs

@@ -0,0 +1,55 @@
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal class Line9
+{
+
+    [JsonConstructor]
+    public Line9(string waferSize, string edgeEx, string xll, string yll, string xur, string yur, string x, string y, string cutCorners)
+    {
+        WaferSize = waferSize;
+        EdgeEx = edgeEx;
+        Xll = xll;
+        Yll = yll;
+        Xur = xur;
+        Yur = yur;
+        X = x;
+        Y = y;
+        CutCorners = cutCorners;
+    }
+
+    [JsonPropertyName("WaferSize")] public string WaferSize { get; }
+    [JsonPropertyName("EdgeEx")] public string EdgeEx { get; }
+    [JsonPropertyName("xll")] public string Xll { get; }
+    [JsonPropertyName("yll")] public string Yll { get; }
+    [JsonPropertyName("xur")] public string Xur { get; }
+    [JsonPropertyName("yur")] public string Yur { get; }
+    [JsonPropertyName("x")] public string X { get; }
+    [JsonPropertyName("y")] public string Y { get; }
+    [JsonPropertyName("CutCorners")] public string CutCorners { get; }
+
+    internal static Line9 Get(string[] segments)
+    {
+        Line9 result;
+        ReadOnlyCollection<string> collection = Run.GetCollection(segments);
+        result = new(collection.Count < 1 ? string.Empty : collection[0],
+                     collection.Count < 2 ? string.Empty : collection[1],
+                     collection.Count < 3 ? string.Empty : collection[2],
+                     collection.Count < 4 ? string.Empty : collection[3],
+                     collection.Count < 5 ? string.Empty : collection[4],
+                     collection.Count < 6 ? string.Empty : collection[5],
+                     collection.Count < 7 ? string.Empty : collection[6],
+                     collection.Count < 8 ? string.Empty : collection[7],
+                     collection.Count < 9 ? string.Empty : collection[8]);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Line9))]
+internal partial class Line9SourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Point.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+internal record Point
+{
+
+    [JsonConstructor]
+    public Point(string r, string th, string data, string rs, string rsA, string rsB, string numberSample, string x, string y, string irng, string vrng, string chiSq, string meritGOF, string dataIntegrity)
+    {
+        R = r;
+        Th = th;
+        Data = data;
+        Rs = rs;
+        RsA = rsA;
+        RsB = rsB;
+        NumberSample = numberSample;
+        X = x;
+        Y = y;
+        Irng = irng;
+        Vrng = vrng;
+        ChiSq = chiSq;
+        MeritGOF = meritGOF;
+        DataIntegrity = dataIntegrity;
+    }
+
+    [JsonPropertyName("R")] public string R { get; }
+    [JsonPropertyName("Th")] public string Th { get; }
+    [JsonPropertyName("Data")] public string Data { get; }
+    [JsonPropertyName("Rs")] public string Rs { get; }
+    [JsonPropertyName("RsA")] public string RsA { get; }
+    [JsonPropertyName("RsB")] public string RsB { get; }
+    [JsonPropertyName("#Smpl")] public string NumberSample { get; }
+    [JsonPropertyName("x")] public string X { get; }
+    [JsonPropertyName("y")] public string Y { get; }
+    [JsonPropertyName("Irng")] public string Irng { get; }
+    [JsonPropertyName("Vrng")] public string Vrng { get; }
+    [JsonPropertyName("ChiSq")] public string ChiSq { get; }
+    [JsonPropertyName("merit/GOF")] public string MeritGOF { get; }
+    [JsonPropertyName("DataIntegrity")] public string DataIntegrity { get; }
+
+    internal static ReadOnlyCollection<Point> Get(int take, ReadOnlyCollection<string> lines, string[] separator)
+    {
+        List<Point> results = new();
+        Point point;
+        string[] segments;
+        ReadOnlyCollection<string> collection;
+        for (int i = take - 1; i < lines.Count; i++)
+        {
+            if (string.IsNullOrEmpty(lines[i]))
+                break;
+            segments = lines[i].Split(separator, StringSplitOptions.RemoveEmptyEntries);
+            collection = Run.GetCollection(segments);
+            point = new(collection.Count < 1 ? string.Empty : collection[0],
+                        collection.Count < 2 ? string.Empty : collection[1],
+                        collection.Count < 3 ? string.Empty : collection[2],
+                        collection.Count < 4 ? string.Empty : collection[3],
+                        collection.Count < 5 ? string.Empty : collection[4],
+                        collection.Count < 6 ? string.Empty : collection[5],
+                        collection.Count < 7 ? string.Empty : collection[6],
+                        collection.Count < 8 ? string.Empty : collection[7],
+                        collection.Count < 9 ? string.Empty : collection[8],
+                        collection.Count < 10 ? string.Empty : collection[9],
+                        collection.Count < 11 ? string.Empty : collection[10],
+                        collection.Count < 12 ? string.Empty : collection[11],
+                        collection.Count < 13 ? string.Empty : collection[12],
+                        collection.Count < 14 ? string.Empty : collection[13]);
+            results.Add(point);
+        }
+        return new(results);
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Point))]
+internal partial class PointSourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/ProcessData.cs

@@ -1,5 +1,6 @@
 using Adaptation.Shared;
 using Adaptation.Shared.Methods;
+using log4net;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -49,15 +50,16 @@ public class ProcessData : IProcessData
     public string UniqueId { get; set; }
     public string Zone { get; set; }
 
+    private readonly ILog _Log;
     List<object> Shared.Properties.IProcessData.Details => _Details;
 
-    public ProcessData(IFileRead fileRead, Logistics logistics, List<FileInfo> fileInfoCollection)
+    internal ProcessData(IFileRead fileRead, Logistics logistics, List<FileInfo> fileInfoCollection, Run run)
     {
         JobID = logistics.JobID;
-        fileInfoCollection.Clear();
         _Details = new List<object>();
         MesEntity = logistics.MesEntity;
-        Parse(fileRead, logistics, fileInfoCollection);
+        _Log = LogManager.GetLogger(typeof(ProcessData));
+        Parse(fileRead, logistics, fileInfoCollection, run);
     }
 
     string IProcessData.GetCurrentReactor(IFileRead fileRead, Logistics logistics, Dictionary<string, string> reactors) => throw new Exception(string.Concat("See ", nameof(Parse)));
@@ -78,18 +80,22 @@ public class ProcessData : IProcessData
             if (description.Test != (int)tests[i])
                 throw new Exception();
         }
+        FileInfo fileInfo = new($"{logistics.ReportFullPath}.descriptions.json");
         List<Description> fileReadDescriptions = (from l in descriptions select (Description)l).ToList();
         string json = JsonSerializer.Serialize(fileReadDescriptions, fileReadDescriptions.GetType());
-        JsonElement[] jsonElements = JsonSerializer.Deserialize<JsonElement[]>(json);
+        File.WriteAllText(fileInfo.FullName, json);
+        File.SetLastWriteTime(fileInfo.FullName, logistics.DateTimeFromSequence);
+        fileInfoCollection.Add(fileInfo);
+        JsonElement[] jsonElements = JsonSerializer.Deserialize<JsonElement[]>(json) ?? throw new Exception();
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(logistics.Logistics1[0], tests.ToArray(), jsonElements, fileInfoCollection);
         return results;
     }
 
-    private static (string, string) GetReactorAndRDS(string defaultReactor, string defaultRDS, string text, string formattedText, string[] segments, bool hasRDS)
+    private static (string, string) GetReactorAndRDS(string defaultReactor, string defaultRDS, string text, string formattedText, string[] segments)
     {
         string rds;
         string reactor;
-        if (string.IsNullOrEmpty(text) || segments.Length == 0 || string.IsNullOrEmpty(formattedText) || (segments.Length > 1 && !hasRDS))
+        if (string.IsNullOrEmpty(text) || segments.Length == 0 || string.IsNullOrEmpty(formattedText))
             reactor = defaultReactor;
         else
             reactor = segments[0];
@@ -105,11 +111,11 @@ public class ProcessData : IProcessData
         return new(reactor, rds);
     }
 
-    private static (string, string) GetLayerAndPSN(string defaultLayer, string defaultPSN, string[] segments, bool hasRDS)
+    private static (string, string) GetLayerAndPSN(string defaultLayer, string defaultPSN, string[] segments)
     {
         string psn;
         string layer;
-        if (segments.Length <= 2 || (segments.Length > 1 && !hasRDS))
+        if (segments.Length <= 2)
         {
             psn = defaultPSN;
             layer = defaultLayer;
@@ -161,7 +167,17 @@ public class ProcessData : IProcessData
         string defaultLayer = string.Empty;
         string defaultReactor = string.Empty;
         string defaultEmployee = string.Empty;
-        if (string.IsNullOrEmpty(text) || (text.Length is 2 or 3 && Regex.IsMatch(text, "^[a-zA-z]{2,3}")))
+        if (Regex.IsMatch(text, @"^[a-zA-z][0-9]{2,4}$"))
+        {
+            run = text.ToUpper();
+            psn = defaultPSN;
+            rds = defaultRDS;
+            zone = defaultZone;
+            layer = defaultLayer;
+            reactor = defaultReactor;
+            employee = defaultEmployee;
+        }
+        else if (string.IsNullOrEmpty(text) || (text.Length is 2 or 3 && Regex.IsMatch(text, "^[a-zA-z]{2,3}")))
         {
             run = text;
             employee = text;
@@ -193,9 +209,9 @@ public class ProcessData : IProcessData
                 title = title.Substring(2);
             run = title;
             string[] segments = title.Split('-');
-            bool hasRDS = Regex.IsMatch(title, "[-]?[0-9]{5,}[-]?");
-            (reactor, rds) = GetReactorAndRDS(defaultReactor, defaultRDS, text, title, segments, hasRDS);
-            (layer, psn) = GetLayerAndPSN(defaultLayer, defaultPSN, segments, hasRDS);
+            // bool hasRDS = Regex.IsMatch(title, "[-]?([QP][0-9]{4,}|[0-9]{5,})[-]?");
+            (reactor, rds) = GetReactorAndRDS(defaultReactor, defaultRDS, text, title, segments);
+            (layer, psn) = GetLayerAndPSN(defaultLayer, defaultPSN, segments);
             zone = GetZone(segments);
             employee = defaultEmployee;
         }
@@ -203,10 +219,10 @@ public class ProcessData : IProcessData
         return result;
     }
 
-    private void SetTitleData(Logistics logistics, string text)
+    private void SetTitleData(Logistics logistics, Run run)
     {
         string timeFormat = "yyyyMMddHHmmss";
-        Descriptor descriptor = GetDescriptor(text);
+        Descriptor descriptor = GetDescriptor(run.Line1.Title);
         PSN = descriptor.PSN;
         RDS = descriptor.RDS;
         Run = descriptor.Run;
@@ -307,12 +323,12 @@ public class ProcessData : IProcessData
         return result;
     }
 
-    private void Parse(IFileRead fileRead, Logistics logistics, List<FileInfo> fileInfoCollection)
+#nullable enable
+
+    private void Parse(IFileRead fileRead, Logistics logistics, List<FileInfo> fileInfoCollection, Run run)
     {
         if (fileRead is null)
-        { }
-        if (fileInfoCollection is null)
-        { }
+            throw new ArgumentNullException(nameof(fileRead));
         Lot = "LotID";
         Detail detail;
         string[] segments;
@@ -322,7 +338,7 @@ public class ProcessData : IProcessData
         {
             segments = lines[i].Split(separator, StringSplitOptions.RemoveEmptyEntries);
             if (lines[i].Contains("<Title>") && segments.Length > 0)
-                SetTitleData(logistics, segments[0]);
+                SetTitleData(logistics, run);
             else if (lines[i].Contains("<FileName, Proj,Rcpe, LotID,WfrID"))
                 SetFileNameData(segments);
             else if (lines[i].Contains("<DateTime,Temp,TCR%,N|P>"))
@@ -372,10 +388,9 @@ public class ProcessData : IProcessData
         }
         _ = stringBuilder.AppendLine($"Avg =	{Avg}	{StandardDeviationPercentage}	SEMI Radial= {"#.##%"}");
         LogBody = stringBuilder.ToString();
+        fileInfoCollection.Add(logistics.FileInfo);
     }
 
-#nullable enable
-
     internal static List<Description> GetDescriptions(JsonElement[] jsonElements)
     {
         List<Description> results = new();

Adaptation/FileHandlers/RsM/Row.cs

@@ -0,0 +1,211 @@
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+#nullable enable
+
+internal class Row
+{
+
+    public Row(Run run, int i)
+    {
+        Index = i;
+        //
+        Title = run.Line1.Title;
+        //
+        FileName = run.Line2.FileName;
+        Project = run.Line2.Project;
+        RecipeName = run.Line2.RecipeName;
+        LotID = run.Line2.LotID;
+        WfrID = run.Line2.WfrID;
+        Is_TF_DataFile = run.Line2.Is_TF_DataFile;
+        //
+        Directory = run.Line3.Directory;
+        //
+        Time = run.Line4.Time;
+        Date = run.Line4.Date;
+        Temp = run.Line4.Temp;
+        TCRPercent = run.Line4.TCRPercent;
+        NOrP = run.Line4.NOrP;
+        //
+        Avg = run.Line4B.Avg;
+        Dev = run.Line4B.Dev;
+        Min = run.Line4B.Min;
+        Max = run.Line4B.Max;
+        //
+        Operator = run.Line5.Operator;
+        Equipment = run.Line5.Equipment;
+        //
+        Engineer = run.Line6.Engineer;
+        //
+        AreaOrDiamScan = run.Line7.AreaOrDiamScan;
+        WaferShape = run.Line7.WaferShape;
+        BNBand = run.Line7.BNBand;
+        TemplateFile = run.Line7.TemplateFile;
+        XSize = run.Line7.XSize;
+        YSize = run.Line7.YSize;
+        CalibrationFactor = run.Line7.CalibrationFactor;
+        MsmtMode = run.Line7.MsmtMode;
+        DataType = run.Line7.DataType;
+        DataUnit = run.Line7.DataUnit;
+        //
+        NumProbePoints = run.Line8.NumProbePoints;
+        SingleOrDualProbeConfig = run.Line8.SingleOrDualProbeConfig;
+        NumberActPrbPts = run.Line8.NumberActPrbPts;
+        Rsens = run.Line8.Rsens;
+        IdrvMx = run.Line8.IdrvMx;
+        VinGain = run.Line8.VinGain;
+        DataRejectSigma = run.Line8.DataRejectSigma;
+        MeritThreshold = run.Line8.MeritThreshold;
+        PrbChgNumber = run.Line8.PrbChgNumber;
+        PrbName = run.Line8.PrbName;
+        //
+        WaferSize = run.Line9.WaferSize;
+        EdgeEx = run.Line9.EdgeEx;
+        Xll = run.Line9.Xll;
+        Yll = run.Line9.Yll;
+        Xur = run.Line9.Xur;
+        Yur = run.Line9.Yur;
+        X = run.Line9.X;
+        Y = run.Line9.Y;
+        CutCorners = run.Line9.CutCorners;
+        //
+        DiamThScan = run.Line10.DiamThScan;
+        DiamStart = run.Line10.DiamStart;
+        DiamEnd = run.Line10.DiamEnd;
+        DiamStep = run.Line10.DiamStep;
+        //
+        FlatOrNotch = run.Line11.FlatOrNotch;
+        FollowMajorFlat = run.Line11.FollowMajorFlat;
+        AutoOrManualLoad = run.Line11.AutoOrManualLoad;
+        RangeOrIndividual = run.Line11.RangeOrIndividual;
+        PauseAfterEveryRun = run.Line11.PauseAfterEveryRun;
+        AutoPrint = run.Line11.AutoPrint;
+        Plot = run.Line11.Plot;
+        BulkSampleThk = run.Line11.BulkSampleThk;
+        Unit = run.Line11.Unit;
+        //
+        RangeFrom = run.Line12.RangeFrom;
+        RangeTo = run.Line12.RangeTo;
+        //
+        CassetteSlotSelected = run.Line13.CassetteSlotSelected;
+        //
+        R = run.Points[i].R;
+        Th = run.Points[i].Th;
+        Data = run.Points[i].Data;
+        Rs = run.Points[i].Rs;
+        RsA = run.Points[i].RsA;
+        RsB = run.Points[i].RsB;
+        NumberSample = run.Points[i].NumberSample;
+        PointX = run.Points[i].X;
+        PointY = run.Points[i].Y;
+        Irng = run.Points[i].Irng;
+        Vrng = run.Points[i].Vrng;
+        ChiSq = run.Points[i].ChiSq;
+        MeritGOF = run.Points[i].MeritGOF;
+        DataIntegrity = run.Points[i].DataIntegrity;
+    }
+
+    public int Index { get; }
+    //
+    public string Title { get; }
+    //
+    public string FileName { get; }
+    public string Project { get; }
+    public string RecipeName { get; }
+    public string LotID { get; }
+    public string WfrID { get; }
+    public string Is_TF_DataFile { get; }
+    //
+    public string Directory { get; }
+    //
+    public string Time { get; }
+    public string Date { get; }
+    public string Temp { get; }
+    public string TCRPercent { get; }
+    public string NOrP { get; }
+    //
+    public string Avg { get; }
+    public string Dev { get; }
+    public string Min { get; }
+    public string Max { get; }
+    //
+    public string Operator { get; }
+    public string Equipment { get; }
+    //
+    public string Engineer { get; }
+    //
+    public string AreaOrDiamScan { get; }
+    public string WaferShape { get; }
+    public string BNBand { get; }
+    public string TemplateFile { get; }
+    public string XSize { get; }
+    public string YSize { get; }
+    public string CalibrationFactor { get; }
+    public string MsmtMode { get; }
+    public string DataType { get; }
+    public string DataUnit { get; }
+    //
+    public string NumProbePoints { get; }
+    public string SingleOrDualProbeConfig { get; }
+    public string NumberActPrbPts { get; }
+    public string Rsens { get; }
+    public string IdrvMx { get; }
+    public string VinGain { get; }
+    public string DataRejectSigma { get; }
+    public string MeritThreshold { get; }
+    public string PrbChgNumber { get; }
+    public string PrbName { get; }
+    //
+    public string WaferSize { get; }
+    public string EdgeEx { get; }
+    public string Xll { get; }
+    public string Yll { get; }
+    public string Xur { get; }
+    public string Yur { get; }
+    public string X { get; }
+    public string Y { get; }
+    public string CutCorners { get; }
+    //
+    public string DiamThScan { get; }
+    public string DiamStart { get; }
+    public string DiamEnd { get; }
+    public string DiamStep { get; }
+    //
+    public string FlatOrNotch { get; }
+    public string FollowMajorFlat { get; }
+    public string AutoOrManualLoad { get; }
+    public string RangeOrIndividual { get; }
+    public string PauseAfterEveryRun { get; }
+    public string AutoPrint { get; }
+    public string Plot { get; }
+    public string BulkSampleThk { get; }
+    public string Unit { get; }
+    //
+    public string RangeFrom { get; }
+    public string RangeTo { get; }
+    //
+    public string CassetteSlotSelected { get; }
+    //
+    public string R { get; }
+    public string Th { get; }
+    public string Data { get; }
+    public string Rs { get; }
+    public string RsA { get; }
+    public string RsB { get; }
+    public string NumberSample { get; }
+    public string PointX { get; }
+    public string PointY { get; }
+    public string Irng { get; }
+    public string Vrng { get; }
+    public string ChiSq { get; }
+    public string MeritGOF { get; }
+    public string DataIntegrity { get; }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Row))]
+internal partial class RowSourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/RsM/Run.cs

@@ -0,0 +1,192 @@
+using Adaptation.Shared;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Adaptation.FileHandlers.RsM;
+
+#nullable enable
+
+internal class Run
+{
+    public Run(Line1 line1, Line2 line2, Line3 line3, Line4 line4, Line4B line4B, Line5 line5, Line6 line6, Line7 line7, Line8 line8, Line9 line9, Line10 line10, Line11 line11, Line12 line12, Line13 line13, ReadOnlyCollection<Point> points)
+    {
+        Line1 = line1;
+        Line2 = line2;
+        Line3 = line3;
+        Line4 = line4;
+        Line4B = line4B;
+        Line5 = line5;
+        Line6 = line6;
+        Line7 = line7;
+        Line8 = line8;
+        Line9 = line9;
+        Line10 = line10;
+        Line11 = line11;
+        Line12 = line12;
+        Line13 = line13;
+        Points = points;
+    }
+
+    public Line1 Line1 { get; }
+    public Line2 Line2 { get; }
+    public Line3 Line3 { get; }
+    public Line4 Line4 { get; }
+    public Line4B Line4B { get; }
+    public Line5 Line5 { get; }
+    public Line6 Line6 { get; }
+    public Line7 Line7 { get; }
+    public Line8 Line8 { get; }
+    public Line9 Line9 { get; }
+    public Line10 Line10 { get; }
+    public Line11 Line11 { get; }
+    public Line12 Line12 { get; }
+    public Line13 Line13 { get; }
+    public ReadOnlyCollection<Point> Points { get; }
+
+    internal static ReadOnlyCollection<string> GetCollection(string[] segments)
+    {
+        List<string> results = new();
+        foreach (string segment in segments)
+        {
+            if (segment[0] == ',')
+                break;
+            results.Add(segment);
+        }
+        return new(results);
+    }
+
+    private static void WriteJson(Logistics logistics, List<FileInfo> fileInfoCollection, Run result)
+    {
+        FileInfo fileInfo = new($"{logistics.ReportFullPath}.run.json");
+        string json = JsonSerializer.Serialize(result, RunSourceGenerationContext.Default.Run);
+        File.WriteAllText(fileInfo.FullName, json);
+        File.SetLastWriteTime(fileInfo.FullName, logistics.DateTimeFromSequence);
+        fileInfoCollection.Add(fileInfo);
+    }
+
+    private static ReadOnlyCollection<string> GetLines(Logistics logistics, JsonElement[]? jsonElements)
+    {
+        List<string> results = new();
+        int columns = 0;
+        StringBuilder stringBuilder = new();
+        results.Add($"\"Count\",{jsonElements?.Length}");
+        results.Add($"\"{nameof(logistics.Sequence)}\",\"{logistics.Sequence}\"");
+        results.Add($"\"{nameof(logistics.MesEntity)}\",\"{logistics.MesEntity}\"");
+        string dateTimeFromSequence = logistics.DateTimeFromSequence.ToString("MM/dd/yyyy hh:mm:ss tt");
+        for (int i = 0; i < jsonElements?.Length;)
+        {
+            _ = stringBuilder.Append('"').Append(nameof(logistics.DateTimeFromSequence)).Append('"').Append(',');
+            foreach (JsonProperty jsonProperty in jsonElements[0].EnumerateObject())
+            {
+                columns += 1;
+                _ = stringBuilder.Append('"').Append(jsonProperty.Name).Append('"').Append(',');
+            }
+            break;
+        }
+        if (jsonElements?.Length != 0)
+            _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
+        results.Add(stringBuilder.ToString());
+        for (int i = 0; i < jsonElements?.Length; i++)
+        {
+            _ = stringBuilder.Clear();
+            _ = stringBuilder.Append('"').Append(dateTimeFromSequence).Append('"').Append(',');
+            foreach (JsonProperty jsonProperty in jsonElements[i].EnumerateObject())
+            {
+                if (jsonProperty.Value.ValueKind == JsonValueKind.Object)
+                    _ = stringBuilder.Append(',');
+                else if (jsonProperty.Value.ValueKind != JsonValueKind.String)
+                    _ = stringBuilder.Append(jsonProperty.Value).Append(',');
+                else
+                    _ = stringBuilder.Append('"').Append(jsonProperty.Value).Append('"').Append(',');
+            }
+            _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
+            results.Add(stringBuilder.ToString());
+        }
+        return results.AsReadOnly();
+    }
+
+    private static void WriteCommaSeparatedValues(Logistics logistics, Run run)
+    {
+        List<Row> results = new();
+        Row row;
+        for (int i = 0; i < run.Points.Count; i++)
+        {
+            row = new(run, i);
+            results.Add(row);
+        }
+        string json = JsonSerializer.Serialize(results);
+        JsonElement[]? jsonElements = JsonSerializer.Deserialize<JsonElement[]>(json);
+        ReadOnlyCollection<string> lines = GetLines(logistics, jsonElements);
+        File.WriteAllText($"{logistics.ReportFullPath}.csv", string.Join(Environment.NewLine, lines));
+    }
+
+    internal static Run? Get(Logistics logistics, List<FileInfo> fileInfoCollection)
+    {
+        Run? result;
+        int take = 14;
+        string[] lines = File.ReadAllLines(logistics.ReportFullPath);
+        ReadOnlyCollection<string> collection = new(lines);
+        if (collection.Count < take)
+            result = null;
+        else
+        {
+            string[] separator = new string[] { " ", "\t" };
+            // <Title>
+            Line1 line1 = Line1.Get(collection[0].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+            // <FileName, Proj,Rcpe, LotID,WfrID, Is_TF_DataFile>
+            Line2 line2 = Line2.Get(collection[1].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+            // <Directory>
+            Line3 line3 = Line3.Get(collection[2].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+            // <DateTime,Temp,TCR%,N|P>
+            Line4 line4 = Line4.Get(collection[3].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+            // <Avg,Dev,Min,Max>
+            Line4B? line4B = Line4B.Get(collection[3].Split(new string[] { ">" }, StringSplitOptions.RemoveEmptyEntries));
+            if (line4B is null)
+                result = null;
+            else
+            {
+                // <Operator, Epuipment>
+                Line5 line5 = Line5.Get(collection[4].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+                // <Engineer>
+                Line6 line6 = Line6.Get(collection[5].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+                // <AreaOrDiamScan, WaferShape, dNBand,  TemplateFile,  xsize,ysize, CalibFactor, MsmtMode,  DataType,  DataUnit>
+                Line7 line7 = Line7.Get(collection[6].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+                // <NumProbePoints, SingleOrDualProbeConfig, #ActPrbPts,  Rsens,IdrvMx,VinGain, DataRejectSigma, MeritThreshold, PrbChg#, PrbName>
+                Line8 line8 = Line8.Get(collection[7].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+                // <WaferSize,EdgeEx, x,yll, x,yur, #x,y, CutCorners>
+                Line9 line9 = Line9.Get(collection[8].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+                // <Diam: ThScan Start End Step>
+                Line10 line10 = Line10.Get(collection[9].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+                // <FlatOrNotch FollowMajorFlat AutoOrManualLoad RangeOrIndvdual PauseAfterEveryRun, AutoPrint,Plot, BulkSmplThk & Unit>
+                Line11 line11 = Line11.Get(collection[10].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+                // <RangeFrom, RangeTo>
+                Line12 line12 = Line12.Get(collection[11].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+                // <CassSlotSelected>
+                Line13 line13 = Line13.Get(collection[12].Split(separator, StringSplitOptions.RemoveEmptyEntries));
+                // <R,Th,Data, Rs,RsA,RsB, #Smpl, x,y, Irng,Vrng, ChiSq,merit/GOF, DataIntegrity>
+                ReadOnlyCollection<Point> points = Point.Get(take, collection, separator);
+                if (points.Count == 0)
+                    result = null;
+                else
+                {
+                    result = new(line1, line2, line3, line4, line4B, line5, line6, line7, line8, line9, line10, line11, line12, line13, points);
+                    WriteJson(logistics, fileInfoCollection, result);
+                    WriteCommaSeparatedValues(logistics, result);
+                }
+            }
+        }
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Run))]
+internal partial class RunSourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/FileHandlers/SPaCe/FileRead.cs

@@ -14,8 +14,8 @@ namespace Adaptation.FileHandlers.SPaCe;
 public class FileRead : Shared.FileRead, IFileRead
 {
 
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<Shared.Metrology.WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
         _MinFileLength = 10;
         _NullData = string.Empty;
@@ -116,18 +116,16 @@ public class FileRead : Shared.FileRead, IFileRead
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
-        if (dateTime == DateTime.MinValue)
-        { }
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
-        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
         SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             FileCopy(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/txt/Description.cs

@@ -1,317 +0,0 @@
-using Adaptation.Shared;
-using Adaptation.Shared.Methods;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-
-namespace Adaptation.FileHandlers.txt;
-
-public class Description : IDescription, Shared.Properties.IDescription
-{
-
-    public int Test { get; set; }
-    public int Count { get; set; }
-    public int Index { get; set; }
-    //
-    public string EventName { get; set; }
-    public string NullData { get; set; }
-    public string JobID { get; set; }
-    public string Sequence { get; set; }
-    public string MesEntity { get; set; }
-    public string ReportFullPath { get; set; }
-    public string ProcessJobID { get; set; }
-    public string MID { get; set; }
-    //
-    public string Date { get; set; }
-    public string Employee { get; set; }
-    public string Lot { get; set; }
-    public string PSN { get; set; }
-    public string Reactor { get; set; }
-    public string Recipe { get; set; }
-    //
-    public string AutoOptimizeGain { get; set; }
-    public string AutoProbeHeightSet { get; set; }
-    public string Avg { get; set; }
-    public string DataReject { get; set; }
-    public string DLRatio { get; set; }
-    public string Merit { get; set; }
-    public string Pt { get; set; }
-    public string R { get; set; }
-    public string ResistivitySpec { get; set; }
-    public string Rs { get; set; }
-    public string SemiRadial { get; set; }
-    public string StdDev { get; set; }
-    public string T { get; set; }
-    public string Temp { get; set; }
-    //
-    public string Engineer { get; set; }
-    public string EquipId { get; set; }
-    public string FileName { get; set; }
-    public string HeaderUniqueId { get; set; }
-    public string Id { get; set; }
-    public string Layer { get; set; }
-    public string RDS { get; set; }
-    public string Run { get; set; }
-    public string UniqueId { get; set; }
-    public string Zone { get; set; }
-    //
-    public string SheetRhoVariation { get; set; }
-
-    string IDescription.GetEventDescription() => "File Has been read and parsed";
-
-    List<string> IDescription.GetNames(IFileRead fileRead, Logistics logistics)
-    {
-        List<string> results = new();
-        IDescription description = GetDefault(fileRead, logistics);
-        string json = JsonSerializer.Serialize(description, description.GetType());
-        object @object = JsonSerializer.Deserialize<object>(json);
-        if (@object is not JsonElement jsonElement)
-            throw new Exception();
-        foreach (JsonProperty jsonProperty in jsonElement.EnumerateObject())
-            results.Add(jsonProperty.Name);
-        return results;
-    }
-
-    List<string> IDescription.GetDetailNames()
-    {
-        List<string> results = new()
-        {
-            nameof(AutoOptimizeGain),
-            nameof(AutoProbeHeightSet),
-            nameof(Avg),
-            nameof(DataReject),
-            nameof(DLRatio),
-            nameof(Merit),
-            nameof(Pt),
-            nameof(R),
-            nameof(ResistivitySpec),
-            nameof(Rs),
-            nameof(SemiRadial),
-            nameof(StdDev),
-            nameof(T),
-            nameof(Temp)
-        };
-        return results;
-    }
-
-    List<string> IDescription.GetHeaderNames()
-    {
-        List<string> results = new()
-        {
-            nameof(Date),
-            nameof(Employee),
-            nameof(Lot),
-            nameof(PSN),
-            nameof(Reactor),
-            nameof(Recipe)
-        };
-        return results;
-    }
-
-    IDescription IDescription.GetDisplayNames()
-    {
-        Description result = GetDisplayNames();
-        return result;
-    }
-
-    List<string> IDescription.GetParameterNames()
-    {
-        List<string> results = new()
-        {
-            nameof(Engineer),
-            nameof(EquipId),
-            nameof(FileName),
-            nameof(HeaderUniqueId),
-            nameof(Id),
-            nameof(Layer),
-            nameof(RDS),
-            nameof(Run),
-            nameof(UniqueId),
-            nameof(Zone),
-            nameof(SheetRhoVariation),
-        };
-        return results;
-    }
-
-    JsonProperty[] IDescription.GetDefault(IFileRead fileRead, Logistics logistics)
-    {
-        JsonProperty[] results;
-        IDescription description = GetDefault(fileRead, logistics);
-        string json = JsonSerializer.Serialize(description, description.GetType());
-        object @object = JsonSerializer.Deserialize<object>(json);
-        results = ((JsonElement)@object).EnumerateObject().ToArray();
-        return results;
-    }
-
-    List<string> IDescription.GetPairedParameterNames()
-    {
-        List<string> results = new();
-        return results;
-    }
-
-    List<string> IDescription.GetIgnoreParameterNames(Test test)
-    {
-        List<string> results = new();
-        return results;
-    }
-
-    IDescription IDescription.GetDefaultDescription(IFileRead fileRead, Logistics logistics)
-    {
-        Description result = GetDefault(fileRead, logistics);
-        return result;
-    }
-
-    Dictionary<string, string> IDescription.GetDisplayNamesJsonElement(IFileRead fileRead)
-    {
-        Dictionary<string, string> results = new();
-        IDescription description = GetDisplayNames();
-        string json = JsonSerializer.Serialize(description, description.GetType());
-        JsonElement jsonElement = JsonSerializer.Deserialize<JsonElement>(json);
-        foreach (JsonProperty jsonProperty in jsonElement.EnumerateObject())
-        {
-            if (!results.ContainsKey(jsonProperty.Name))
-                results.Add(jsonProperty.Name, string.Empty);
-            if (jsonProperty.Value is JsonElement jsonPropertyValue)
-                results[jsonProperty.Name] = jsonPropertyValue.ToString();
-        }
-        return results;
-    }
-
-    List<IDescription> IDescription.GetDescriptions(IFileRead fileRead, Logistics logistics, List<Test> tests, IProcessData iProcessData)
-    {
-        List<IDescription> results = new();
-        if (iProcessData is null || !iProcessData.Details.Any() || iProcessData is not ProcessData processData)
-            results.Add(GetDefault(fileRead, logistics));
-        else
-        {
-            string nullData;
-            Description description;
-            object configDataNullData = fileRead.NullData;
-            if (configDataNullData is null)
-                nullData = string.Empty;
-            else
-                nullData = configDataNullData.ToString();
-            for (int i = 0; i < iProcessData.Details.Count; i++)
-            {
-                if (iProcessData.Details[i] is not Detail detail)
-                    continue;
-                description = new Description
-                {
-                    Test = (int)tests[i],
-                    Count = tests.Count,
-                    Index = i,
-                    //
-                    EventName = fileRead.EventName,
-                    NullData = nullData,
-                    JobID = fileRead.CellInstanceName,
-                    Sequence = logistics.Sequence.ToString(),
-                    MesEntity = logistics.MesEntity,
-                    ReportFullPath = logistics.ReportFullPath,
-                    ProcessJobID = logistics.ProcessJobID,
-                    MID = logistics.MID,
-                    //
-                    Date = processData.Date.ToString(GetDateFormat()),
-                    Employee = processData.Employee,
-                    Lot = processData.Lot,
-                    PSN = processData.PSN,
-                    Reactor = processData.Reactor,
-                    Recipe = processData.Recipe,
-                    //
-                    AutoOptimizeGain = processData.AutoOptimizeGain,
-                    AutoProbeHeightSet = processData.AutoProbeHeightSet,
-                    Avg = processData.Avg,
-                    DataReject = processData.DataReject,
-                    DLRatio = processData.DLRatio,
-                    Merit = detail.Merit,
-                    Pt = detail.Pt,
-                    R = detail.R,
-                    ResistivitySpec = processData.ResistivitySpec,
-                    Rs = detail.Rs,
-                    SemiRadial = processData.SemiRadial,
-                    StdDev = processData.StdDev,
-                    T = detail.T,
-                    Temp = processData.Temp,
-                    //
-                    Engineer = processData.Engineer,
-                    EquipId = processData.EquipId,
-                    FileName = processData.FileName,
-                    HeaderUniqueId = detail.HeaderUniqueId,
-                    Id = processData.UniqueId,
-                    Layer = processData.Layer,
-                    RDS = processData.RDS,
-                    Run = processData.Run,
-                    UniqueId = detail.UniqueId,
-                    Zone = processData.Zone,
-                    //
-                    SheetRhoVariation = string.Empty,
-                };
-                results.Add(description);
-            }
-        }
-        return results;
-    }
-
-    private static Description GetDisplayNames()
-    {
-        Description result = new();
-        return result;
-    }
-
-    private Description GetDefault(IFileRead fileRead, Logistics logistics)
-    {
-        Description result = new()
-        {
-            Test = -1,
-            Count = 0,
-            Index = -1,
-            //
-            EventName = fileRead.EventName,
-            NullData = fileRead.NullData,
-            JobID = fileRead.CellInstanceName,
-            Sequence = logistics.Sequence.ToString(),
-            MesEntity = fileRead.MesEntity,
-            ReportFullPath = logistics.ReportFullPath,
-            ProcessJobID = logistics.ProcessJobID,
-            MID = logistics.MID,
-            //
-            Date = nameof(Date),
-            Employee = nameof(Employee),
-            Lot = nameof(Lot),
-            PSN = nameof(PSN),
-            Reactor = nameof(Reactor),
-            Recipe = nameof(Recipe),
-            //
-            AutoOptimizeGain = nameof(AutoOptimizeGain),
-            AutoProbeHeightSet = nameof(AutoProbeHeightSet),
-            Avg = nameof(Avg),
-            DataReject = nameof(DataReject),
-            DLRatio = nameof(DLRatio),
-            Merit = nameof(Merit),
-            Pt = nameof(Pt),
-            R = nameof(R),
-            ResistivitySpec = nameof(ResistivitySpec),
-            Rs = nameof(Rs),
-            SemiRadial = nameof(SemiRadial),
-            StdDev = nameof(StdDev),
-            T = nameof(T),
-            Temp = nameof(Temp),
-            //
-            Engineer = nameof(Engineer),
-            EquipId = nameof(EquipId),
-            FileName = nameof(FileName),
-            HeaderUniqueId = nameof(HeaderUniqueId),
-            Id = nameof(Id),
-            Layer = nameof(Layer),
-            RDS = nameof(RDS),
-            Run = nameof(Run),
-            UniqueId = nameof(UniqueId),
-            Zone = nameof(Zone),
-            SheetRhoVariation = nameof(SheetRhoVariation),
-        };
-        return result;
-    }
-
-    internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt";
-
-}

Adaptation/FileHandlers/txt/Descriptor.cs

@@ -1,27 +0,0 @@
-namespace Adaptation.FileHandlers.txt;
-
-public class Descriptor
-{
-
-    public string Employee { get; private set; }
-    public string Layer { get; private set; }
-    public string PSN { get; private set; }
-    public string RDS { get; private set; }
-    public string Reactor { get; private set; }
-    public string Run { get; private set; }
-    public string Title { get; private set; }
-    public string Zone { get; private set; }
-
-    public Descriptor(string employee, string layer, string psn, string rds, string reactor, string run, string title, string zone)
-    {
-        Employee = employee;
-        Layer = layer;
-        PSN = psn;
-        RDS = rds;
-        Reactor = reactor;
-        Run = run;
-        Title = title;
-        Zone = zone;
-    }
-
-}

Adaptation/FileHandlers/txt/Detail.cs

@@ -1,16 +0,0 @@
-namespace Adaptation.FileHandlers.txt;
-
-public class Detail
-{
-
-    public string HeaderUniqueId { get; set; }
-    public string Merit { get; set; }
-    public string Pt { get; set; }
-    public string R { get; set; }
-    public string Rs { get; set; }
-    public string T { get; set; }
-    public string UniqueId { get; set; }
-
-    public override string ToString() => string.Concat(Merit, ";", Pt, ";", R, ";", Rs, ";", T);
-
-}

Adaptation/FileHandlers/txt/FileRead.cs

@@ -1,128 +0,0 @@
-using Adaptation.Eaf.Management.ConfigurationData.CellAutomation;
-using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration;
-using Adaptation.Shared;
-using Adaptation.Shared.Methods;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.Json;
-using System.Text.RegularExpressions;
-
-namespace Adaptation.FileHandlers.txt;
-
-public class FileRead : Shared.FileRead, IFileRead
-{
-
-    private long? _TickOffset;
-
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
-    {
-        _MinFileLength = 15;
-        _NullData = string.Empty;
-        _Logistics = new(this);
-        if (_FileParameter is null)
-            throw new Exception(cellInstanceConnectionName);
-        if (_ModelObjectParameterDefinitions is null)
-            throw new Exception(cellInstanceConnectionName);
-        if (_IsDuplicator)
-            throw new Exception(cellInstanceConnectionName);
-    }
-
-    void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception) => Move(extractResults);
-
-    void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null);
-
-    string IFileRead.GetEventDescription()
-    {
-        string result = _Description.GetEventDescription();
-        return result;
-    }
-
-    List<string> IFileRead.GetHeaderNames()
-    {
-        List<string> results = _Description.GetHeaderNames();
-        return results;
-    }
-
-    string[] IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, string to, string from, string resolvedFileLocation, Exception exception)
-    {
-        string[] results = Move(extractResults, to, from, resolvedFileLocation, exception);
-        return results;
-    }
-
-    JsonProperty[] IFileRead.GetDefault()
-    {
-        JsonProperty[] results = _Description.GetDefault(this, _Logistics);
-        return results;
-    }
-
-    Dictionary<string, string> IFileRead.GetDisplayNamesJsonElement()
-    {
-        Dictionary<string, string> results = _Description.GetDisplayNamesJsonElement(this);
-        return results;
-    }
-
-    List<IDescription> IFileRead.GetDescriptions(IFileRead fileRead, List<Test> tests, IProcessData processData)
-    {
-        List<IDescription> results = _Description.GetDescriptions(fileRead, _Logistics, tests, processData);
-        return results;
-    }
-
-    Tuple<string, Test[], JsonElement[], List<FileInfo>> IFileRead.GetExtractResult(string reportFullPath, string eventName)
-    {
-        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        if (string.IsNullOrEmpty(eventName))
-            throw new Exception();
-        _ReportFullPath = reportFullPath;
-        DateTime dateTime = DateTime.Now;
-        results = GetExtractResult(reportFullPath, dateTime);
-        if (results.Item3 is null)
-            results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(results.Item1, Array.Empty<Test>(), JsonSerializer.Deserialize<JsonElement[]>("[]"), results.Item4);
-        if (results.Item3.Length > 0 && _IsEAFHosted)
-            WritePDSF(this, results.Item3);
-        UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks);
-        return results;
-    }
-
-    Tuple<string, Test[], JsonElement[], List<FileInfo>> IFileRead.ReExtract()
-    {
-        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        List<string> headerNames = _Description.GetHeaderNames();
-        Dictionary<string, string> keyValuePairs = _Description.GetDisplayNamesJsonElement(this);
-        results = ReExtract(this, headerNames, keyValuePairs);
-        return results;
-    }
-
-    private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
-    {
-        Tuple<string, Test[], JsonElement[], List<FileInfo>> results = new(string.Empty, null, null, new List<FileInfo>());
-        _TickOffset ??= new FileInfo(reportFullPath).LastWriteTime.Ticks - dateTime.Ticks;
-        _Logistics = new Logistics(this, _TickOffset.Value, reportFullPath, useSplitForMID: true);
-        SetFileParameterLotIDToLogisticsMID();
-        if (_Logistics.FileInfo.Length < _MinFileLength)
-            results.Item4.Add(_Logistics.FileInfo);
-        else
-        {
-            IProcessData iProcessData = new ProcessData(this, _Logistics, results.Item4);
-            if (iProcessData is not ProcessData processData)
-                throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks));
-            string mid;
-            if (!string.IsNullOrEmpty(processData.Employee) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN))
-                mid = processData.Employee;
-            else
-            {
-                mid = string.Concat(processData.Reactor, "-", processData.RDS, "-", processData.PSN);
-                mid = Regex.Replace(mid, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0];
-            }
-            SetFileParameterLotID(mid);
-            _Logistics.Update(mid, processData.Reactor);
-            if (!iProcessData.Details.Any())
-                throw new Exception(string.Concat("B) No Data - ", dateTime.Ticks));
-            results = iProcessData.GetResults(this, _Logistics, results.Item4);
-        }
-        return results;
-    }
-
-}

Adaptation/FileHandlers/txt/ProcessData.cs

@@ -1,580 +0,0 @@
-using Adaptation.Shared;
-using Adaptation.Shared.Methods;
-using log4net;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Text.RegularExpressions;
-
-namespace Adaptation.FileHandlers.txt;
-
-public class ProcessData : IProcessData
-{
-
-    private int _I;
-    private string _Data;
-
-    private readonly ILog _Log;
-    private readonly List<object> _Details;
-
-    public string JobID { get; set; }
-    public string MesEntity { get; set; }
-    public string AutoOptimizeGain { get; set; }
-    public string AutoProbeHeightSet { get; set; }
-    public string Avg { get; set; }
-    public string DLRatio { get; set; }
-    public string DataReject { get; set; }
-    public DateTime Date { get; set; }
-    public string Employee { get; set; }
-    public string Engineer { get; set; }
-    public string EquipId { get; set; }
-    public string FileName { get; set; }
-    public string Layer { get; set; }
-    public string Lot { get; set; }
-    public string PSN { get; set; }
-    public string RDS { get; set; }
-    public string Reactor { get; set; }
-    public string Recipe { get; set; }
-    public string ResistivitySpec { get; set; }
-    public string Run { get; set; }
-    public string SemiRadial { get; set; }
-    public string StdDev { get; set; }
-    public string Temp { get; set; }
-    public string UniqueId { get; set; }
-    public string Zone { get; set; }
-
-    List<object> Shared.Properties.IProcessData.Details => _Details;
-
-    public ProcessData(IFileRead fileRead, Logistics logistics, List<FileInfo> fileInfoCollection)
-    {
-        fileInfoCollection.Clear();
-        _Details = new List<object>();
-        _I = 0;
-        _Data = string.Empty;
-        JobID = logistics.JobID;
-        MesEntity = logistics.MesEntity;
-        _Log = LogManager.GetLogger(typeof(ProcessData));
-        Parse(fileRead, logistics, fileInfoCollection);
-    }
-
-    string IProcessData.GetCurrentReactor(IFileRead fileRead, Logistics logistics, Dictionary<string, string> reactors) => throw new Exception(string.Concat("See ", nameof(Parse)));
-
-    Tuple<string, Test[], JsonElement[], List<FileInfo>> IProcessData.GetResults(IFileRead fileRead, Logistics logistics, List<FileInfo> fileInfoCollection)
-    {
-        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        List<Test> tests = new();
-        foreach (object item in _Details)
-            tests.Add(Test.CDE);
-        List<IDescription> descriptions = fileRead.GetDescriptions(fileRead, tests, this);
-        if (tests.Count != descriptions.Count)
-            throw new Exception();
-        for (int i = 0; i < tests.Count; i++)
-        {
-            if (descriptions[i] is not Description description)
-                throw new Exception();
-            if (description.Test != (int)tests[i])
-                throw new Exception();
-        }
-        List<Description> fileReadDescriptions = (from l in descriptions select (Description)l).ToList();
-        string json = JsonSerializer.Serialize(fileReadDescriptions, fileReadDescriptions.GetType());
-        JsonElement[] jsonElements = JsonSerializer.Deserialize<JsonElement[]>(json);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(logistics.Logistics1[0], tests.ToArray(), jsonElements, fileInfoCollection);
-        return results;
-    }
-
-    private string GetBefore(string text)
-    {
-        string str;
-        string str1;
-        int num = _Data.IndexOf(text, _I);
-        if (num <= -1)
-        {
-            str = _Data.Substring(_I);
-            _I = _Data.Length;
-            str1 = str.Trim();
-        }
-        else
-        {
-            str = _Data.Substring(_I, num - _I);
-            _I = num + text.Length;
-            str1 = str.Trim();
-        }
-        return str1;
-    }
-
-    private string GetBefore(string text, bool trim)
-    {
-        string str;
-        string before;
-        if (!trim)
-        {
-            int num = _Data.IndexOf(text, _I);
-            if (num <= -1)
-            {
-                str = _Data.Substring(_I);
-                _I = _Data.Length;
-                before = str;
-            }
-            else
-            {
-                str = _Data.Substring(_I, num - _I);
-                _I = num + text.Length;
-                before = str;
-            }
-        }
-        else
-        {
-            before = GetBefore(text);
-        }
-        return before;
-    }
-
-    private string GetToEOL() => GetBefore("\n");
-
-    private string GetToEOL(bool trim)
-    {
-        string str;
-        str = !trim ? GetBefore("\n", false) : GetToEOL();
-        return str;
-    }
-
-    private string GetToken()
-    {
-        while (true)
-        {
-            if (_I >= _Data.Length || !IsNullOrWhiteSpace(_Data.Substring(_I, 1)))
-                break;
-            _I++;
-        }
-        int num = _I;
-        while (true)
-        {
-            if (num >= _Data.Length || IsNullOrWhiteSpace(_Data.Substring(num, 1)))
-                break;
-            num++;
-        }
-        string str = _Data.Substring(_I, num - _I);
-        _I = num;
-        return str.Trim();
-    }
-
-    private string GetToText(string text)
-    {
-        string str = _Data.Substring(_I, _Data.IndexOf(text, _I) - _I).Trim();
-        return str;
-    }
-
-    private bool IsBlankLine()
-    {
-        int num = _Data.IndexOf("\n", _I);
-        return IsNullOrWhiteSpace(num > -1 ? _Data.Substring(_I, num - _I) : _Data.Substring(_I));
-    }
-
-    private static bool IsNullOrWhiteSpace(string text)
-    {
-        bool flag;
-        int num = 0;
-        while (true)
-        {
-            if (num >= text.Length)
-            {
-                flag = true;
-                break;
-            }
-            else if (char.IsWhiteSpace(text[num]))
-            {
-                num++;
-            }
-            else
-            {
-                flag = false;
-                break;
-            }
-        }
-        return flag;
-    }
-
-    private string PeekNextLine()
-    {
-        int num = _I;
-        string toEOL = GetToEOL();
-        _I = num;
-        return toEOL;
-    }
-
-    private void ScanPast(string text)
-    {
-        int num = _Data.IndexOf(text, _I);
-        if (num <= -1)
-        {
-            _I = _Data.Length;
-        }
-        else
-        {
-            _I = num + text.Length;
-        }
-    }
-
-    internal static DateTime GetDateTime(Logistics logistics, string dateTimeText)
-    {
-        DateTime result;
-        string inputDateFormat = "HH:mm MM/dd/yy";
-        if (dateTimeText.Length != inputDateFormat.Length)
-            result = logistics.DateTimeFromSequence;
-        else
-        {
-            if (!DateTime.TryParseExact(dateTimeText, inputDateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime dateTimeParsed))
-                result = logistics.DateTimeFromSequence;
-            else
-            {
-                if (dateTimeParsed < logistics.DateTimeFromSequence.AddDays(1) && dateTimeParsed > logistics.DateTimeFromSequence.AddDays(-1))
-                    result = dateTimeParsed;
-                else
-                    result = logistics.DateTimeFromSequence;
-            }
-        }
-        return result;
-    }
-
-    private static (string, string) GetReactorAndRDS(string defaultReactor, string defaultRDS, string text, string formattedText, string[] segments, bool hasRDS)
-    {
-        string rds;
-        string reactor;
-        if (string.IsNullOrEmpty(text) || segments.Length == 0 || string.IsNullOrEmpty(formattedText) || (segments.Length > 1 && !hasRDS))
-            reactor = defaultReactor;
-        else
-            reactor = segments[0];
-        if (segments.Length <= 1 || !int.TryParse(segments[1], out int rdsValue) || rdsValue < 99)
-            rds = defaultRDS;
-        else
-            rds = segments[1];
-        if (reactor.Length > 3)
-        {
-            rds = reactor;
-            reactor = defaultReactor;
-        }
-        return new(reactor, rds);
-    }
-
-    private static (string, string) GetLayerAndPSN(string defaultLayer, string defaultPSN, string[] segments, bool hasRDS)
-    {
-        string psn;
-        string layer;
-        if (segments.Length <= 2 || (segments.Length > 1 && !hasRDS))
-        {
-            psn = defaultPSN;
-            layer = defaultLayer;
-        }
-        else
-        {
-            string[] segmentsB = segments[2].Split('.');
-            psn = segmentsB[0];
-            if (segmentsB.Length <= 1)
-                layer = defaultLayer;
-            else
-            {
-                layer = segmentsB[1];
-                if (layer.Length > 1 && layer[0] == '0')
-                    layer = layer.Substring(1);
-            }
-        }
-        return (layer, psn);
-    }
-
-    private static string GetZone(string[] segments)
-    {
-        string result;
-        if (segments.Length <= 3)
-            result = string.Empty;
-        else
-        {
-            result = segments[3];
-            if (result.Length > 1 && result[0] == '0')
-                result = result.Substring(1);
-        }
-        return result;
-    }
-
-    public static Descriptor GetDescriptor(string text)
-    {
-        Descriptor result;
-        string psn;
-        string rds;
-        string run;
-        string zone;
-        string layer;
-        string title;
-        string reactor;
-        string employee;
-        string defaultPSN = string.Empty;
-        string defaultRDS = string.Empty;
-        string defaultZone = string.Empty;
-        string defaultLayer = string.Empty;
-        string defaultReactor = string.Empty;
-        string defaultEmployee = string.Empty;
-        if (string.IsNullOrEmpty(text) || (text.Length is 2 or 3 && Regex.IsMatch(text, "^[a-zA-z]{2,3}")))
-        {
-            run = text;
-            title = text;
-            employee = text;
-            psn = defaultPSN;
-            rds = defaultRDS;
-            zone = defaultZone;
-            layer = defaultLayer;
-            reactor = defaultReactor;
-        }
-        else if (Regex.IsMatch(text, @"^[0-9]{2}[.][0-9]{1}[.]?[0-9]{0,1}"))
-        {
-            string[] segments = text.Split('.');
-            run = text;
-            title = text;
-            psn = defaultPSN;
-            rds = defaultRDS;
-            layer = segments[1];
-            reactor = segments[0];
-            employee = defaultEmployee;
-            if (segments.Length <= 2)
-                zone = defaultZone;
-            else
-                zone = segments[2];
-        }
-        else
-        {
-            // Remove illegal characters \/:*?"<>| found in the run.
-            title = Regex.Replace(text, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0];
-            if (title.Length > 2 && title[0] == '1' && (title[1] == 'T' || title[1] == 't'))
-                title = title.Substring(2);
-            run = title;
-            string[] segments = title.Split('-');
-            bool hasRDS = Regex.IsMatch(title, "[-]?[0-9]{5,}[-]?");
-            (reactor, rds) = GetReactorAndRDS(defaultReactor, defaultRDS, text, title, segments, hasRDS);
-            (layer, psn) = GetLayerAndPSN(defaultLayer, defaultPSN, segments, hasRDS);
-            zone = GetZone(segments);
-            employee = defaultEmployee;
-        }
-        result = new(employee, layer, psn, rds, reactor, run, title, zone);
-        return result;
-    }
-
-    private void Set(Logistics logistics, string receivedData)
-    {
-        string lot;
-        string psn;
-        string rds;
-        string run;
-        string temp;
-        string zone;
-        string layer;
-        string title;
-        DateTime date;
-        string recipe;
-        string dlRatio;
-        string equipId;
-        string reactor;
-        string employee;
-        string engineer;
-        string resistivitySpec;
-        ScanPast("RUN:");
-        title = GetToEOL();
-        ScanPast("Recipe:");
-        recipe = GetBefore("RESISTIVITY SPEC:");
-        if (string.IsNullOrEmpty(recipe))
-        {
-            _I = 0;
-            _Data = receivedData;
-            ScanPast("RUN:");
-            title = GetToEOL();
-            ScanPast("DEVICE:");
-            recipe = GetBefore("RESISTIVITY SPEC:");
-        }
-        title = title.Trim();
-        if (title[0] != '[' && title[title.Length - 1] != ']')
-            throw new Exception("Lot summary data is invalid or missing.");
-        title = title.Substring(1, title.Length - 2);
-        Descriptor descriptor = GetDescriptor(title);
-        psn = descriptor.PSN;
-        rds = descriptor.RDS;
-        run = descriptor.Run;
-        zone = descriptor.Zone;
-        layer = descriptor.Layer;
-        title = descriptor.Title;
-        reactor = descriptor.Reactor;
-        employee = descriptor.Employee;
-        resistivitySpec = GetToEOL();
-        ScanPast("EQUIP#:");
-        equipId = GetBefore("Engineer:");
-        // Remove illegal characters \/:*?"<>| found in the equipId.
-        equipId = Regex.Replace(equipId, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0];
-        engineer = GetToEOL();
-        ScanPast("LotID:");
-        lot = GetBefore("D.L.RATIO:");
-        dlRatio = GetToEOL();
-        ScanPast("OPERATOR:");
-        if (!string.IsNullOrEmpty(employee))
-            _ = GetBefore("TEMP:");
-        else
-            employee = GetBefore("TEMP:");
-        temp = GetToken();
-        string dateTimeText = GetToEOL();
-        date = GetDateTime(logistics, dateTimeText);
-        //create filename / unique id
-        string timeFormat = "yyyyMMddHHmmss";
-        _Log.Debug($"****ParseData - Title:{title}; EquipId:{equipId};");
-        if (string.IsNullOrEmpty(title))
-            throw new Exception("Batch (title) information does not exist");
-        Lot = lot;
-        PSN = psn;
-        RDS = rds;
-        Run = run;
-        Date = date;
-        Temp = temp;
-        Zone = zone;
-        Layer = layer;
-        Recipe = recipe;
-        DLRatio = dlRatio;
-        Reactor = reactor;
-        Employee = employee;
-        Engineer = engineer;
-        ResistivitySpec = resistivitySpec;
-        UniqueId = string.Concat(equipId, "_", title, "_", logistics.DateTimeFromSequence.ToString(timeFormat));
-    }
-
-    private void Parse(IFileRead fileRead, Logistics logistics, List<FileInfo> fileInfoCollection)
-    {
-        if (fileRead is null)
-        { }
-        // Convert the source file to UTF8Encoding format and then back to string for processing.  This convertion
-        // shall eliminate the special HEX characters such as 0x18 "CANCEL" and 0x20 "SPACE" captured via nPort.
-        string rawText = File.ReadAllText(logistics.ReportFullPath);
-        UTF8Encoding utf8Encoding = new();
-        byte[] bytes = utf8Encoding.GetBytes(rawText);
-        string convertedText = utf8Encoding.GetString(bytes);
-        // Replaces all control characters with a space, except for the TAB (0x09), LF (0x0A), CR (0x0D), and
-        // normal ASCII characters, which are valid characters for SharePoint.
-        string receivedData = Regex.Replace(convertedText, @"[^\u0009\u000A\u000D\u0020-\u007E]", " ");
-        string log = receivedData;
-        for (short i = 0; i < short.MaxValue; i++)
-        {
-            if (!log.Contains("   "))
-                break;
-            log = log.Replace("   ", "  ");
-        }
-        log = log.Replace("  ", "\t").Replace(": ", "\t").Replace(":\t", "\t");
-        IEnumerable<string> lines = from l in log.Split('\r') select l.Trim();
-        string logFile = Path.ChangeExtension(logistics.ReportFullPath, ".log");
-        File.WriteAllLines(logFile, lines);
-        fileInfoCollection.Add(new FileInfo(logFile));
-        //parse file
-        string h = string.Empty;
-        receivedData = receivedData.Replace("\r", "\n").Trim();
-        _I = 0;
-        _Data = string.Empty;
-        if (string.IsNullOrEmpty(receivedData))
-            throw new Exception("No data!");
-        Detail detail;
-        _I = 0;
-        _Data = receivedData;
-        Set(logistics, receivedData);
-        ScanPast("AutoOptimizeGain =");
-        AutoOptimizeGain = GetBefore("AutoProbeHeightSet =");
-        AutoProbeHeightSet = GetToEOL();
-        ScanPast("DataReject");
-        DataReject = GetToEOL();
-        _ = GetToEOL();
-        FileName = GetToEOL();
-        _ = GetToEOL();
-        _ = GetToEOL();
-        bool check = false;
-        while (!IsBlankLine())
-        {
-            detail = new Detail() { Pt = GetToken() };
-            if (detail.Pt.Contains("Avg"))
-                break;
-            else if (!detail.Pt.Contains(':'))
-            {
-                detail.R = GetToken();
-                detail.T = GetToken();
-                detail.Rs = GetToken();
-                detail.Merit = GetToken();
-                detail.UniqueId = string.Concat("_Point-", _Details.Count + 1);
-                _ = GetToEOL();
-                _Details.Add(detail);
-            }
-            else
-            {
-                check = true;
-                break;
-            }
-        }
-        _I = 0;
-        _Data = receivedData;
-        if (!check)
-        {
-            ScanPast("Avg =");
-            Avg = GetToken();
-            StdDev = GetToken();
-            ScanPast("SEMI Radial=");
-            SemiRadial = GetToEOL();
-        }
-        else
-        {
-            ScanPast("RsAv ");
-            Avg = GetBefore("+/-");
-            StdDev = GetToken();
-            _Log.Debug($"****ProcessData - RsAv StDev={StdDev}");
-            ScanPast("(Mx+Mn)");
-            SemiRadial = GetToken();
-            _Log.Debug($"****ProcessData - RsAv SemiRadial={SemiRadial}");
-            _ = GetToEOL();
-            int num = 0;
-            _ = GetBefore(": ");
-            for (string i = GetToken(); !string.IsNullOrEmpty(i); i = GetToken())
-            {
-                if (!i.Contains(':'))
-                {
-                    detail = new Detail();
-                    int num1 = num + 1;
-                    num = num1;
-                    _Log.Debug($"****ProcessData - RsAv Point={num1}");
-                    detail.Pt = num1.ToString();
-                    detail.Rs = i;
-                    detail.Merit = GetToken().Replace("|", "");
-                    detail.UniqueId = string.Concat("_Point-", _Details.Count + 1);
-                    _Details.Add(detail);
-                }
-            }
-        }
-        foreach (Detail item in _Details.Cast<Detail>())
-        {
-            item.HeaderUniqueId = UniqueId;
-            item.UniqueId = string.Concat(item, item.UniqueId);
-        }
-        fileInfoCollection.Add(logistics.FileInfo);
-    }
-
-#nullable enable
-
-    internal static List<Description> GetDescriptions(JsonElement[] jsonElements)
-    {
-        List<Description> results = new();
-        Description? description;
-        JsonSerializerOptions jsonSerializerOptions = new() { NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString };
-        foreach (JsonElement jsonElement in jsonElements)
-        {
-            if (jsonElement.ValueKind != JsonValueKind.Object)
-                throw new Exception();
-            description = JsonSerializer.Deserialize<Description>(jsonElement.ToString(), jsonSerializerOptions);
-            if (description is null)
-                continue;
-            results.Add(description);
-        }
-        return results;
-    }
-
-}

Adaptation/Infineon/Monitoring/MonA/MonIn.cs

@@ -18,21 +18,12 @@ public class MonIn : IMonIn, IDisposable
     public static MonIn GetInstance(string url = "http://moninhttp.{0}.infineon.com/input/text")
     {
         MonIn instance;
-        if (_Instances.ContainsKey(url))
+        lock (_Instances)
         {
-            instance = _Instances[url];
-        }
-        else
-        {
-            lock (_Instances)
+            if (_Instances.TryGetValue(url, out instance))
             {
-                if (!_Instances.ContainsKey(url))
-                {
-                    instance = new MonIn(url);
-                    _Instances.Add(url, instance);
-                }
-                else
-                    instance = _Instances[url];
+                instance = new MonIn(url);
+                _Instances.Add(url, instance);
             }
         }
         return instance;

Adaptation/MET08RESIMAPCDE-Development.yml

@@ -1,179 +1 @@
-trigger:
-  branches:
-    include:
-      - development
-  paths:
-    include:
-      - "Adaptation/*"
-
-pool:
-  name: Mesa-Windows-Service
-  demands: MET08RESIMAPCDE-Development
-
-steps:
-  - script: |
-      set coreVersion=net6.0
-      echo %coreVersion%
-      echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion%
-      echo $(CoreVersion)
-    displayName: CoreVersion
-
-  - script: |
-      set configuration=Debug
-      echo %configuration%
-      echo ##vso[task.setvariable variable=Configuration;]%configuration%
-      echo ($Configuration)
-    displayName: Configuration
-
-  - script: |
-      set nugetSource=https://messa017.infineon.com/v3/index.json
-      echo %nugetSource%
-      echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
-      echo $(NugetSource)
-    displayName: NugetSource
-
-  - script: |
-      set gitCommit=$(Build.SourceVersion)
-      set gitCommitSeven=%gitCommit:~0,7%
-      echo %gitCommitSeven%
-      echo ##vso[task.setvariable variable=GitCommitSeven;]%gitCommitSeven%
-      echo $(GitCommitSeven)
-    displayName: GitCommitSeven
-
-  - script: |
-      echo $(Build.BuildId)
-      echo $(Build.Reason)
-      echo $(Build.Repository.Id)
-      echo $(Build.Repository.Name)
-      echo $(Build.SourceVersion)
-      echo $(CoreVersion)
-      echo $(Configuration)
-      echo $(NugetSource)
-      echo $(GitCommitSeven)
-      REM echo $(pipelinePassword)
-    displayName: "Echo Check"
-
-  - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
-    displayName: "Nuget Clear"
-    enabled: false
-
-  - script: |
-      "C:\program files\dotnet\dotnet.exe" user-secrets init
-      "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)"
-      "C:\program files\dotnet\dotnet.exe" user-secrets set "GitCommitSeven" "$(GitCommitSeven)"
-      "C:\program files\dotnet\dotnet.exe" user-secrets list
-    workingDirectory: Adaptation
-    displayName: "Safe storage of app secrets - Adaptation"
-
-  - task: CopyFiles@2
-    displayName: "Copy Files to: - GhostPCL"
-    inputs:
-      SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64'
-      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
-      OverWrite: true
-    enabled: false
-
-  - task: CopyFiles@2
-    displayName: "Copy Files to: - LincPDFC"
-    inputs:
-      SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC\v2.6.6.21'
-      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
-      OverWrite: true
-    enabled: false
-
-  - task: CopyFiles@2
-    displayName: "Copy Files to: - PDF-Text-Stripper"
-    inputs:
-      SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\PDF-Text-Stripper\v4.8.0.1'
-      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
-      OverWrite: true
-    enabled: false
-
-  - 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"
-    continueOnError: true
-
-  - script: "dotnet test --configuration $(Configuration)"
-    workingDirectory: Adaptation
-    displayName: "Core Test"
-
-  - script: 'move /y "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)/05_TestResults/TestResults" $(System.DefaultWorkingDirectory)'
-    displayName: "Move Results"
-
-  - script: '"C:\program files\dotnet\dotnet.exe" tool restore'
-    workingDirectory: Adaptation
-    displayName: "Tool Restore"
-    enabled: false
-
-  - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:$(System.DefaultWorkingDirectory)/TestResults/**/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark'
-    workingDirectory: Adaptation
-    displayName: "Report Generator"
-    enabled: false
-
-  - task: PublishTestResults@2
-    displayName: "Publish Test Results **/*.trx"
-    inputs:
-      testResultsFormat: VSTest
-      testResultsFiles: "**/*.trx"
-      testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
-      searchFolder: "$(System.DefaultWorkingDirectory)"
-
-  - task: mspremier.CreateWorkItem.CreateWorkItem-task.CreateWorkItem@1
-    displayName: "Create work item"
-    inputs:
-      teamProject: "Mesa_FI"
-      workItemType: Bug
-      title: $(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)
-      assignedTo: "$(Build.RequestedForId)"
-    enabled: false
-
-  - script: '"C:\program files\dotnet\dotnet.exe" publish --configuration $(Configuration) --runtime win-x64 --self-contained -o $(Build.ArtifactStagingDirectory)\Adaptation --source $(NugetSource)'
-    workingDirectory: Adaptation
-    displayName: "Core Publish"
-    enabled: false
-
-  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8 /p:RestoreSources=$(NugetSource)'
-    displayName: "MSBuild Restore"
-
-  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8'
-    displayName: MSBuild
-
-  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)-$(Build.Repository.Name)>bin\$(Configuration)\$(Build.Repository.Name).txt'
-    displayName: "Commit Id"
-
-  - task: CopyFiles@2
-    displayName: 'Copy Files to: D:\Framework4.8'
-    inputs:
-      SourceFolder: 'bin\$(Configuration)'
-      Contents: "*$(Build.Repository.Name)*"
-      TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)'
-      OverWrite: true
-    enabled: false
-
-  - task: CopyFiles@2
-    displayName: 'Copy Files to: \\messv02ecc1.ec.local\EC_EAFRepository'
-    inputs:
-      SourceFolder: 'bin\$(Configuration)'
-      Contents: "*$(Build.Repository.Name)*"
-      TargetFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)'
-      OverWrite: true
-    enabled: false
-
-  - script: |
-      "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
-    workingDirectory: Adaptation
-    displayName: "Core Clean - Tests"
-
-  - script: |
-      "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
-    workingDirectory: Adaptation
-    displayName: "Core Clean - Adaptation"
-
-  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
-    displayName: "Force Fail"
-    enabled: false
+# dotnet nuget push --source https://tfs.intra.infineon.com/tfs/FactoryIntegration/fccf8303-9cf7-4788-a9e0-4042541503fa/_packaging/EAF-Mesa-Integration/nuget/v3/index.json --api-key az D:\vsts-agent-win-x64-2.210.1-eaf\nuget\infineon.mesa.pdf.text.stripper.4.8.0.1.nupkg

Adaptation/MET08RESIMAPCDE.Tests.csproj

@@ -8,10 +8,9 @@
     <PropertyGroup>
         <ImplicitUsings>disable</ImplicitUsings>
         <IsPackable>false</IsPackable>
-        <LangVersion>10.0</LangVersion>
         <Nullable>disable</Nullable>
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
     <PropertyGroup>
         <VSTestLogger>trx</VSTestLogger>
@@ -33,8 +32,11 @@
         <DefineConstants>Linux</DefineConstants>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="3.2.0" />
-        <PackageReference Include="FFMpegCore" Version="5.0.2" />
+        <RuntimeHostConfigurationOption Include="AssemblyName" Value="MET08RESIMAPCDE" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="6.0.3" />
+        <PackageReference Include="FFMpegCore" Version="5.1.0" />
         <PackageReference Include="IKVM.AWT.WinForms" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="IKVM.OpenJDK.Core" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="IKVM.OpenJDK.Media" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
@@ -42,42 +44,40 @@
         <PackageReference Include="IKVM.OpenJDK.Util" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="IKVM.OpenJDK.XML.API" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="IKVM.Runtime" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="Instances" Version="3.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.3" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.json" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-        <PackageReference Include="Microsoft.Win32.SystemEvents" Version="7.0.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+        <PackageReference Include="Instances" Version="3.0.1" />
+        <PackageReference Include="log4net" Version="3.0.3"></PackageReference>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.json" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Microsoft.Win32.SystemEvents" Version="9.0.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
         <PackageReference Include="Pdfbox" Version="1.1.1"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="RoboSharp" Version="1.2.8" />
-        <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
-        <PackageReference Include="System.Data.OleDb" Version="7.0.0" />
-        <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-        <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
-        <PackageReference Include="System.Text.Json" Version="7.0.2" />
+        <PackageReference Include="RoboSharp" Version="1.6.0" />
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
+        <PackageReference Include="System.Data.OleDb" Version="9.0.0" />
+        <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+        <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Infineon.Mesa.PDF.Text.Stripper" Version="4.8.0.2"><NoWarn>NU1701</NoWarn></PackageReference>
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Infineon.Yoda.DotNetCore" Version="5.4.3" />
+        <PackageReference Include="Tibco.Rendezvous.DotNetCore" Version="8.5.0" />
+    </ItemGroup>
+    <ItemGroup>
         <PackageReference Include="Tesseract" Version="5.2.0" />
     </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Tibco.Rendezvous" Version="8.5.0" />
-        <PackageReference Include="Infineon.Yoda" Version="5.4.1" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Infineon.Mesa.PDF.Text.Stripper" Version="4.8.0.1"><NoWarn>NU1701</NoWarn></PackageReference>
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="External.Common.Logging.Core" Version="3.3.1"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="External.Common.Logging" Version="3.3.1"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="External.log4net" Version="2.0.8"><NoWarn>NU1701</NoWarn></PackageReference>
-    </ItemGroup>
     <ItemGroup>
         <None Include="appsettings.json">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>

Adaptation/MET08RESIMAPCDE.yml

@@ -1,3 +1,9 @@
+# D:
+# cd D:\EAF-Mesa-Integration
+# config --url https://tfs.intra.infineon.com/tfs/FactoryIntegration --pool "EAF Mesa Integration" --agent mestsa003-meseafsvc --work _work --runAsService --auth negotiate --userName infineon\phares
+# D:
+# cd D:\EAF-Mesa-Integration
+# config --url https://tfs.intra.infineon.com/tfs/FactoryIntegration --pool "EAF Mesa Integration" --agent mestsa07ec-ecmeseaf --work _work --runAsService --auth negotiate --userName infineon\phares
 trigger:
   branches:
     include:
@@ -6,169 +12,273 @@ trigger:
     include:
       - "Adaptation/*"
 
-pool:
-  name: Mesa-Windows-Service
-  demands: MET08RESIMAPCDE
+stages:
+  - stage: DevServer
+    displayName: DevServer
 
-steps:
-  - script: |
-      set coreVersion=net6.0
-      echo %coreVersion%
-      echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion%
-      echo $(CoreVersion)
-    displayName: CoreVersion
+    pool:
+      name: EAF Mesa Integration
+      demands: MET08RESIMAPCDE-Development
 
-  - script: |
-      set configuration=Release
-      echo %configuration%
-      echo ##vso[task.setvariable variable=Configuration;]%configuration%
-      echo ($Configuration)
-    displayName: Configuration
+    variables:
+      coreVersion: "net8.0"
+      nugetSource: "https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/"
 
-  - script: |
-      set nugetSource=https://messa08ec.ec.local/v3/index.json
-      echo %nugetSource%
-      echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
-      echo $(NugetSource)
-    displayName: NugetSource
+    jobs:
+      - job: SetupEnvironment
+        steps:
+          - script: |
+              echo $(Build.BuildId)
+              echo $(Build.Reason)
+              echo $(Build.Repository.Id)
+              echo $(Build.Repository.Name)
+              echo $(Build.SourceVersion)
+              echo $(CoreVersion)
+              echo $(NugetSource)
+            displayName: "Echo Check"
 
-  - script: |
-      set gitCommit=$(Build.SourceVersion)
-      set gitCommitSeven=%gitCommit:~0,7%
-      echo %gitCommitSeven%
-      echo ##vso[task.setvariable variable=GitCommitSeven;]%gitCommitSeven%
-      echo $(GitCommitSeven)
-    displayName: GitCommitSeven
+          - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
+            displayName: "Nuget Clear"
+            enabled: false
 
-  - script: |
-      echo $(Build.BuildId)
-      echo $(Build.Reason)
-      echo $(Build.Repository.Id)
-      echo $(Build.Repository.Name)
-      echo $(Build.SourceVersion)
-      echo $(CoreVersion)
-      echo $(Configuration)
-      echo $(NugetSource)
-      echo $(GitCommitSeven)
-      REM echo $(pipelinePassword)
-    displayName: "Echo Check"
+          - script: |
+              "C:\program files\dotnet\dotnet.exe" user-secrets init
+              "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)"
+              "C:\program files\dotnet\dotnet.exe" user-secrets set "GitCommit" "$(Build.SourceVersion)"
+              "C:\program files\dotnet\dotnet.exe" user-secrets list
+            workingDirectory: Adaptation
+            displayName: "Safe storage of app secrets - Adaptation"
 
-  - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
-    displayName: "Nuget Clear"
-    enabled: false
+      - job: BuildDebug
+        dependsOn:
+          - SetupEnvironment
+        steps:
+          - script: |
+              set configuration=Debug
+              echo %configuration%
+              echo ##vso[task.setvariable variable=Configuration;]%configuration%
+              echo $(Configuration)
+            displayName: Configuration
 
-  - script: |
-      "C:\program files\dotnet\dotnet.exe" user-secrets init
-      "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)"
-      "C:\program files\dotnet\dotnet.exe" user-secrets set "GitCommitSeven" "$(GitCommitSeven)"
-      "C:\program files\dotnet\dotnet.exe" user-secrets list
-    workingDirectory: Adaptation
-    displayName: "Safe storage of app secrets - Adaptation"
+          - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
+            workingDirectory: Adaptation
+            displayName: "Core Build - Adaptation"
 
-  - task: CopyFiles@2
-    displayName: "Copy Files to: - GhostPCL"
-    inputs:
-      SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64'
-      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
-      OverWrite: true
+      - job: BuildRelease
+        dependsOn:
+          - SetupEnvironment
+        steps:
+          - script: |
+              set configuration=Release
+              echo %configuration%
+              echo ##vso[task.setvariable variable=Configuration;]%configuration%
+              echo $(Configuration)
+            displayName: Configuration
 
-  - task: CopyFiles@2
-    displayName: "Copy Files to: - LincPDFC"
-    inputs:
-      SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC\v2.6.6.21'
-      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
-      OverWrite: true
+          - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8 /p:RestoreSources=$(NugetSource)'
+            displayName: "MSBuild Restore"
 
-  - task: CopyFiles@2
-    displayName: "Copy Files to: - PDF-Text-Stripper"
-    inputs:
-      SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\PDF-Text-Stripper\v4.8.0.1'
-      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
-      OverWrite: true
+          - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8'
+            displayName: MSBuild
 
-  - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
-    workingDirectory: Adaptation
-    displayName: "Core Build - Adaptation"
+          - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8'
+            displayName: MSBuild
 
-  - powershell: Get-ChildItem .\ -include TestResults -Recurse | foreach ($_) { remove-item $_.fullname -Force -Recurse }
-    workingDirectory: "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)"
-    displayName: "PowerShell Script"
-    continueOnError: true
+          - script: 'echo $(Build.Repository.Name)-$(Build.BuildId)-$(Build.SourceVersion)>bin\$(Configuration)\$(Build.Repository.Name).txt'
+            displayName: "Commit Id"
 
-  - script: "dotnet test --configuration $(Configuration)"
-    workingDirectory: Adaptation
-    displayName: "Core Test"
+          - task: CopyFiles@2
+            displayName: 'Copy Files to: D:\EAF'
+            inputs:
+              Contents: "*$(Build.Repository.Name)*"
+              SourceFolder: 'bin\$(Configuration)'
+              TargetFolder: 'D:\EAF\EAF Deployment Storage\Adaptation_$(Build.Repository.Name)'
+              OverWrite: true
+            enabled: true
 
-  - script: 'move /y "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)/05_TestResults/TestResults" $(System.DefaultWorkingDirectory)'
-    displayName: "Move Results"
+      - job: TestDebug
+        dependsOn:
+          - SetupEnvironment
+          - BuildDebug
+          - BuildRelease
+        steps:
+          - script: |
+              set configuration=Debug
+              echo %configuration%
+              echo ##vso[task.setvariable variable=Configuration;]%configuration%
+              echo $(Configuration)
+            displayName: Configuration
 
-  - script: '"C:\program files\dotnet\dotnet.exe" tool restore'
-    workingDirectory: Adaptation
-    displayName: "Tool Restore"
-    enabled: false
+          - powershell: Get-ChildItem .\ -include TestResults -Recurse | foreach ($_) { remove-item $_.fullname -Force -Recurse }
+            workingDirectory: "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)"
+            displayName: "PowerShell Script"
+            continueOnError: true
 
-  - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:$(System.DefaultWorkingDirectory)/TestResults/**/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark'
-    workingDirectory: Adaptation
-    displayName: "Report Generator"
-    enabled: false
+          - script: "dotnet test --configuration $(Configuration)"
+            workingDirectory: Adaptation
+            displayName: "Core Test"
 
-  - task: PublishTestResults@2
-    displayName: "Publish Test Results **/*.trx"
-    inputs:
-      testResultsFormat: VSTest
-      testResultsFiles: "**/*.trx"
-      testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
-      searchFolder: "$(System.DefaultWorkingDirectory)"
+          - script: 'move /y "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)/05_TestResults/TestResults" $(System.DefaultWorkingDirectory)'
+            displayName: "Move Results"
 
-  - task: mspremier.CreateWorkItem.CreateWorkItem-task.CreateWorkItem@1
-    displayName: "Create work item"
-    inputs:
-      teamProject: "Mesa_FI"
-      workItemType: Bug
-      title: $(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)
-      assignedTo: "$(Build.RequestedForId)"
-    enabled: false
+          - script: '"C:\program files\dotnet\dotnet.exe" tool restore'
+            workingDirectory: Adaptation
+            displayName: "Tool Restore"
+            enabled: false
 
-  - script: '"C:\program files\dotnet\dotnet.exe" publish --configuration $(Configuration) --runtime win-x64 --self-contained -o $(Build.ArtifactStagingDirectory)\Adaptation --source $(NugetSource)'
-    workingDirectory: Adaptation
-    displayName: "Core Publish"
-    enabled: false
+          - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:$(System.DefaultWorkingDirectory)/TestResults/**/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark'
+            workingDirectory: Adaptation
+            displayName: "Report Generator"
+            enabled: false
 
-  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8 /p:RestoreSources=$(NugetSource)'
-    displayName: "MSBuild Restore"
+          - task: PublishTestResults@2
+            displayName: "Publish Test Results **/*.trx"
+            inputs:
+              testResultsFormat: VSTest
+              testResultsFiles: "**/*.trx"
+              testRunTitle: "$(Build.BuildId)-$(Build.SourceVersion)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
+              searchFolder: "$(System.DefaultWorkingDirectory)/TestResults"
 
-  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8'
-    displayName: MSBuild
+          - task: PublishTestResults@2
+            displayName: "Publish Test Results */coverage.cobertura.xml"
+            inputs:
+              testResultsFormat: VSTest
+              testResultsFiles: "*/coverage.cobertura.xml"
+              testRunTitle: "$(Build.BuildId)-$(Build.SourceVersion)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
+              searchFolder: "$(System.DefaultWorkingDirectory)/TestResults"
 
-  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)-$(Build.Repository.Name)>bin\$(Configuration)\$(Build.Repository.Name).txt'
-    displayName: "Commit Id"
+          - script: |
+              "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
+            workingDirectory: Adaptation
+            displayName: "Core Clean - Adaptation"
 
-  - task: CopyFiles@2
-    displayName: 'Copy Files to: D:\Framework4.8'
-    inputs:
-      SourceFolder: 'bin\$(Configuration)'
-      Contents: "*$(Build.Repository.Name)*"
-      TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)'
-      OverWrite: true
+          - script: 'echo $(Build.BuildId)-$(Build.SourceVersion)-bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
+            displayName: "Force Fail"
+            enabled: false
 
-  - task: CopyFiles@2
-    displayName: 'Copy Files to: \\messv02ecc1.ec.local\EC_EAFRepository'
-    inputs:
-      SourceFolder: 'bin\$(Configuration)'
-      Contents: "*$(Build.Repository.Name)*"
-      TargetFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)'
-      OverWrite: true
+  - stage: ProductionServer
+    displayName: ProductionServer
 
-  - script: |
-      "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
-    workingDirectory: Adaptation
-    displayName: "Core Clean - Tests"
+    pool:
+      name: EAF Mesa Integration
+      demands: MET08RESIMAPCDE
 
-  - script: |
-      "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
-    workingDirectory: Adaptation
-    displayName: "Core Clean - Adaptation"
+    variables:
+      coreVersion: "net8.0"
+      nugetSource: "https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/"
 
-  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
-    displayName: "Force Fail"
-    enabled: false
+    jobs:
+      - job: SetupEnvironment
+        steps:
+          - script: |
+              echo $(Build.BuildId)
+              echo $(Build.Reason)
+              echo $(Build.Repository.Id)
+              echo $(Build.Repository.Name)
+              echo $(Build.SourceVersion)
+              echo $(CoreVersion)
+              echo $(NugetSource)
+            displayName: "Echo Check"
+
+          - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
+            displayName: "Nuget Clear"
+            enabled: false
+
+          - script: |
+              "C:\program files\dotnet\dotnet.exe" user-secrets init
+              "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)"
+              "C:\program files\dotnet\dotnet.exe" user-secrets set "GitCommit" "$(Build.SourceVersion)"
+              "C:\program files\dotnet\dotnet.exe" user-secrets list
+            workingDirectory: Adaptation
+            displayName: "Safe storage of app secrets - Adaptation"
+
+      - job: BuildRelease
+        dependsOn:
+          - SetupEnvironment
+        steps:
+          - script: |
+              set configuration=Release
+              echo %configuration%
+              echo ##vso[task.setvariable variable=Configuration;]%configuration%
+              echo $(Configuration)
+            displayName: Configuration
+
+          - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8 /p:RestoreSources=$(NugetSource)'
+            displayName: "MSBuild Restore"
+
+          - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8'
+            displayName: MSBuild
+
+          - script: 'echo $(Build.Repository.Name)-$(Build.BuildId)-$(Build.SourceVersion)>bin\$(Configuration)\$(Build.Repository.Name).txt'
+            displayName: "Commit Id"
+
+          - task: CopyFiles@2
+            displayName: 'Copy Files to: D:\EAF'
+            inputs:
+              Contents: "*$(Build.Repository.Name)*"
+              SourceFolder: 'bin\$(Configuration)'
+              TargetFolder: 'D:\EAF\EAF Deployment Storage\Adaptation_$(Build.Repository.Name)'
+              OverWrite: true
+
+          - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
+            workingDirectory: Adaptation
+            displayName: "Core Build - Adaptation"
+
+      - job: TestRelease
+        dependsOn:
+          - SetupEnvironment
+          - BuildRelease
+        steps:
+          - script: |
+              set configuration=Release
+              echo %configuration%
+              echo ##vso[task.setvariable variable=Configuration;]%configuration%
+              echo $(Configuration)
+            displayName: Configuration
+
+          - powershell: Get-ChildItem .\ -include TestResults -Recurse | foreach ($_) { remove-item $_.fullname -Force -Recurse }
+            workingDirectory: "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)"
+            displayName: "PowerShell Script"
+            continueOnError: true
+
+          - script: "dotnet test --configuration $(Configuration)"
+            workingDirectory: Adaptation
+            displayName: "Core Test"
+
+          - script: 'move /y "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)/05_TestResults/TestResults" $(System.DefaultWorkingDirectory)'
+            displayName: "Move Results"
+
+          - script: '"C:\program files\dotnet\dotnet.exe" tool restore'
+            workingDirectory: Adaptation
+            displayName: "Tool Restore"
+            enabled: false
+
+          - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:$(System.DefaultWorkingDirectory)/TestResults/**/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark'
+            workingDirectory: Adaptation
+            displayName: "Report Generator"
+            enabled: false
+
+          - task: PublishTestResults@2
+            displayName: "Publish Test Results **/*.trx"
+            inputs:
+              testResultsFormat: VSTest
+              testResultsFiles: "**/*.trx"
+              testRunTitle: "$(Build.BuildId)-$(Build.SourceVersion)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
+              searchFolder: "$(System.DefaultWorkingDirectory)/TestResults"
+
+          - task: PublishTestResults@2
+            displayName: "Publish Test Results */coverage.cobertura.xml"
+            inputs:
+              testResultsFormat: VSTest
+              testResultsFiles: "*/coverage.cobertura.xml"
+              testRunTitle: "$(Build.BuildId)-$(Build.SourceVersion)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
+              searchFolder: "$(System.DefaultWorkingDirectory)/TestResults"
+
+          - script: |
+              "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
+            workingDirectory: Adaptation
+            displayName: "Core Clean - Adaptation"
+
+          - script: 'echo $(Build.BuildId)-$(Build.SourceVersion)-bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
+            displayName: "Force Fail"
+            enabled: true

Adaptation/Shared/Duplicator/Description.cs

@@ -110,6 +110,42 @@ public class Description : IDescription, Properties.IDescription
     List<IDescription> IDescription.GetDescriptions(IFileRead fileRead, Logistics logistics, List<Test> tests, IProcessData iProcessData)
     {
         List<IDescription> results = new();
+        if (iProcessData is null || iProcessData.Details.Count == 0)
+            results.Add(GetDefault(fileRead, logistics));
+        else
+        {
+            string nullData;
+            Description description;
+            object configDataNullData = fileRead.NullData;
+            if (configDataNullData is null)
+                nullData = string.Empty;
+            else
+                nullData = configDataNullData.ToString();
+            for (int i = 0; i < iProcessData.Details.Count; i++)
+            {
+                if (iProcessData.Details[i] is null)
+                    continue;
+                description = new Description
+                {
+                    Test = (int)tests[i],
+                    Count = tests.Count,
+                    Index = i,
+                    //
+                    EventName = fileRead.EventName,
+                    NullData = nullData,
+                    JobID = fileRead.CellInstanceName,
+                    Sequence = logistics.Sequence.ToString(),
+                    MesEntity = logistics.MesEntity,
+                    ReportFullPath = logistics.ReportFullPath,
+                    ProcessJobID = logistics.ProcessJobID,
+                    MID = logistics.MID,
+                    //
+                    Date = DateTime.Now.ToString(GetDateFormat()),
+                    RDS = string.Empty,
+                };
+                results.Add(description);
+            }
+        }
         return results;
     }
 

Adaptation/Shared/FileRead.cs

@@ -44,9 +44,9 @@ public class FileRead : Properties.IFileRead
     protected readonly string _CellInstanceConnectionNameBase;
     protected readonly Dictionary<string, List<long>> _DummyRuns;
     protected readonly Dictionary<string, string> _FileParameter;
-    protected readonly Dictionary<long, List<string>> _StaticRuns;
     protected readonly string _ParameterizedModelObjectDefinitionType;
     protected readonly FileConnectorConfiguration _FileConnectorConfiguration;
+    protected readonly Dictionary<long, List<Metrology.WS.Results>> _StaticRuns;
     protected readonly IList<ModelObjectParameterDefinition> _ModelObjectParameterDefinitions;
 
     bool Properties.IFileRead.IsEvent => _IsEvent;
@@ -63,216 +63,21 @@ public class FileRead : Properties.IFileRead
     string Properties.IFileRead.CellInstanceConnectionName => _CellInstanceConnectionName;
     string Properties.IFileRead.ParameterizedModelObjectDefinitionType => _ParameterizedModelObjectDefinitionType;
 
-    public FileRead(IDescription description, bool isEvent, ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted)
-    {
-        _SMTP = smtp;
-        _IsEvent = isEvent;
-        _DummyRuns = dummyRuns;
-        _LastTicksDuration = 0;
-        _StaticRuns = staticRuns;
-        _IsEAFHosted = isEAFHosted;
-        _Description = description;
-        _FileParameter = fileParameter;
-        _ReportFullPath = string.Empty;
-        _CellInstanceName = cellInstanceName;
-        _Calendar = new CultureInfo("en-US").Calendar;
-        _Log = LogManager.GetLogger(typeof(FileRead));
-        _UseCyclicalForDescription = useCyclicalForDescription;
-        _CellInstanceConnectionName = cellInstanceConnectionName;
-        _ModelObjectParameterDefinitions = modelObjectParameters;
-        _FileConnectorConfiguration = fileConnectorConfiguration;
-        _ParameterizedModelObjectDefinitionType = parameterizedModelObjectDefinitionType;
-        _IsSourceTimer = fileConnectorConfiguration.SourceFileFilter.StartsWith("*Timer.txt");
-        string cellInstanceConnectionNameBase = cellInstanceConnectionName.Replace("-", string.Empty);
-        _Hyphens = cellInstanceConnectionName.Length - cellInstanceConnectionNameBase.Length;
-        _TracePath = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Path.Trace");
-        _ExceptionSubject = string.Concat("Exception:", _CellInstanceConnectionName, _FileConnectorConfiguration?.SourceDirectoryCloaking);
-        string suffix;
-        string[] segments = _ParameterizedModelObjectDefinitionType.Split('.');
-        string @namespace = segments[0];
-        string eventNameFileRead = "FileRead";
-        string eventName = segments[segments.Length - 1];
-        bool isDuplicator = segments[0] == cellInstanceName;
-        _IsDuplicator = isDuplicator;
-        _CellInstanceConnectionNameBase = cellInstanceConnectionNameBase;
-        if (eventName == eventNameFileRead)
-            suffix = string.Empty;
-        else
-            suffix = string.Concat('_', eventName.Split(new string[] { eventNameFileRead }, StringSplitOptions.RemoveEmptyEntries)[1]);
-        string parameterizedModelObjectDefinitionTypeAppended = string.Concat(@namespace, suffix);
-        if (!isEAFHosted)
-        {
-            if (string.IsNullOrEmpty(equipmentTypeName) || equipmentTypeName != parameterizedModelObjectDefinitionTypeAppended)
-                throw new Exception(cellInstanceConnectionName);
-            if (string.IsNullOrEmpty(equipmentDictionaryName) && isEvent)
-                throw new Exception(cellInstanceConnectionName);
-            if (!string.IsNullOrEmpty(equipmentDictionaryName) && !isEvent)
-                throw new Exception(cellInstanceConnectionName);
-            // if (string.IsNullOrEmpty(equipmentDictionaryName) && !isEvent)
-            //     throw new Exception(cellInstanceConnectionName);
-            // if (!string.IsNullOrEmpty(equipmentDictionaryName) && isEvent)
-            //     throw new Exception(cellInstanceConnectionName);
-        }
-        if (isDuplicator)
-            _MesEntity = string.Empty;
-        else
-            _MesEntity = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, string.Concat("CellInstance.", cellInstanceName, ".Alias"));
-        _EventName = eventName;
-        _EventNameFileRead = eventNameFileRead;
-        _EquipmentType = parameterizedModelObjectDefinitionTypeAppended;
-        long breakAfterSeconds;
-        if (_FileConnectorConfiguration is null)
-            breakAfterSeconds = 360;
-        else
-        {
-            if (_FileConnectorConfiguration.FileScanningOption == FileConnectorConfiguration.FileScanningOptionEnum.TimeBased)
-                breakAfterSeconds = Math.Abs(_FileConnectorConfiguration.FileHandleTimeout.Value);
-            else if (_FileConnectorConfiguration.FileScanningOption == FileConnectorConfiguration.FileScanningOptionEnum.FileWatcher)
-                breakAfterSeconds = Math.Abs(_FileConnectorConfiguration.FileScanningIntervalInSeconds.Value);
-            else
-                throw new Exception();
-        }
-        _BreakAfterSeconds = breakAfterSeconds;
-        UpdateLastTicksDuration(breakAfterSeconds * 10000000);
-        if (_IsDuplicator)
-        {
-            if (string.IsNullOrEmpty(_FileConnectorConfiguration.TargetFileLocation) || string.IsNullOrEmpty(_FileConnectorConfiguration.ErrorTargetFileLocation))
-                throw new Exception("_Configuration is empty?");
-            if (_FileConnectorConfiguration.TargetFileLocation.Contains('%') || _FileConnectorConfiguration.ErrorTargetFileLocation.Contains('%'))
-                throw new Exception("_Configuration is incorrect for a duplicator!");
-            // if (_FileConnectorConfiguration is not null)
-            // {
-            //     if (string.IsNullOrEmpty(_FileConnectorConfiguration.SourceDirectoryCloaking))
-            //         throw new Exception("SourceDirectoryCloaking is empty?");
-            //     if (!_FileConnectorConfiguration.SourceDirectoryCloaking.StartsWith("~"))
-            //         throw new Exception("SourceDirectoryCloaking is incorrect for a duplicator!");
-            // }
-        }
-    }
-
-    protected static string GetPropertyValue(string cellInstanceConnectionName, IList<ModelObjectParameterDefinition> modelObjectParameters, string propertyName)
-    {
-        string result;
-        List<string> results = (from l in modelObjectParameters where l.Name == propertyName select l.Value).ToList();
-        if (results.Count != 1)
-            throw new Exception(cellInstanceConnectionName);
-        result = results[0];
-        return result;
-    }
-
-    protected static ModelObjectParameterDefinition[] GetProperties(string cellInstanceConnectionName, IList<ModelObjectParameterDefinition> modelObjectParameters, string propertyNamePrefix)
-    {
-        ModelObjectParameterDefinition[] results = (from l in modelObjectParameters where l.Name.StartsWith(propertyNamePrefix) select l).ToArray();
-        if (!results.Any())
-            throw new Exception(cellInstanceConnectionName);
-        return results;
-    }
-
-    protected static ModelObjectParameterDefinition[] GetProperties(string cellInstanceConnectionName, IList<ModelObjectParameterDefinition> modelObjectParameters, string propertyNamePrefix, string propertyNameSuffix)
-    {
-        ModelObjectParameterDefinition[] results = (from l in modelObjectParameters where l.Name.StartsWith(propertyNamePrefix) && l.Name.EndsWith(propertyNameSuffix) select l).ToArray();
-        if (!results.Any())
-            throw new Exception(cellInstanceConnectionName);
-        return results;
-    }
-
-    protected void UpdateLastTicksDuration(long ticksDuration)
-    {
-        if (ticksDuration < 50000000)
-            ticksDuration = 50000000;
-        _LastTicksDuration = (long)Math.Ceiling(ticksDuration * .667);
-        _Log.Info($"{new TimeSpan(ticksDuration).TotalMilliseconds} TotalMillisecond(s) to process{Environment.NewLine}{_CellInstanceConnectionName}{Environment.NewLine}<{_ReportFullPath}>");
-    }
-
-    protected void WaitForThread(Thread thread, List<Exception> threadExceptions)
-    {
-        if (thread is not null)
-        {
-            ThreadState threadState;
-            for (short i = 0; i < short.MaxValue; i++)
-            {
-                if (thread is null)
-                    break;
-                else
-                {
-                    threadState = thread.ThreadState;
-                    if (threadState is not ThreadState.Running and not ThreadState.WaitSleepJoin)
-                        break;
-                }
-                Thread.Sleep(500);
-            }
-            lock (threadExceptions)
-            {
-                if (threadExceptions.Any())
-                {
-                    foreach (Exception item in threadExceptions)
-                        _Log.Error(string.Concat(item.Message, Environment.NewLine, Environment.NewLine, item.StackTrace));
-                    Exception exception = threadExceptions[0];
-                    threadExceptions.Clear();
-                    throw exception;
-                }
-            }
-        }
-    }
-
-    private void WriteAllLines(string to, string[] exceptionLines)
-    {
-        string fileName = string.Concat(to, @"\readme.txt");
-        try
-        {
-            if (!Directory.Exists(to))
-                _ = Directory.CreateDirectory(to);
-            File.WriteAllLines(fileName, exceptionLines);
-        }
-        catch (Exception ex) { _Log.Error(ex.Message); }
-    }
-
-    protected string[] Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, string to, string from, string resolvedFileLocation, Exception exception)
-    {
-        string[] results;
-        bool isErrorFile = exception is not null;
-        if (!to.EndsWith(@"\"))
-            _ = string.Concat(to, @"\");
-        if (!isErrorFile)
-            results = Array.Empty<string>();
-        else
-        {
-            results = new string[] { _Logistics.Sequence.ToString(), _Logistics.ReportFullPath, from, resolvedFileLocation, to, string.Empty, string.Empty, exception.Message, string.Empty, string.Empty, exception.StackTrace };
-            if (!_IsDuplicator)
-                WriteAllLines(to, results);
-        }
-        if (extractResults is not null && extractResults.Item4 is not null && extractResults.Item4.Any())
-        {
-            string itemFile;
-            List<string> directories = new();
-            foreach (FileInfo sourceFile in extractResults.Item4)
-            {
-                if (sourceFile.FullName != _Logistics.ReportFullPath)
-                {
-                    itemFile = sourceFile.FullName.Replace(from, to);
-                    Shared1880(itemFile, directories, sourceFile, isErrorFile);
-                }
-                else if (!isErrorFile && _Logistics is not null)
-                    Shared1811(to, sourceFile);
-            }
-            Shared0231(directories);
-        }
-        return results;
-    }
-
-    protected static string GetTupleFile<T>(Logistics logistics, List<T> descriptions, Properties.IScopeInfo scopeInfo, string duplicateDirectory) where T : Properties.IDescription
+    protected static string GetTupleFile<T>(Logistics logistics, List<T> descriptions, Properties.IScopeInfo scopeInfo, string duplicateDirectory, string duplicateFile) where T : Properties.IDescription
     {
         string result;
         string rds;
+        string fileName;
         string dateValue;
         string rdsPlaceholder = "%RDS%";
-        if (!descriptions.Any() || string.IsNullOrEmpty(descriptions[0].RDS))
+        string mesEntityPlaceholder = "%MesEntity%";
+        if (descriptions.Count == 0 || string.IsNullOrEmpty(descriptions[0].RDS))
             rds = logistics.MID;
         else
             rds = descriptions[0].RDS;
         string[] segments = scopeInfo.FileName.Split(new string[] { "DateTime:" }, StringSplitOptions.RemoveEmptyEntries);
         if (segments.Length == 0)
-            result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileNameWithoutExtension.Replace(rdsPlaceholder, rds));
+            result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileNameWithoutExtension.Replace(rdsPlaceholder, rds).Replace(mesEntityPlaceholder, logistics.MesEntity));
         else
         {
             segments = segments[1].Split('%');
@@ -284,7 +89,11 @@ public class FileRead : Properties.IFileRead
                     continue;
                 datePlaceholder = string.Concat('%', segment, '%');
             }
-            result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileName.Replace(rdsPlaceholder, rds).Replace(datePlaceholder, dateValue));
+            fileName = scopeInfo.FileName.Replace(rdsPlaceholder, rds).Replace(mesEntityPlaceholder, logistics.MesEntity).Replace(datePlaceholder, dateValue);
+            if (!duplicateFile.Contains("Viewer"))
+                result = Path.Combine(duplicateDirectory, fileName);
+            else
+                result = Path.Combine(duplicateDirectory, $"Viewer_{fileName}");
         }
         if (result.Contains('%'))
             throw new Exception("Placeholder exists!");
@@ -306,7 +115,7 @@ public class FileRead : Properties.IFileRead
             preWait = dateTime.AddMilliseconds(1234).Ticks;
         else
             preWait = dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
-        if (!collection.Any())
+        if (collection.Count == 0)
             duplicateFiles.Add(duplicateFile);
         string fileName = Path.GetFileNameWithoutExtension(logistics.ReportFullPath);
         string successFile = string.Concat(successDirectory, @"\", Path.GetFileName(logistics.ReportFullPath));
@@ -317,7 +126,7 @@ public class FileRead : Properties.IFileRead
             else if (!scopeInfo.FileName.Contains('%'))
                 tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", scopeInfo.FileNameWithoutExtension, ".pdsfc");
             else
-                tupleFile = GetTupleFile(logistics, descriptions, scopeInfo, duplicateDirectory);
+                tupleFile = GetTupleFile(logistics, descriptions, scopeInfo, duplicateDirectory, duplicateFile);
             tupleFileName = Path.GetFileNameWithoutExtension(tupleFile).Split('.')[0];
             duplicateFiles.Add(tupleFile);
             if (_IsEAFHosted)
@@ -378,6 +187,286 @@ public class FileRead : Properties.IFileRead
         }
     }
 
+    protected void WaitForFileConsumption<T>(DateTime dateTime, List<T> descriptions, bool isDummyRun, string successDirectory, string duplicateDirectory, List<(Properties.IScopeInfo, string)> collection, string duplicateFile) where T : Properties.IDescription
+    {
+        if (!isDummyRun && _IsEAFHosted)
+            WaitForFileConsumption(_FileConnectorConfiguration.SourceDirectoryCloaking, _Logistics, dateTime, descriptions, successDirectory, duplicateDirectory, duplicateFile, collection);
+        else
+        {
+            long breakAfter = DateTime.Now.AddSeconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
+            for (short i = 0; i < short.MaxValue; i++)
+            {
+                if (!_IsEAFHosted || DateTime.Now.Ticks > breakAfter)
+                    break;
+                Thread.Sleep(500);
+            }
+        }
+    }
+
+    public FileRead(IDescription description, bool isEvent, ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<Metrology.WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted)
+    {
+        _SMTP = smtp;
+        _IsEvent = isEvent;
+        _DummyRuns = dummyRuns;
+        _LastTicksDuration = 0;
+        _StaticRuns = staticRuns;
+        _IsEAFHosted = isEAFHosted;
+        _Description = description;
+        _FileParameter = fileParameter;
+        _ReportFullPath = string.Empty;
+        _CellInstanceName = cellInstanceName;
+        _Calendar = new CultureInfo("en-US").Calendar;
+        _Log = LogManager.GetLogger(typeof(FileRead));
+        _UseCyclicalForDescription = useCyclicalForDescription;
+        _CellInstanceConnectionName = cellInstanceConnectionName;
+        _ModelObjectParameterDefinitions = modelObjectParameters;
+        _FileConnectorConfiguration = fileConnectorConfiguration;
+        _ParameterizedModelObjectDefinitionType = parameterizedModelObjectDefinitionType;
+        _IsSourceTimer = fileConnectorConfiguration.SourceFileFilter.StartsWith("*Timer.txt");
+        string cellInstanceConnectionNameBase = cellInstanceConnectionName.Replace("-", string.Empty);
+        _Hyphens = cellInstanceConnectionName.Length - cellInstanceConnectionNameBase.Length;
+        _TracePath = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Path.Trace");
+        _ExceptionSubject = string.Concat("Exception:", _CellInstanceConnectionName, _FileConnectorConfiguration?.SourceDirectoryCloaking);
+        string suffix;
+        string[] segments = _ParameterizedModelObjectDefinitionType.Split('.');
+        string @namespace = segments[0];
+        string eventNameFileRead = "FileRead";
+        string eventName = segments[segments.Length - 1];
+        bool isDuplicator = segments[0] == cellInstanceName;
+        _IsDuplicator = isDuplicator;
+        _CellInstanceConnectionNameBase = cellInstanceConnectionNameBase;
+        if (eventName == eventNameFileRead)
+            suffix = string.Empty;
+        else
+            suffix = string.Concat('_', eventName.Split(new string[] { eventNameFileRead }, StringSplitOptions.RemoveEmptyEntries)[1]);
+        string parameterizedModelObjectDefinitionTypeAppended = string.Concat(@namespace, suffix);
+        if (!isEAFHosted)
+        {
+            if (string.IsNullOrEmpty(equipmentTypeName) || equipmentTypeName != parameterizedModelObjectDefinitionTypeAppended)
+                throw new Exception(cellInstanceConnectionName);
+            if (string.IsNullOrEmpty(equipmentDictionaryName) && isEvent)
+                throw new Exception(cellInstanceConnectionName);
+            if (!string.IsNullOrEmpty(equipmentDictionaryName) && !isEvent && connectionCount > 1)
+                throw new Exception(cellInstanceConnectionName);
+            // if (string.IsNullOrEmpty(equipmentDictionaryName) && !isEvent)
+            //     throw new Exception(cellInstanceConnectionName);
+            // if (!string.IsNullOrEmpty(equipmentDictionaryName) && isEvent)
+            //     throw new Exception(cellInstanceConnectionName);
+        }
+        if (isDuplicator)
+            _MesEntity = string.Empty;
+        else
+            _MesEntity = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, string.Concat("CellInstance.", cellInstanceName, ".Alias"));
+        _EventName = eventName;
+        _EventNameFileRead = eventNameFileRead;
+        _EquipmentType = parameterizedModelObjectDefinitionTypeAppended;
+        long breakAfterSeconds;
+        if (_FileConnectorConfiguration is null)
+            breakAfterSeconds = 360;
+        else
+        {
+            if (_FileConnectorConfiguration.FileScanningOption == FileConnectorConfiguration.FileScanningOptionEnum.TimeBased)
+                breakAfterSeconds = Math.Abs(_FileConnectorConfiguration.FileHandleTimeout.Value);
+            else if (_FileConnectorConfiguration.FileScanningOption == FileConnectorConfiguration.FileScanningOptionEnum.FileWatcher)
+                breakAfterSeconds = Math.Abs(_FileConnectorConfiguration.FileScanningIntervalInSeconds.Value);
+            else
+                throw new Exception();
+        }
+        _BreakAfterSeconds = breakAfterSeconds;
+        UpdateLastTicksDuration(breakAfterSeconds * 10000000);
+        if (_IsDuplicator)
+        {
+            if (string.IsNullOrEmpty(_FileConnectorConfiguration.TargetFileLocation) || string.IsNullOrEmpty(_FileConnectorConfiguration.ErrorTargetFileLocation))
+                throw new Exception("_Configuration is empty?");
+            if (_FileConnectorConfiguration.TargetFileLocation.Contains('%') || _FileConnectorConfiguration.ErrorTargetFileLocation.Contains('%'))
+                throw new Exception("_Configuration is incorrect for a duplicator!");
+            // if (_FileConnectorConfiguration is not null)
+            // {
+            //     if (string.IsNullOrEmpty(_FileConnectorConfiguration.SourceDirectoryCloaking))
+            //         throw new Exception("SourceDirectoryCloaking is empty?");
+            //     if (!_FileConnectorConfiguration.SourceDirectoryCloaking.StartsWith("~"))
+            //         throw new Exception("SourceDirectoryCloaking is incorrect for a duplicator!");
+            // }
+        }
+    }
+
+    protected static string GetPropertyValue(string cellInstanceConnectionName, IList<ModelObjectParameterDefinition> modelObjectParameters, string propertyName)
+    {
+        string result;
+        List<string> results = (from l in modelObjectParameters where l.Name == propertyName select l.Value).ToList();
+        if (results.Count != 1)
+            throw new Exception(cellInstanceConnectionName);
+        result = results[0];
+        return result;
+    }
+
+    protected void UpdateLastTicksDuration(long ticksDuration)
+    {
+        if (ticksDuration < 50000000)
+            ticksDuration = 50000000;
+        _LastTicksDuration = (long)Math.Ceiling(ticksDuration * .667);
+        _Log.Info($"{new TimeSpan(ticksDuration).TotalMilliseconds} TotalMillisecond(s) to process{Environment.NewLine}{_CellInstanceConnectionName}{Environment.NewLine}<{_ReportFullPath}>");
+    }
+
+    internal static string GetParentParent(string value)
+    {
+        string result = Path.GetDirectoryName(Path.GetDirectoryName(value));
+        return result;
+    }
+
+    internal static List<string> GetDirectoryNames(string directory)
+    {
+#nullable enable
+        List<string> results = new();
+        string? fileName;
+        string? checkDirectory = directory;
+        string? pathRoot = Path.GetPathRoot(directory);
+        string extension = Path.GetExtension(directory);
+        if (string.IsNullOrEmpty(pathRoot))
+            throw new NullReferenceException(nameof(pathRoot));
+        if (Directory.Exists(directory))
+        {
+            fileName = Path.GetFileName(directory);
+            if (!string.IsNullOrEmpty(fileName))
+                results.Add(fileName);
+        }
+        else if ((string.IsNullOrEmpty(extension) || extension.Length > 3) && !File.Exists(directory))
+        {
+            fileName = Path.GetFileName(directory);
+            if (!string.IsNullOrEmpty(fileName))
+                results.Add(fileName);
+        }
+        for (int i = 0; i < int.MaxValue; i++)
+        {
+            checkDirectory = Path.GetDirectoryName(checkDirectory);
+            if (string.IsNullOrEmpty(checkDirectory) || checkDirectory == pathRoot)
+                break;
+            fileName = Path.GetFileName(checkDirectory);
+            if (string.IsNullOrEmpty(fileName))
+                continue;
+            results.Add(fileName);
+        }
+        results.Add(pathRoot);
+        results.Reverse();
+        return results;
+#nullable disable
+    }
+
+    internal static string GetJobIdParentDirectory(string directory)
+    {
+        string result;
+        if (!string.IsNullOrEmpty(Path.GetFileName(directory)))
+            result = Path.GetFullPath(GetParentParent(directory));
+        else
+            result = Path.GetFullPath(GetParentParent(Path.GetDirectoryName(directory)));
+        if (!Directory.Exists(result))
+            _ = Directory.CreateDirectory(result);
+        return result;
+    }
+
+    internal static string GetFileNameAfterUnderscoreSplit(string reportFullPath)
+    {
+        string result;
+        string[] segments = Path.GetFileNameWithoutExtension(reportFullPath).Split('_');
+        if (segments.Length <= 2)
+            result = segments[0];
+        else
+            result = string.Concat(segments[0], segments[2]);
+        return result;
+    }
+
+    internal string[] GetInProcessDirectory(string jobIdDirectory)
+    {
+        List<string> results = new();
+        if (!_IsEAFHosted)
+            results = new string[] { jobIdDirectory }.ToList();
+        else
+        {
+            string[] files;
+            string logisticsSequence = _Logistics.Sequence.ToString();
+            string[] directories = Directory.GetDirectories(jobIdDirectory, $"*{logisticsSequence}*", SearchOption.TopDirectoryOnly);
+            foreach (string directory in directories)
+            {
+                files = Directory.GetFiles(directory, "*", SearchOption.TopDirectoryOnly);
+                if (files.Length == 0)
+                    continue;
+                results.Add(directory);
+            }
+        }
+        if ((results is null) || results.Count != 1)
+            throw new Exception("Didn't find directory by logistics sequence");
+        return results.ToArray();
+    }
+
+    protected static string[] GetMatches(FileConnectorConfiguration fileConnectorConfiguration)
+    {
+        string[] segments;
+        string[] results = null;
+        foreach (string subSourceFileFilter in fileConnectorConfiguration.SourceFileFilters)
+        {
+            segments = subSourceFileFilter.Split('\\');
+            if (fileConnectorConfiguration.IncludeSubDirectories.Value)
+                results = Directory.GetFiles(fileConnectorConfiguration.SourceFileLocation, segments.Last(), SearchOption.AllDirectories);
+            else
+                results = Directory.GetFiles(fileConnectorConfiguration.SourceFileLocation, segments.Last(), SearchOption.TopDirectoryOnly);
+            if (results.Length != 0)
+                break;
+        }
+        return results;
+    }
+
+    protected static void NestExistingFiles(FileConnectorConfiguration fileConnectorConfiguration)
+    {
+        // if (!fileConnectorConfiguration.IncludeSubDirectories.Value && fileConnectorConfiguration.TriggerOnCreated is not null && fileConnectorConfiguration.TriggerOnCreated.Value)
+        if (!fileConnectorConfiguration.IncludeSubDirectories.Value)
+        {
+            string[] matches = GetMatches(fileConnectorConfiguration);
+            if (matches is not null && matches.Length > 0)
+            {
+                string fileName;
+                string nestedDirectory = Path.Combine(fileConnectorConfiguration.SourceFileLocation, DateTime.Now.Ticks.ToString());
+                if (!Directory.Exists(nestedDirectory))
+                    _ = Directory.CreateDirectory(nestedDirectory);
+                foreach (string match in matches)
+                {
+                    fileName = Path.GetFileName(match);
+                    File.Move(match, Path.Combine(nestedDirectory, fileName));
+                }
+            }
+        }
+    }
+
+    protected static List<Properties.IDescription> GetDuplicatorDescriptions(JsonElement[] jsonElements)
+    {
+        List<Properties.IDescription> results = new();
+        Duplicator.Description description;
+        JsonSerializerOptions jsonSerializerOptions = new() { NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString };
+        foreach (JsonElement jsonElement in jsonElements)
+        {
+            if (jsonElement.ValueKind != JsonValueKind.Object)
+                throw new Exception();
+            description = JsonSerializer.Deserialize<Duplicator.Description>(jsonElement.ToString(), jsonSerializerOptions);
+            results.Add(description);
+        }
+        return results;
+    }
+
+    protected static ModelObjectParameterDefinition[] GetProperties(string cellInstanceConnectionName, IList<ModelObjectParameterDefinition> modelObjectParameters, string propertyNamePrefix)
+    {
+        ModelObjectParameterDefinition[] results = (from l in modelObjectParameters where l.Name.StartsWith(propertyNamePrefix) select l).ToArray();
+        if (results.Length == 0)
+            throw new Exception(cellInstanceConnectionName);
+        return results;
+    }
+
+    protected static ModelObjectParameterDefinition[] GetProperties(string cellInstanceConnectionName, IList<ModelObjectParameterDefinition> modelObjectParameters, string propertyNamePrefix, string propertyNameSuffix)
+    {
+        ModelObjectParameterDefinition[] results = (from l in modelObjectParameters where l.Name.StartsWith(propertyNamePrefix) && l.Name.EndsWith(propertyNameSuffix) select l).ToArray();
+        if (results.Length == 0)
+            throw new Exception(cellInstanceConnectionName);
+        return results;
+    }
+
     protected void SetFileParameter(string key, string value)
     {
         if (_FileConnectorConfiguration is null || _FileConnectorConfiguration.TargetFileLocation.Contains(string.Concat("%", key, "%")) || _FileConnectorConfiguration.ErrorTargetFileLocation.Contains(string.Concat("%", key, "%")) || _FileConnectorConfiguration.TargetFileName.Contains(string.Concat("%", key, "%")) || _FileConnectorConfiguration.ErrorTargetFileName.Contains(string.Concat("%", key, "%")))
@@ -389,37 +478,16 @@ public class FileRead : Properties.IFileRead
         }
     }
 
-    protected void SetFileParameterLotIDToLogisticsMID(bool includeLogisticsSequence = true)
-    {
-        string key;
-        if (!includeLogisticsSequence)
-            key = "LotID";
-        else
-            key = "LotIDWithLogisticsSequence";
-        string value = string.Concat(_Logistics.MID, "_", _Logistics.Sequence, "_", DateTime.Now.Ticks - _Logistics.Sequence);
-        SetFileParameter(key, value);
-    }
-
-    protected void SetFileParameterLotID(string value, bool includeLogisticsSequence = true)
-    {
-        string key;
-        if (!includeLogisticsSequence)
-            key = "LotID";
-        else
-        {
-            key = "LotIDWithLogisticsSequence";
-            value = string.Concat(value, "_", _Logistics.Sequence, "_", DateTime.Now.Ticks - _Logistics.Sequence);
-        }
-        SetFileParameter(key, value);
-    }
-
     protected void WritePDSF(IFileRead fileRead, JsonElement[] jsonElements)
     {
         string directory;
+        string day = $"{_Logistics.DateTimeFromSequence:yyyy-MM-dd}";
+        string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
+        string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}";
         if (!_CellInstanceConnectionName.StartsWith(_CellInstanceName) && _CellInstanceConnectionNameBase == _EquipmentType)
-            directory = Path.Combine(_TracePath, _EquipmentType, "Target", _CellInstanceName, _CellInstanceConnectionName);
+            directory = Path.Combine(_TracePath, _EquipmentType, "Target", weekDirectory, day, _CellInstanceName, _CellInstanceConnectionName);
         else
-            directory = Path.Combine(_TracePath, _EquipmentType, "Source", _CellInstanceName, _CellInstanceConnectionName);
+            directory = Path.Combine(_TracePath, _EquipmentType, "Source", weekDirectory, day, _CellInstanceName, _CellInstanceConnectionName);
         if (!Directory.Exists(directory))
             _ = Directory.CreateDirectory(directory);
         string file = Path.Combine(directory, string.Concat(_Logistics.MesEntity, "_", _Logistics.Sequence, ".ipdsf"));
@@ -433,6 +501,37 @@ public class FileRead : Properties.IFileRead
         }
     }
 
+    protected void WaitForThread(Thread thread, List<Exception> threadExceptions)
+    {
+        if (thread is not null)
+        {
+            ThreadState threadState;
+            for (short i = 0; i < short.MaxValue; i++)
+            {
+                if (thread is null)
+                    break;
+                else
+                {
+                    threadState = thread.ThreadState;
+                    if (threadState is not ThreadState.Running and not ThreadState.WaitSleepJoin)
+                        break;
+                }
+                Thread.Sleep(500);
+            }
+            lock (threadExceptions)
+            {
+                if (threadExceptions.Count != 0)
+                {
+                    foreach (Exception item in threadExceptions)
+                        _Log.Error(string.Concat(item.Message, Environment.NewLine, Environment.NewLine, item.StackTrace));
+                    Exception exception = threadExceptions[0];
+                    threadExceptions.Clear();
+                    throw exception;
+                }
+            }
+        }
+    }
+
     protected void Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults)
     {
         if (!_IsEAFHosted)
@@ -451,80 +550,49 @@ public class FileRead : Properties.IFileRead
         }
     }
 
-    protected void TriggerEvents(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, List<string> headerNames, Dictionary<string, string> keyValuePairs)
+    protected string[] Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, string to, string from, string resolvedFileLocation, Exception exception)
     {
-        object value;
-        string description;
-        List<object[]> list;
-        for (int i = 0; i < extractResults.Item3.Length; i++)
-        {
-            _Log.Debug(string.Concat("TriggerEvent - {", _Logistics.ReportFullPath, "} ", i, " of ", extractResults.Item3.Length));
-            foreach (JsonProperty jsonProperty in extractResults.Item3[i].EnumerateObject())
-            {
-                if (jsonProperty.Value.ValueKind != JsonValueKind.String || !keyValuePairs.ContainsKey(jsonProperty.Name))
-                    description = string.Empty;
-                else
-                    description = keyValuePairs[jsonProperty.Name].Split('|')[0];
-                if (!_UseCyclicalForDescription || headerNames.Contains(jsonProperty.Name))
-                    value = jsonProperty.Value.ToString();
-                else
-                {
-                    list = new List<object[]>();
-                    for (int z = 0; z < extractResults.Item3.Length; z++)
-                        list.Add(new object[] { z, extractResults.Item3[z].GetProperty(jsonProperty.Name).ToString() });
-                    value = list;
-                }
-            }
-            if (_UseCyclicalForDescription)
-                break;
-        }
-    }
-
-    protected Tuple<string, Test[], JsonElement[], List<FileInfo>> ReExtract(IFileRead fileRead, List<string> headerNames, Dictionary<string, string> keyValuePairs)
-    {
-        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        if (!Directory.Exists(_FileConnectorConfiguration.SourceFileLocation))
-            results = null;
+        string[] results;
+        bool isErrorFile = exception is not null;
+        if (!to.EndsWith(@"\"))
+            _ = string.Concat(to, @"\");
+        if (!isErrorFile)
+            results = Array.Empty<string>();
         else
         {
-            string[] segments;
-            string[] matches = null;
-            foreach (string subSourceFileFilter in _FileConnectorConfiguration.SourceFileFilters)
+            results = new string[] { _Logistics.Sequence.ToString(), _Logistics.ReportFullPath, from, resolvedFileLocation, to, string.Empty, string.Empty, exception.Message, string.Empty, string.Empty, exception.StackTrace };
+            if (!_IsDuplicator)
+                WriteAllLines(to, results);
+        }
+        if (extractResults is not null && extractResults.Item4 is not null && extractResults.Item4.Count != 0)
+        {
+            string itemFile;
+            List<string> directories = new();
+            foreach (FileInfo sourceFile in extractResults.Item4)
             {
-                segments = subSourceFileFilter.Split('\\');
-                if (_FileConnectorConfiguration.IncludeSubDirectories.Value)
-                    matches = Directory.GetFiles(_FileConnectorConfiguration.SourceFileLocation, segments.Last(), SearchOption.AllDirectories);
-                else
-                    matches = Directory.GetFiles(_FileConnectorConfiguration.SourceFileLocation, segments.Last(), SearchOption.TopDirectoryOnly);
-                if (matches.Any())
-                    break;
-            }
-            if (matches is null || !matches.Any())
-                results = null;
-            else
-            {
-                _ReportFullPath = matches[0];
-                results = fileRead.GetExtractResult(_ReportFullPath, _EventName);
-                if (!_IsEAFHosted)
-                    TriggerEvents(results, headerNames, keyValuePairs);
+                if (sourceFile.FullName != _Logistics.ReportFullPath)
+                {
+                    itemFile = sourceFile.FullName.Replace(from, to);
+                    Shared1880(itemFile, directories, sourceFile, isErrorFile);
+                }
+                else if (!isErrorFile && _Logistics is not null)
+                    Shared1811(to, sourceFile);
             }
+            Shared0231(directories);
         }
         return results;
     }
 
-    protected static List<Properties.IDescription> GetDuplicatorDescriptions(JsonElement[] jsonElements)
+    private void WriteAllLines(string to, string[] exceptionLines)
     {
-        List<Properties.IDescription> results = new();
-        Duplicator.Description description;
-        JsonSerializerOptions jsonSerializerOptions = new() { NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString };
-        foreach (JsonElement jsonElement in jsonElements)
+        string fileName = string.Concat(to, @"\readme.txt");
+        try
         {
-            if (jsonElement.ValueKind != JsonValueKind.Object)
-                throw new Exception();
-            description = JsonSerializer.Deserialize<Duplicator.Description>(jsonElement.ToString(), jsonSerializerOptions);
-            results.Add(description);
+            if (!Directory.Exists(to))
+                _ = Directory.CreateDirectory(to);
+            File.WriteAllLines(fileName, exceptionLines);
         }
-        return results;
+        catch (Exception ex) { _Log.Error(ex.Message); }
     }
 
     private void Shared1880(string itemFile, List<string> directories, FileInfo sourceFile, bool isErrorFile)
@@ -556,6 +624,9 @@ public class FileRead : Properties.IFileRead
                 case FileConnectorConfiguration.PostProcessingModeEnum.Delete:
                     File.Delete(sourceFile.FullName);
                     break;
+                case FileConnectorConfiguration.PostProcessingModeEnum.None:
+                    File.Move(sourceFile.FullName, itemFile);
+                    break;
                 default:
                     throw new Exception();
             }
@@ -567,11 +638,12 @@ public class FileRead : Properties.IFileRead
         if (!_IsDuplicator && _FileConnectorConfiguration.SourceFileFilter != "*" && sourceFile.Exists && sourceFile.Length < _MinFileLength)
         {
             string directoryName = Path.GetFileName(to);
-            string jobIdDirectory = Path.GetDirectoryName(to);
+            string jobIdDirectory = GetJobIdDirectory(to);
             DateTime dateTime = DateTime.Now.AddMinutes(-15);
+            string day = $"{_Logistics.DateTimeFromSequence:yyyy-MM-dd}";
             string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
-            string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}{@"\"}{_Logistics.DateTimeFromSequence:yyyy-MM-dd}";
-            string destinationDirectory = string.Concat(jobIdDirectory, @"\_ Ignore 100 bytes\", weekDirectory, @"\", directoryName);
+            string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}";
+            string destinationDirectory = Path.Combine(jobIdDirectory, "_ Ignore 100 bytes", weekDirectory, day, directoryName);
             if (!Directory.Exists(destinationDirectory))
                 _ = Directory.CreateDirectory(destinationDirectory);
             File.Move(sourceFile.FullName, string.Concat(destinationDirectory, @"\", sourceFile.Name));
@@ -582,13 +654,13 @@ public class FileRead : Properties.IFileRead
                 {
                     if (!checkDirectory.Contains('_'))
                         continue;
-                    if (Directory.GetDirectories(checkDirectory, "*", SearchOption.TopDirectoryOnly).Any())
+                    if (Directory.GetDirectories(checkDirectory, "*", SearchOption.TopDirectoryOnly).Length != 0)
                         continue;
-                    if (Directory.GetFiles(checkDirectory, "*", SearchOption.TopDirectoryOnly).Any())
+                    if (Directory.GetFiles(checkDirectory, "*", SearchOption.TopDirectoryOnly).Length != 0)
                         continue;
-                    if (Directory.GetDirectories(checkDirectory, "*", SearchOption.AllDirectories).Any())
+                    if (Directory.GetDirectories(checkDirectory, "*", SearchOption.AllDirectories).Length != 0)
                         continue;
-                    if (Directory.GetFiles(checkDirectory, "*", SearchOption.AllDirectories).Any())
+                    if (Directory.GetFiles(checkDirectory, "*", SearchOption.AllDirectories).Length != 0)
                         continue;
                     if (new DirectoryInfo(checkDirectory).CreationTime > dateTime)
                         continue;
@@ -596,6 +668,52 @@ public class FileRead : Properties.IFileRead
                 }
             }
             catch (Exception) { throw; }
+            DeleteEmptyTopDirectories(jobIdDirectory);
+        }
+    }
+
+    private string GetJobIdDirectory(string path)
+    {
+        string result;
+        List<string> directoryNames = GetDirectoryNames(path);
+        if (!directoryNames.Contains(_Logistics.JobID))
+            result = Path.GetDirectoryName(path);
+        else
+        {
+            result = string.Empty;
+            foreach (string directoryName in directoryNames)
+            {
+                result = Path.Combine(result, directoryName);
+                if (directoryName == _Logistics.JobID)
+                    break;
+            }
+        }
+        return result;
+    }
+
+    private static void DeleteEmptyTopDirectories(string rootDirectory)
+    {
+        if (Directory.Exists(rootDirectory))
+        {
+            string[] files;
+            string[] directories;
+            string[] subDirectories = Directory.GetDirectories(rootDirectory, "*", SearchOption.TopDirectoryOnly);
+            foreach (string subDirectory in subDirectories)
+            {
+                files = Directory.GetFiles(subDirectory, "*", SearchOption.AllDirectories);
+                if (files.Length > 0)
+                    continue;
+                directories = Directory.GetDirectories(subDirectory, "*", SearchOption.TopDirectoryOnly);
+                if (directories.Length > 0)
+                    continue;
+                try
+                { Directory.Delete(subDirectory); }
+                catch (UnauthorizedAccessException)
+                {
+                    new DirectoryInfo(subDirectory).Attributes = FileAttributes.Normal;
+                    Directory.Delete(subDirectory);
+                }
+            }
         }
     }
 
@@ -605,72 +723,87 @@ public class FileRead : Properties.IFileRead
         {
             foreach (string directory in (from l in directories orderby l.Split('\\').Length descending select l).Distinct())
             {
-                if (Directory.Exists(directory) && !Directory.GetFiles(directory).Any())
+                if (Directory.Exists(directory) && Directory.GetFiles(directory).Length == 0)
                     Directory.Delete(directory);
             }
         }
     }
 
-    protected void WaitForFileConsumption<T>(DateTime dateTime, List<T> descriptions, bool isDummyRun, string successDirectory, string duplicateDirectory, List<(Properties.IScopeInfo, string)> collection, string duplicateFile) where T : Properties.IDescription
+    protected void SetFileParameterLotID(string value, bool includeLogisticsSequence = true)
     {
-        if (!isDummyRun && _IsEAFHosted)
-            WaitForFileConsumption(_FileConnectorConfiguration.SourceDirectoryCloaking, _Logistics, dateTime, descriptions, successDirectory, duplicateDirectory, duplicateFile, collection);
+        string key;
+        if (!includeLogisticsSequence)
+            key = "LotID";
         else
         {
-            long breakAfter = DateTime.Now.AddSeconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
-            for (short i = 0; i < short.MaxValue; i++)
+            key = "LotIDWithLogisticsSequence";
+            value = string.Concat(value, "_", _Logistics.Sequence, "_", DateTime.Now.Ticks - _Logistics.Sequence);
+        }
+        SetFileParameter(key, value);
+    }
+
+    protected void SetFileParameterLotIDToLogisticsMID(bool includeLogisticsSequence = true)
+    {
+        string key;
+        if (!includeLogisticsSequence)
+            key = "LotID";
+        else
+            key = "LotIDWithLogisticsSequence";
+        string value = string.Concat(_Logistics.MID, "_", _Logistics.Sequence, "_", DateTime.Now.Ticks - _Logistics.Sequence);
+        SetFileParameter(key, value);
+    }
+
+    protected Tuple<string, Test[], JsonElement[], List<FileInfo>> ReExtract(IFileRead fileRead, List<string> headerNames, Dictionary<string, string> keyValuePairs)
+    {
+        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
+        if (!Directory.Exists(_FileConnectorConfiguration.SourceFileLocation))
+            results = null;
+        else
+        {
+            string[] matches = GetMatches(_FileConnectorConfiguration);
+            if (matches is null || matches.Length == 0)
+                results = null;
+            else
             {
-                if (!_IsEAFHosted || DateTime.Now.Ticks > breakAfter)
-                    break;
-                Thread.Sleep(500);
+                _ReportFullPath = matches[0];
+                results = fileRead.GetExtractResult(_ReportFullPath, _EventName);
+                if (!_IsEAFHosted)
+                    TriggerEvents(results, headerNames, keyValuePairs);
             }
         }
-    }
-
-    internal static string GetJobIdParentDirectory(string directory)
-    {
-        string result;
-        if (!string.IsNullOrEmpty(Path.GetFileName(directory)))
-            result = Path.GetFullPath(GetParentParent(directory));
-        else
-            result = Path.GetFullPath(GetParentParent(Path.GetDirectoryName(directory)));
-        if (!Directory.Exists(result))
-            _ = Directory.CreateDirectory(result);
-        return result;
-    }
-
-    internal string[] GetInProcessDirectory(string jobIdDirectory)
-    {
-        string[] results;
-        if (!_IsEAFHosted)
-            results = new string[] { jobIdDirectory };
-        else
-        {
-            string logisticsSequence = _Logistics.Sequence.ToString();
-            results = Directory.GetDirectories(jobIdDirectory, string.Concat(_Logistics.MID, '*', logisticsSequence, '*'), SearchOption.TopDirectoryOnly);
-        }
-        if ((results is null) || results.Length != 1)
-            throw new Exception("Didn't find directory by logistics sequence");
         return results;
     }
 
-    internal static string GetFileNameAfterUnderscoreSplit(string reportFullPath)
+    protected void TriggerEvents(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, List<string> headerNames, Dictionary<string, string> keyValuePairs)
     {
-        string result;
-        string[] segments = Path.GetFileNameWithoutExtension(reportFullPath).Split('_');
-        if (segments.Length <= 2)
-            result = segments[0];
-        else
-            result = string.Concat(segments[0], segments[2]);
-        return result;
-    }
-
-    internal static string GetParentParent(string value)
-    {
-        string result = Path.GetDirectoryName(Path.GetDirectoryName(value));
-        return result;
+        object value;
+        string segments;
+        string description;
+        List<object[]> list;
+        for (int i = 0; i < extractResults.Item3.Length; i++)
+        {
+            _Log.Debug(string.Concat("TriggerEvent - {", _Logistics.ReportFullPath, "} ", i, " of ", extractResults.Item3.Length));
+            foreach (JsonProperty jsonProperty in extractResults.Item3[i].EnumerateObject())
+            {
+                if (jsonProperty.Value.ValueKind != JsonValueKind.String || !keyValuePairs.TryGetValue(jsonProperty.Name, out segments))
+                    description = string.Empty;
+                else
+                    description = segments.Split('|')[0];
+                if (!_UseCyclicalForDescription || headerNames.Contains(jsonProperty.Name))
+                    value = jsonProperty.Value.ToString();
+                else
+                {
+                    list = new List<object[]>();
+                    for (int z = 0; z < extractResults.Item3.Length; z++)
+                        list.Add(new object[] { z, extractResults.Item3[z].GetProperty(jsonProperty.Name).ToString() });
+                    value = list;
+                }
+            }
+            if (_UseCyclicalForDescription)
+                break;
+        }
     }
 
 }
 
-// 2022-06-08 -> Shared - FileRead
+// 2025-03-25 -> Shared - FileRead

Adaptation/Shared/Logistics.cs

@@ -35,6 +35,9 @@ public class Logistics : ILogistics
     public long Sequence => _Sequence;
     public double TotalSecondsSinceLastWriteTimeFromSequence => _TotalSecondsSinceLastWriteTimeFromSequence;
 
+    private static string DefaultMesEntity(DateTime dateTime) =>
+        string.Concat(dateTime.Ticks, "_MES_ENTITY");
+
     public Logistics(IFileRead fileRead)
     {
         DateTime dateTime = DateTime.Now;
@@ -84,14 +87,14 @@ public class Logistics : ILogistics
         _Logistics2 = new List<Logistics2>();
     }
 
-    public Logistics(string reportFullPath, string logistics)
+    internal Logistics(string reportFullPath, ProcessDataStandardFormat processDataStandardFormat)
     {
         string key;
         DateTime dateTime;
         string[] segments;
         _FileInfo = new(reportFullPath);
-        _Logistics1 = logistics.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries).ToList();
-        if (!Logistics1.Any() || !Logistics1[0].StartsWith("LOGISTICS_1"))
+        _Logistics1 = processDataStandardFormat.Logistics.ToList();
+        if (Logistics1.Count == 0 || !Logistics1[0].StartsWith("LOGISTICS_1"))
         {
             _NullData = null;
             _JobID = "null";
@@ -190,8 +193,6 @@ public class Logistics : ILogistics
         }
     }
 
-    private static string DefaultMesEntity(DateTime dateTime) => string.Concat(dateTime.Ticks, "_MES_ENTITY");
-
     internal void Update(string mid, string processJobID)
     {
         _MID = mid;

Adaptation/Shared/Metrology/WS.Attachment.cs

@@ -2,18 +2,29 @@
 
 public partial class WS
 {
+
     public class Attachment
     {
 
-        public string UniqueId { get; set; }
-        public string DestinationFileName { get; set; }
-        public string SourceFileName { get; set; }
+#nullable enable
 
-        public Attachment(string uniqueId, string destinationFileName, string sourceFileName)
+        public long HeaderId { get; set; }
+        public string UniqueId { get; set; }
+        public string SubGroupId { get; set; }
+        public string AttachmentId { get; set; }
+        public string SourceFileName { get; set; }
+        public string HeaderIdDirectory { get; set; }
+        public string DestinationFileName { get; set; }
+
+        public Attachment(Results? results, string headerIdDirectory, string uniqueId, string destinationFileName, string sourceFileName)
         {
             UniqueId = uniqueId;
-            DestinationFileName = destinationFileName;
             SourceFileName = sourceFileName;
+            HeaderIdDirectory = headerIdDirectory;
+            DestinationFileName = destinationFileName;
+            AttachmentId = System.Guid.NewGuid().ToString();
+            HeaderId = results?.HeaderId is null ? -1 : results.HeaderId.Value;
+            SubGroupId = results?.SubgroupId is null ? string.Empty : results.SubgroupId.Value.ToString();
         }
 
     }

Adaptation/Shared/Metrology/WS.Results.cs

@@ -1,27 +1,75 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Text;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace Adaptation.Shared.Metrology;
 
 public partial class WS
 {
-    // this class represents the response from the Inbound API endpoint
+
     public class Results
     {
-        // true or false if data was written to the database
-        public bool Success { get; set; }
 
-        // if true, contains ID of the Header record in the database
-        public long HeaderID { get; set; }
+#nullable enable
 
-        // if false, this collection will contain a list of errors
-        public List<string> Errors { get; set; }
+        [JsonConstructor]
+        public Results(List<string>? errors,
+                       long? headerId,
+                       long? subgroupId,
+                       bool? success,
+                       List<string>? warnings)
+        {
+            Errors = errors;
+            Success = success;
+            HeaderId = headerId;
+            Warnings = warnings;
+            SubgroupId = subgroupId;
+        }
 
-        // this collection will contain a list of warnings, they will not prevent data from being saved
-        public List<string> Warnings { get; set; }
+        [JsonPropertyName("errors")] public List<string>? Errors { get; set; }
+        [JsonPropertyName("headerID")] public long? HeaderId { get; set; }
+        [JsonPropertyName("subgroupId")] public long? SubgroupId { get; set; }
+        [JsonPropertyName("success")] public bool? Success { get; set; }
+        [JsonPropertyName("warnings")] public List<string>? Warnings { get; set; }
+
+        public override string ToString()
+        {
+            string result = JsonSerializer.Serialize(this, ResultsSourceGenerationContext.Default.Results);
+            return result;
+        }
+
+        internal static Results Get(Results results, long? subgroupId) =>
+            new(results.Errors, results.HeaderId, subgroupId, results.Success, results.Warnings);
+
+        internal static Results Get(string resultsJson, Exception e)
+        {
+            Results results;
+            Exception? exception = e;
+            List<string> errors = new();
+            StringBuilder stringBuilder = new();
+            while (exception is not null)
+            {
+                _ = stringBuilder.AppendLine(exception.Message);
+                exception = exception.InnerException;
+            }
+            errors.Add(resultsJson);
+            errors.Add(stringBuilder.ToString());
+            results = new(errors: errors,
+                          headerId: null,
+                          subgroupId: null,
+                          success: false,
+                          warnings: new());
+            return results;
+        }
 
-        // this is just a helper function to make displaying the results easier
-        public override string ToString() => JsonSerializer.Serialize(this, GetType());
     }
 
 }
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(WS.Results))]
+internal partial class ResultsSourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/Shared/Metrology/WS.cs

@@ -10,9 +10,11 @@ namespace Adaptation.Shared.Metrology;
 public partial class WS
 {
 
-    public static (string, Results) SendData(string url, object payload, int timeoutSeconds = 120)
+#nullable enable
+
+    public static (string, Results) SendData(string url, long sequence, string directory, object payload, int timeoutSeconds = 120)
     {
-        Results results = new();
+        Results? wsResults = null;
         string resultsJson = string.Empty;
         try
         {
@@ -30,85 +32,83 @@ public partial class WS
                 };
                 HttpResponseMessage httpResponseMessage = httpClient.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).Result;
                 resultsJson = httpResponseMessage.Content.ReadAsStringAsync().Result;
-                results = JsonSerializer.Deserialize<Results>(resultsJson, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+                wsResults = JsonSerializer.Deserialize(resultsJson, ResultsSourceGenerationContext.Default.Results);
+                if (wsResults is null)
+                    throw new NullReferenceException(nameof(wsResults));
+                string checkDirectory = Path.Combine(directory, $"-{wsResults.HeaderId}");
+                if (!Directory.Exists(checkDirectory))
+                    _ = Directory.CreateDirectory(checkDirectory);
+                File.WriteAllText(Path.Combine(checkDirectory, $"{sequence}.json"), json);
             }
-            if (!results.Success)
-                results.Errors.Add(results.ToString());
+            if (wsResults.Success is null || !wsResults.Success.Value)
+                wsResults.Errors?.Add(wsResults.ToString());
         }
         catch (Exception e)
-        {
-            Exception exception = e;
-            StringBuilder stringBuilder = new();
-            while (exception is not null)
-            {
-                _ = stringBuilder.AppendLine(exception.Message);
-                exception = exception.InnerException;
-            }
-            results.Errors ??= new List<string>();
-            results.Errors.Add(resultsJson);
-            results.Errors.Add(stringBuilder.ToString());
-        }
-        return new(resultsJson, results);
+        { wsResults ??= Results.Get(resultsJson, e); }
+        return new(resultsJson, wsResults);
     }
 
-    // this method is a wrapper for attaching a file to either a header or data record
-    //   URL is the same URL used for SendData, ex: http://localhost/api/inbound/CDE
-    //   attachToHeaderId is the ID returned by SendData 
-    //   attachToDataUniqueId is the string unique ID for the data record, aka the Title of the Sharepoint list entry
-    //   fileContents is a byte array with the contents of the file
-    //   fileName is which attachment this is, image.pdf, data.pdf, data.txt, header.pdf, etc
-    //   timeoutSeconds is configured as the request timeout
-    // this method will either succeed or throw an exception
-    // also, this has been made synchronous
-    public static void AttachFile(string url, long attachToHeaderId, string attachToDataUniqueId, byte[] fileContents, string fileName, int timeoutSeconds = 60)
+    public static void AttachFile(string url, Attachment attachment, int timeoutSeconds = 60)
     {
         using HttpClient httpClient = new();
-        string requestUrl = url + "/attachment?headerid=" + attachToHeaderId.ToString();
-        if (!string.IsNullOrWhiteSpace(attachToDataUniqueId))
-        {
-            requestUrl += "&datauniqueid=";
-            requestUrl += System.Net.WebUtility.UrlEncode(attachToDataUniqueId);
-        }
-        requestUrl += "&filename="; // this is just so the web server log shows the filename
-        requestUrl += System.Net.WebUtility.UrlEncode(fileName);
-
+        string json = JsonSerializer.Serialize(attachment);
         httpClient.Timeout = new TimeSpan(0, 0, 0, timeoutSeconds, 0);
-
-        MultipartFormDataContent multipartFormDataContent = new();
-        ByteArrayContent byteArrayContent = new(fileContents);
-        byteArrayContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/octet-stream");
-
-        multipartFormDataContent.Add(byteArrayContent, "attachment", fileName);
-
-        HttpResponseMessage httpResponseMessage = httpClient.PostAsync(requestUrl, multipartFormDataContent).Result;
-
-        if (httpResponseMessage.IsSuccessStatusCode)
-            return;
-
-        string resultBody = httpResponseMessage.Content.ReadAsStringAsync().Result;
-
-        throw new Exception("Attachment failed: " + resultBody);
+        StringContent httpContent = new(json, Encoding.UTF8, "application/json");
+        HttpResponseMessage httpResponseMessage = httpClient.PostAsync($"{url}/attachment", httpContent).Result;
+        if (!httpResponseMessage.IsSuccessStatusCode)
+        {
+            string resultBody = httpResponseMessage.Content.ReadAsStringAsync().Result;
+            throw new Exception($"Attachment failed: {resultBody}");
+        }
     }
 
-    public static void AttachFiles(string url, long headerID, List<Attachment> headerAttachments = null, List<Attachment> dataAttachments = null)
+    public static void AttachFiles(string url, List<Attachment>? headerAttachments = null, List<Attachment>? dataAttachments = null)
     {
+        string directory;
         try
         {
+            string? directoryName;
             if (headerAttachments is not null)
             {
                 foreach (Attachment attachment in headerAttachments)
-                    AttachFile(url, headerID, "", File.ReadAllBytes(attachment.SourceFileName), attachment.DestinationFileName);
+                {
+                    directoryName = Path.GetDirectoryName(attachment.HeaderIdDirectory);
+                    if (string.IsNullOrEmpty(directoryName))
+                        continue;
+                    directory = Path.Combine(directoryName, attachment.AttachmentId) ?? throw new Exception();
+                    if (!Directory.Exists(directory))
+                        _ = Directory.CreateDirectory(directory);
+                    File.Copy(attachment.SourceFileName, Path.Combine(directory, attachment.DestinationFileName), overwrite: true);
+                }
             }
             if (dataAttachments is not null)
             {
                 foreach (Attachment attachment in dataAttachments)
-                    AttachFile(url, headerID, attachment.UniqueId, File.ReadAllBytes(attachment.SourceFileName), attachment.DestinationFileName);
+                {
+                    directoryName = Path.GetDirectoryName(attachment.HeaderIdDirectory.Replace("Header", "Data"));
+                    if (string.IsNullOrEmpty(directoryName))
+                        continue;
+                    directory = Path.Combine(directoryName, attachment.AttachmentId) ?? throw new Exception();
+                    if (!Directory.Exists(directory))
+                        _ = Directory.CreateDirectory(directory);
+                    File.Copy(attachment.SourceFileName, Path.Combine(directory, attachment.DestinationFileName), overwrite: true);
+                }
+            }
+            if (headerAttachments is not null)
+            {
+                foreach (Attachment attachment in headerAttachments)
+                    AttachFile(url, attachment);
+            }
+            if (dataAttachments is not null)
+            {
+                foreach (Attachment attachment in dataAttachments)
+                    AttachFile(url, attachment);
             }
             //MessageBox.Show(r.ToString());
         }
         catch (Exception e)
         {
-            Exception exception = e;
+            Exception? exception = e;
             StringBuilder stringBuilder = new();
             while (exception is not null)
             {

Adaptation/Shared/ProcessDataStandardFormatMapping.cs

@@ -0,0 +1,33 @@
+using System.Collections.ObjectModel;
+
+namespace Adaptation.Shared;
+
+public class ProcessDataStandardFormatMapping
+{
+
+    public ReadOnlyCollection<string> BackfillColumns { get; private set; }
+    public ReadOnlyCollection<int> ColumnIndices { get; private set; }
+    public ReadOnlyCollection<string> IgnoreColumns { get; private set; }
+    public ReadOnlyCollection<string> IndexOnlyColumns { get; private set; }
+    public ReadOnlyDictionary<string, string> KeyValuePairs { get; private set; }
+    public ReadOnlyCollection<string> NewColumnNames { get; private set; }
+    public ReadOnlyCollection<string> OldColumnNames { get; private set; }
+
+    public ProcessDataStandardFormatMapping(ReadOnlyCollection<string> backfillColumns,
+                                            ReadOnlyCollection<int> columnIndices,
+                                            ReadOnlyCollection<string> ignoreColumns,
+                                            ReadOnlyCollection<string> indexOnlyColumns,
+                                            ReadOnlyDictionary<string, string> keyValuePairs,
+                                            ReadOnlyCollection<string> newColumnNames,
+                                            ReadOnlyCollection<string> oldColumnNames)
+    {
+        BackfillColumns = backfillColumns;
+        ColumnIndices = columnIndices;
+        IgnoreColumns = ignoreColumns;
+        IndexOnlyColumns = indexOnlyColumns;
+        KeyValuePairs = keyValuePairs;
+        NewColumnNames = newColumnNames;
+        OldColumnNames = oldColumnNames;
+    }
+
+}

Adaptation/Shared/Test.cs

@@ -14,6 +14,7 @@ public enum Test
     CandelaPSL = 38,
     CandelaVerify = 37,
     CDE = 24,
+    Climatec = 54, //Largest
     CV = 3,
     DailyRPMAverage = 19,
     DailyRPMPLRatio = 20,
@@ -21,7 +22,7 @@ public enum Test
     Denton = 9,
     DiffusionLength = 45,
     GRATXTCenter = 51,
-    GRATXTEdge = 52, //Largest
+    GRATXTEdge = 52,
     GrowthRateXML = 50,
     Hall = 10,
     HgCV = 23,
@@ -38,6 +39,7 @@ public enum Test
     RPMPLRatio = 17,
     RPMXY = 15,
     SP1 = 8,
+    SRP2100 = 53,
     Tencor = 7,
     UV = 35,
     VerificationLehighton = 14,

Adaptation/_Tests/CreateSelfDescription/Production/v2.57.0/CDE4.cs

@@ -0,0 +1,65 @@
+#if v2_57_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_57_0;
+
+[TestClass]
+public class CDE4 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE4 EAFLoggingUnitTesting { get; private set; }
+
+    static CDE4() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE4() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE4(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE4(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__CDE4__RsM()
+    {
+        string check = "*.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.57.0/CDE5-EQPT.cs

@@ -0,0 +1,65 @@
+#if v2_57_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_57_0;
+
+[TestClass]
+public class CDE5_EQPT : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE5_EQPT EAFLoggingUnitTesting { get; private set; }
+
+    static CDE5_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE5_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE5_EQPT(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE5_EQPT(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__CDE5_EQPT__DownloadRsMFile()
+    {
+        string check = "CDE_Logs|WaferMeasurementData.log|.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.57.0/CDE5.cs

@@ -0,0 +1,65 @@
+#if v2_57_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_57_0;
+
+[TestClass]
+public class CDE5 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE5 EAFLoggingUnitTesting { get; private set; }
+
+    static CDE5() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE5() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE5(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE5(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__CDE5__RsM()
+    {
+        string check = "*.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.57.0/CDE6-EQPT.cs

@@ -0,0 +1,65 @@
+#if v2_57_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_57_0;
+
+[TestClass]
+public class CDE6_EQPT : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE6_EQPT EAFLoggingUnitTesting { get; private set; }
+
+    static CDE6_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE6_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE6_EQPT(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE6_EQPT(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__CDE6_EQPT__DownloadRsMFile()
+    {
+        string check = "CDE_Logs|WaferMeasurementData.log|.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.57.0/CDE6.cs

@@ -0,0 +1,65 @@
+#if v2_57_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_57_0;
+
+[TestClass]
+public class CDE6 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE6 EAFLoggingUnitTesting { get; private set; }
+
+    static CDE6() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE6() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE6(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE6(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__CDE6__RsM()
+    {
+        string check = "*.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.57.0/MET08RESIMAPCDE.cs

@@ -0,0 +1,182 @@
+#if v2_57_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_57_0;
+
+[TestClass]
+public class MET08RESIMAPCDE : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static MET08RESIMAPCDE EAFLoggingUnitTesting { get; private set; }
+
+    static MET08RESIMAPCDE() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public MET08RESIMAPCDE() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public MET08RESIMAPCDE(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new MET08RESIMAPCDE(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__MET08RESIMAPCDE__MoveMatchingFiles()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__MET08RESIMAPCDE__OpenInsightMetrologyViewer()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__MET08RESIMAPCDE__IQSSi()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__MET08RESIMAPCDE__OpenInsight()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__MET08RESIMAPCDE__OpenInsightMetrologyViewerAttachments()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__MET08RESIMAPCDE__APC()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__MET08RESIMAPCDE__SPaCe()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__MET08RESIMAPCDE__Processed()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__MET08RESIMAPCDE__Archive()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_57_0__MET08RESIMAPCDE__Dummy()
+    {
+        string check = "637400762024374000.zip";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.58.0/CDE4.cs

@@ -0,0 +1,65 @@
+#if v2_58_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_58_0;
+
+[TestClass]
+public class CDE4 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE4 EAFLoggingUnitTesting { get; private set; }
+
+    static CDE4() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE4() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE4(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE4(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__CDE4__RsM()
+    {
+        string check = "*.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.58.0/CDE5-EQPT.cs

@@ -0,0 +1,65 @@
+#if v2_58_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_58_0;
+
+[TestClass]
+public class CDE5_EQPT : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE5_EQPT EAFLoggingUnitTesting { get; private set; }
+
+    static CDE5_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE5_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE5_EQPT(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE5_EQPT(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__CDE5_EQPT__DownloadRsMFile()
+    {
+        string check = "CDE_Logs|WaferMeasurementData.log|.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.58.0/CDE5.cs

@@ -0,0 +1,65 @@
+#if v2_58_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_58_0;
+
+[TestClass]
+public class CDE5 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE5 EAFLoggingUnitTesting { get; private set; }
+
+    static CDE5() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE5() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE5(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE5(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__CDE5__RsM()
+    {
+        string check = "*.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.58.0/CDE6-EQPT.cs

@@ -0,0 +1,65 @@
+#if v2_58_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_58_0;
+
+[TestClass]
+public class CDE6_EQPT : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE6_EQPT EAFLoggingUnitTesting { get; private set; }
+
+    static CDE6_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE6_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE6_EQPT(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE6_EQPT(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__CDE6_EQPT__DownloadRsMFile()
+    {
+        string check = "CDE_Logs|WaferMeasurementData.log|.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.58.0/CDE6.cs

@@ -0,0 +1,65 @@
+#if v2_58_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_58_0;
+
+[TestClass]
+public class CDE6 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE6 EAFLoggingUnitTesting { get; private set; }
+
+    static CDE6() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE6() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE6(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE6(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__CDE6__RsM()
+    {
+        string check = "*.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.58.0/MET08RESIMAPCDE.cs

@@ -0,0 +1,182 @@
+#if v2_58_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_58_0;
+
+[TestClass]
+public class MET08RESIMAPCDE : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static MET08RESIMAPCDE EAFLoggingUnitTesting { get; private set; }
+
+    static MET08RESIMAPCDE() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public MET08RESIMAPCDE() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public MET08RESIMAPCDE(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new MET08RESIMAPCDE(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__MET08RESIMAPCDE__MoveMatchingFiles()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__MET08RESIMAPCDE__OpenInsightMetrologyViewer()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__MET08RESIMAPCDE__IQSSi()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__MET08RESIMAPCDE__OpenInsight()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__MET08RESIMAPCDE__OpenInsightMetrologyViewerAttachments()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__MET08RESIMAPCDE__APC()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__MET08RESIMAPCDE__SPaCe()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__MET08RESIMAPCDE__Processed()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__MET08RESIMAPCDE__Archive()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_58_0__MET08RESIMAPCDE__Dummy()
+    {
+        string check = "637400762024374000.zip";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/CDE4.cs

@@ -0,0 +1,65 @@
+#if true
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_59_0;
+
+[TestClass]
+public class CDE4 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE4 EAFLoggingUnitTesting { get; private set; }
+
+    static CDE4() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE4() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE4(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE4(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__CDE4__RsM()
+    {
+        string check = "*.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/CDE5-EQPT.cs

@@ -0,0 +1,65 @@
+#if true
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_59_0;
+
+[TestClass]
+public class CDE5_EQPT : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE5_EQPT EAFLoggingUnitTesting { get; private set; }
+
+    static CDE5_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE5_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE5_EQPT(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE5_EQPT(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__CDE5_EQPT__DownloadRsMFile()
+    {
+        string check = "CDE_Logs|WaferMeasurementData.log|.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/CDE5.cs

@@ -0,0 +1,65 @@
+#if true
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_59_0;
+
+[TestClass]
+public class CDE5 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE5 EAFLoggingUnitTesting { get; private set; }
+
+    static CDE5() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE5() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE5(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE5(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__CDE5__RsM()
+    {
+        string check = "*.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/CDE6-EQPT.cs

@@ -0,0 +1,65 @@
+#if true
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_59_0;
+
+[TestClass]
+public class CDE6_EQPT : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE6_EQPT EAFLoggingUnitTesting { get; private set; }
+
+    static CDE6_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE6_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE6_EQPT(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE6_EQPT(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__CDE6_EQPT__DownloadRsMFile()
+    {
+        string check = "CDE_Logs|WaferMeasurementData.log|.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/CDE6.cs

@@ -0,0 +1,65 @@
+#if true
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_59_0;
+
+[TestClass]
+public class CDE6 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static CDE6 EAFLoggingUnitTesting { get; private set; }
+
+    static CDE6() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public CDE6() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public CDE6(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new CDE6(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__CDE6__RsM()
+    {
+        string check = "*.RsM";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/MET08RESIMAPCDE.cs

@@ -0,0 +1,182 @@
+#if true
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_59_0;
+
+[TestClass]
+public class MET08RESIMAPCDE : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static MET08RESIMAPCDE EAFLoggingUnitTesting { get; private set; }
+
+    static MET08RESIMAPCDE() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public MET08RESIMAPCDE() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public MET08RESIMAPCDE(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new MET08RESIMAPCDE(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__MET08RESIMAPCDE__MoveMatchingFiles()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__MET08RESIMAPCDE__OpenInsightMetrologyViewer()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__MET08RESIMAPCDE__IQSSi()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__MET08RESIMAPCDE__OpenInsight()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__MET08RESIMAPCDE__OpenInsightMetrologyViewerAttachments()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__MET08RESIMAPCDE__APC()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__MET08RESIMAPCDE__SPaCe()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__MET08RESIMAPCDE__Processed()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__MET08RESIMAPCDE__Archive()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_59_0__MET08RESIMAPCDE__Dummy()
+    {
+        string check = "637400762024374000.zip";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs

@@ -1,3 +1,4 @@
+#if v2_36_1
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -17,7 +18,7 @@ public class CDE2 : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE2 EAFLoggingUnitTesting { get; private set; }
 
-    static CDE2() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE2() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE2() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -46,7 +47,7 @@ public class CDE2 : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -55,3 +56,4 @@ public class CDE2 : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs

@@ -1,3 +1,4 @@
+#if v2_36_1
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -18,7 +19,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE3_EQPT EAFLoggingUnitTesting { get; private set; }
 
-    static CDE3_EQPT() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE3_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE3_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -47,7 +48,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -61,3 +62,4 @@ public class CDE3_EQPT : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs

@@ -1,3 +1,4 @@
+#if v2_36_1
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -18,7 +19,7 @@ public class CDE3 : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE3 EAFLoggingUnitTesting { get; private set; }
 
-    static CDE3() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE3() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE3() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -47,7 +48,7 @@ public class CDE3 : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -61,3 +62,4 @@ public class CDE3 : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs

@@ -1,3 +1,4 @@
+#if v2_36_1
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -17,7 +18,7 @@ public class CDE5 : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE5 EAFLoggingUnitTesting { get; private set; }
 
-    static CDE5() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE5() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE5() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -46,7 +47,7 @@ public class CDE5 : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -55,3 +56,4 @@ public class CDE5 : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs

@@ -1,3 +1,4 @@
+#if v2_36_1
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -18,7 +19,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static MET08RESIMAPCDE EAFLoggingUnitTesting { get; private set; }
 
-    static MET08RESIMAPCDE() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static MET08RESIMAPCDE() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public MET08RESIMAPCDE() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -47,7 +48,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -60,7 +61,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -73,7 +74,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -86,7 +87,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -99,7 +100,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -112,7 +113,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -125,7 +126,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -138,7 +139,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -151,7 +152,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -165,3 +166,4 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE2.cs

@@ -1,3 +1,4 @@
+#if v2_39_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -17,7 +18,7 @@ public class CDE2 : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE2 EAFLoggingUnitTesting { get; private set; }
 
-    static CDE2() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE2() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE2() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -46,7 +47,7 @@ public class CDE2 : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -55,3 +56,4 @@ public class CDE2 : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3-EQPT.cs

@@ -1,3 +1,4 @@
+#if v2_39_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -18,7 +19,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE3_EQPT EAFLoggingUnitTesting { get; private set; }
 
-    static CDE3_EQPT() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE3_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE3_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -47,7 +48,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -61,3 +62,4 @@ public class CDE3_EQPT : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3.cs

@@ -1,3 +1,4 @@
+#if v2_39_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -18,7 +19,7 @@ public class CDE3 : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE3 EAFLoggingUnitTesting { get; private set; }
 
-    static CDE3() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE3() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE3() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -47,7 +48,7 @@ public class CDE3 : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -61,3 +62,4 @@ public class CDE3 : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE5.cs

@@ -1,3 +1,4 @@
+#if v2_39_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -17,7 +18,7 @@ public class CDE5 : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE5 EAFLoggingUnitTesting { get; private set; }
 
-    static CDE5() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE5() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE5() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -46,7 +47,7 @@ public class CDE5 : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -55,3 +56,4 @@ public class CDE5 : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIMAPCDE.cs

@@ -1,3 +1,4 @@
+#if v2_39_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -18,7 +19,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static MET08RESIMAPCDE EAFLoggingUnitTesting { get; private set; }
 
-    static MET08RESIMAPCDE() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static MET08RESIMAPCDE() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public MET08RESIMAPCDE() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -47,7 +48,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -60,7 +61,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -73,7 +74,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -86,7 +87,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -99,7 +100,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -112,7 +113,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -125,7 +126,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -138,7 +139,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -151,7 +152,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -165,3 +166,4 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE2.cs

@@ -1,3 +1,4 @@
+#if v2_43_2
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -17,7 +18,7 @@ public class CDE2 : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE2 EAFLoggingUnitTesting { get; private set; }
 
-    static CDE2() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE2() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE2() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -46,7 +47,7 @@ public class CDE2 : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -55,3 +56,4 @@ public class CDE2 : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3-EQPT.cs

@@ -1,3 +1,4 @@
+#if v2_43_2
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -18,7 +19,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE3_EQPT EAFLoggingUnitTesting { get; private set; }
 
-    static CDE3_EQPT() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE3_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE3_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -47,7 +48,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -61,3 +62,4 @@ public class CDE3_EQPT : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3.cs

@@ -1,3 +1,4 @@
+#if v2_43_2
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -18,7 +19,7 @@ public class CDE3 : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE3 EAFLoggingUnitTesting { get; private set; }
 
-    static CDE3() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE3() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE3() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -47,7 +48,7 @@ public class CDE3 : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -61,3 +62,4 @@ public class CDE3 : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE5.cs

@@ -1,3 +1,4 @@
+#if v2_43_2
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -17,7 +18,7 @@ public class CDE5 : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE5 EAFLoggingUnitTesting { get; private set; }
 
-    static CDE5() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE5() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE5() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -46,7 +47,7 @@ public class CDE5 : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -55,3 +56,4 @@ public class CDE5 : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/MET08RESIMAPCDE.cs

@@ -1,3 +1,4 @@
+#if v2_43_2
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -18,7 +19,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static MET08RESIMAPCDE EAFLoggingUnitTesting { get; private set; }
 
-    static MET08RESIMAPCDE() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static MET08RESIMAPCDE() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public MET08RESIMAPCDE() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -47,7 +48,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -60,7 +61,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -73,7 +74,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -86,7 +87,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -99,7 +100,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -112,7 +113,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -125,7 +126,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -138,7 +139,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -151,7 +152,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -164,7 +165,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -178,3 +179,4 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5-EQPT.cs

@@ -1,3 +1,4 @@
+#if v2_43_3
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -18,7 +19,7 @@ public class CDE5_EQPT : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE5_EQPT EAFLoggingUnitTesting { get; private set; }
 
-    static CDE5_EQPT() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE5_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE5_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -47,7 +48,7 @@ public class CDE5_EQPT : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -61,3 +62,4 @@ public class CDE5_EQPT : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5.cs

@@ -1,3 +1,4 @@
+#if v2_43_3
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -18,7 +19,7 @@ public class CDE5 : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE5 EAFLoggingUnitTesting { get; private set; }
 
-    static CDE5() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE5() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE5() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -47,7 +48,7 @@ public class CDE5 : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -61,3 +62,4 @@ public class CDE5 : EAFLoggingUnitTesting
     }
 
 }
+#endif

Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE2.cs

@@ -1,3 +1,4 @@
+#if v2_43_4
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -18,7 +19,7 @@ public class CDE2 : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static CDE2 EAFLoggingUnitTesting { get; private set; }
 
-    static CDE2() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+    static CDE2() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public CDE2() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -47,7 +48,7 @@ public class CDE2 : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -61,3 +62,4 @@ public class CDE2 : EAFLoggingUnitTesting
     }
 
 }
+#endif