Infineon.EAF.Runtime v2.61.1

Synced with other adaptations
2025-10-15 07:47:59 -07:00 · 2025-10-15 07:47:45 -07:00 · 2025-06-16 11:31:27 -07:00 · 2025-06-16 11:31:20 -07:00
58 changed files with 3690 additions and 1652 deletions
--- a/Adaptation/.editorconfig
+++ b/Adaptation/.editorconfig
@ -109,7 +109,7 @@ dotnet_diagnostic.CA2254.severity = none # CA2254: The logging message template
 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.IDE0005.severity = none # 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
@ -121,6 +121,8 @@ dotnet_diagnostic.IDE0290.severity = none # Use primary constructor [Distance]cs
 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.MSTEST0015.severity = none # MSTEST0015: Test method {method} should not be ignored
+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
--- a/Adaptation/.vscode/launch.json
+++ b/Adaptation/.vscode/launch.json
@ -1,10 +1,43 @@
 {
  "configurations": [
+    {
+      "mode": "debug",
+      "name": "Go launch file",
+      "program": "${file}",
+      "request": "launch",
+      "type": "go"
+    },
+    {
+      "name": "node Launch Current Opened File",
+      "program": "${file}",
+      "request": "launch",
+      "type": "node"
+    },
+    {
+      "cwd": "${workspaceFolder}",
+      "internalConsoleOptions": "neverOpen",
+      "name": "Debug File",
+      "program": "${file}",
+      "request": "launch",
+      "stopOnEntry": false,
+      "type": "bun",
+      "watchMode": false
+    },
+    {
+      "cwd": "${workspaceFolder}",
+      "internalConsoleOptions": "neverOpen",
+      "name": "Run File",
+      "noDebug": true,
+      "program": "${file}",
+      "request": "launch",
+      "type": "bun",
+      "watchMode": false
+    },
    {
      "name": ".NET Core Attach",
-      "type": "coreclr",
+      "processId": 32760,
      "request": "attach",
-      "processId": 23636
+      "type": "coreclr"
    }
  ]
-}
+}
--- a/Adaptation/.vscode/tasks.json
+++ b/Adaptation/.vscode/tasks.json
@ -1,19 +1,134 @@
 {
    "version": "2.0.0",
+    "inputs": [
+        {
+            "default": "Development",
+            "description": "Which ASP Net Core Environment?",
+            "id": "ASPNETCORE_ENVIRONMENT",
+            "options": [
+                "Development",
+                "Production"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "{AssemblyTitle}",
+            "description": "What Assembly Title?",
+            "id": "AssemblyTitle",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.BuildId}",
+            "description": "Which Build BuildId?",
+            "id": "Build.BuildId",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.Reason}",
+            "description": "Which Build Reason?",
+            "id": "Build.Reason",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.Repository.Id}",
+            "description": "Which Build Repository Id?",
+            "id": "Build.Repository.Id",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.Repository.Name}",
+            "description": "Which Build Repository Name?",
+            "id": "Build.Repository.Name",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.SourceVersion}",
+            "description": "Which Build Source Version?",
+            "id": "Build.SourceVersion",
+            "type": "promptString"
+        },
+        {
+            "default": "Debug",
+            "description": "Which Configuration?",
+            "id": "Configuration",
+            "options": [
+                "Debug",
+                "Release"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "net8.0",
+            "description": "Which Core Version?",
+            "id": "CoreVersion",
+            "options": [
+                "net8.0"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe",
+            "description": "Which MS Build?",
+            "id": "MSBuild",
+            "type": "promptString"
+        },
+        {
+            "default": "https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/",
+            "description": "Which Nuget Source?",
+            "id": "NugetSource",
+            "type": "promptString"
+        },
+        {
+            "default": "win-x64",
+            "description": "Which Runtime?",
+            "id": "Runtime",
+            "options": [
+                "win-x64",
+                "win-x32",
+                "linux-x64",
+                "linux-x32"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "L:/",
+            "description": "Which System DefaultWorkingDirectory?",
+            "id": "System.DefaultWorkingDirectory",
+            "options": [
+                "L:/",
+                "D:/",
+                "C:/"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "v4.8",
+            "description": "Which Core Target Framework Version?",
+            "id": "TargetFrameworkVersion",
+            "options": [
+                "v4.8"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "{UserSecretsId}",
+            "description": "Which Core User Secrets Id?",
+            "id": "UserSecretsId",
+            "type": "promptString"
+        }
+    ],
    "tasks": [
        {
            "label": "Build",
            "command": "dotnet",
            "type": "process",
            "args": [
-                "build",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "build"
            ],
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Test-Debug",
+            "label": "Test Debug",
            "command": "dotnet",
            "type": "process",
            "args": [
@ -24,7 +139,7 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Test-Release",
+            "label": "Test Release",
            "command": "dotnet",
            "type": "process",
            "args": [
@ -77,13 +192,33 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Project",
+            "label": "Code Project",
            "type": "shell",
            "command": "code ../MET08RESISRP2100.csproj",
            "problemMatcher": []
        },
        {
-            "label": "Git Config",
+            "label": "Code Read Me",
+            "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/MET08RESISRP2100",
+                "Day-Helper-2025-03-20",
+                "false",
+                "4"
+            ],
+            "problemMatcher": []
+        },
+        {
+            "label": "Code Git Config",
            "type": "shell",
            "command": "code ../.git/config",
            "problemMatcher": []
--- a/Adaptation/FileHandlers/APC/FileRead.cs
+++ b/Adaptation/FileHandlers/APC/FileRead.cs
@ -14,7 +14,7 @@ namespace Adaptation.FileHandlers.APC;
 public class FileRead : Shared.FileRead, IFileRead
 {

-    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<string>> staticRuns, bool useCyclicalForDescription, bool 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;
@ -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), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/Archive/FileRead.cs
+++ b/Adaptation/FileHandlers/Archive/FileRead.cs
@ -18,7 +18,7 @@ public class FileRead : Shared.FileRead, IFileRead
    private readonly string _JobIdParentDirectory;
    private readonly string _JobIdArchiveParentDirectory;

-    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<string>> staticRuns, bool useCyclicalForDescription, bool 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;
@ -144,15 +144,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), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/CellInstanceConnectionName.cs
+++ b/Adaptation/FileHandlers/CellInstanceConnectionName.cs
@ -9,7 +9,7 @@ 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, int? connectionCount)
+    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
        {
--- a/Adaptation/FileHandlers/Dummy/FileRead.cs
+++ b/Adaptation/FileHandlers/Dummy/FileRead.cs
@ -23,7 +23,7 @@ public class FileRead : Shared.FileRead, IFileRead
    private int _LastDummyRunIndex;
    private readonly string[] _CellNames;

-    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<string>> staticRuns, bool useCyclicalForDescription, bool 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;
--- a/Adaptation/FileHandlers/IQSSi/FileRead.cs
+++ b/Adaptation/FileHandlers/IQSSi/FileRead.cs
@ -14,7 +14,7 @@ namespace Adaptation.FileHandlers.IQSSi;
 public class FileRead : Shared.FileRead, IFileRead
 {

-    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<string>> staticRuns, bool useCyclicalForDescription, bool 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;
@ -103,7 +103,7 @@ public class FileRead : Shared.FileRead, IFileRead
        return results;
    }

-    private void FileCopy<T>(string reportFullPath, DateTime dateTime, List<T> descriptions) where T : Shared.Properties.IDescription
+    private void WriteFile<T>(string reportFullPath, DateTime dateTime, ProcessDataStandardFormat processDataStandardFormat, List<T> descriptions) where T : Shared.Properties.IDescription
    {
        bool isDummyRun = false;
        string successDirectory = string.Empty;
@ -111,23 +111,24 @@ public class FileRead : Shared.FileRead, IFileRead
        string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
        if (!Directory.Exists(duplicateDirectory))
            _ = Directory.CreateDirectory(duplicateDirectory);
-        string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
-        File.Copy(reportFullPath, duplicateFile, overwrite: true);
+        string duplicateFile = Path.Combine(duplicateDirectory, $"{Path.GetFileName(reportFullPath)}.xml");
+        string xml = ProcessDataStandardFormat.GetXml(processDataStandardFormat);
+        File.WriteAllText(duplicateFile, xml);
        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);
+        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>());
+            WriteFile(reportFullPath, dateTime, processDataStandardFormat, descriptions);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs
+++ b/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs
@ -5,17 +5,73 @@ 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;
 using System.Text.Json;
 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, int? connectionCount, 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 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;
+        }
+
+    }
+
+    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;
@ -41,7 +97,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()
    {
@ -88,7 +145,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);
@ -104,7 +161,33 @@ public class FileRead : Shared.FileRead, IFileRead
        return results;
    }

-    private static List<string> GetSearchDirectories(int numberLength, string parentDirectory)
+    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);
@ -115,10 +198,138 @@ public class FileRead : Shared.FileRead, IFileRead
            results.Add(directory);
        }
        results.Sort();
+        return results.AsReadOnly();
+    }
+
+    private static void CreatePointerFile(int numberLength, string parentDirectory, ReadOnlyCollection<string> matchingFiles)
+    {
+        string checkFile;
+        string writeFile;
+        string? directoryName;
+        int parentDirectoryLength = parentDirectory.Length;
+        foreach (string matchingFile in matchingFiles)
+        {
+            directoryName = Path.GetDirectoryName(matchingFile);
+            if (directoryName is null)
+                continue;
+            checkFile = $"{matchingFile[0]}{directoryName.Substring(parentDirectoryLength + numberLength + 1)}";
+            writeFile = Path.Combine(parentDirectory, $"{directoryName.Substring(parentDirectory.Length + 1, numberLength)}.txt");
+            if (File.Exists(writeFile))
+                continue;
+            File.AppendAllLines(writeFile, new string[] { parentDirectory, matchingFile, directoryName, checkFile });
+        }
+    }
+
+    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;
+            if (processDataStandardFormat.InputPDSF is null)
+                File.Move(preWith.MatchingFile, preWith.CheckFile);
+            else
+            {
+                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, Array.Empty<Test>(), Array.Empty<JsonElement>(), new List<FileInfo>());
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        _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);
+        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)!");
+        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 List<string> GetMatchingFiles(long ticks, string reportFullPath, List<string> searchDirectories)
+    private ReadOnlyCollection<string> GetMatchingFiles(long ticks, string reportFullPath, ReadOnlyCollection<string> searchDirectories)
    {
        List<string> results = new();
        string[] found;
@ -137,129 +348,7 @@ public class FileRead : Shared.FileRead, IFileRead
                    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.Count != 0)
-        {
-            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;
-        int parentDirectoryLength = parentDirectory.Length;
-        foreach (string matchingFile in matchingFiles)
-        {
-            directoryName = Path.GetDirectoryName(matchingFile);
-            if (directoryName is null)
-                continue;
-            checkFile = $"{matchingFile[0]}{directoryName.Substring(parentDirectoryLength + numberLength + 1)}";
-            writeFile = Path.Combine(parentDirectory, $"{directoryName.Substring(parentDirectory.Length + 1, numberLength)}.txt");
-            if (File.Exists(writeFile))
-                continue;
-            File.AppendAllLines(writeFile, new string[] { parentDirectory, matchingFile, directoryName, checkFile });
-        }
-#nullable disable
-    }
-
-    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);
-        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);
-        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);
-        return results;
+        return results.AsReadOnly();
    }

 }
--- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs
+++ b/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,10 +17,9 @@ public class FileRead : Shared.FileRead, IFileRead
 {

    private readonly string _IqsConnectionString;
-    private readonly string _OpenInsightFilePattern;
    private readonly string _OpenInsightApiECDirectory;

-    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<string>> staticRuns, bool useCyclicalForDescription, bool 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;
@ -34,7 +32,6 @@ public class FileRead : Shared.FileRead, IFileRead
        if (!_IsDuplicator)
            throw new Exception(cellInstanceConnectionName);
        _IqsConnectionString = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "IQS.ConnectionString");
-        _OpenInsightFilePattern = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.FilePattern");
        _OpenInsightApiECDirectory = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.Api.EC.Directory");
    }

@ -113,83 +110,61 @@ public class FileRead : Shared.FileRead, IFileRead
        return results;
    }

-    private static string GetLines(List<json.Description> descriptions)
-    {
-        StringBuilder results = new();
-        json.Description x = descriptions[0];
-        char del = x.MesEntity == x.Reactor ? '\t' : '~';
-        _ = results.Append(x.Date).Append(del).
-            Append(x.Employee).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);
-        return results.ToString();
-    }
-
-    private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, string logistics, List<json.Description> descriptions, Test[] tests)
+    private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, List<json.Description> descriptions, Test[] tests)
    {
+        string duplicateFile;
        bool isDummyRun = false;
        List<(Shared.Properties.IScopeInfo, string)> collection = new();
        string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
        if (!Directory.Exists(duplicateDirectory))
            _ = Directory.CreateDirectory(duplicateDirectory);
        string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
-        if (!Directory.Exists(Path.Combine(duplicateDirectory, "1")))
+        if (descriptions.Count == 0 || tests.Length == 0)
+            duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
+        else
        {
-            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);
-        }
-        string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
-        if (descriptions.Count != 0 && tests.Length != 0)
-        {
-            string lines = GetLines(descriptions);
-            if (!string.IsNullOrEmpty(lines))
+            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))
            {
-                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 = null;
-                else
-                    (subGroupId, int? _, string _) = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0], breakAfter, preWait);
-                if (subGroupId is null)
-                    collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), lines));
-                else
-                    collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} {_OpenInsightFilePattern}"), lines));
-                if (_StaticRuns.TryGetValue(_Logistics.Sequence, out List<string> values))
-                {
-                    if (values.Count != 1)
-                        throw new Exception($"{nameof(_StaticRuns)} {values.Count} != 1 {_Logistics.Sequence}!");
-                    values[0] = $"{values[0]}|{subGroupId}";
-                }
-                string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
-                FromIQS.Save(_OpenInsightApiECDirectory, _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, 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);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
        // List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
        List<json.Description> descriptions = json.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, descriptions, tests);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs
+++ b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs
@ -227,7 +227,7 @@ public class FromIQS
    private static void FlagDuplicates(string connectionString, string json)
    {
        JsonElement[]? jsonElements = JsonSerializer.Deserialize<JsonElement[]>(json);
-        JsonSerializerOptions jsonSerializerOptions = new() { PropertyNameCaseInsensitive = true};
+        JsonSerializerOptions jsonSerializerOptions = new() { PropertyNameCaseInsensitive = true };
        if (jsonElements is not null && jsonElements.Length != 0 && jsonElements[0].ValueKind == JsonValueKind.Object)
        {
            Root? root;
@ -324,77 +324,18 @@ public class FromIQS
        return new(result, count, commandText);
    }

-    private static string GetJson(Logistics logistics, string logisticLines, json.Description description)
+    internal static void Save(string openInsightApiECDirectory, Logistics logistics, string reportFullPath, json.Description description, long? subGroupId, string weekOfYear)
    {
-        string result;
-        StringBuilder stringBuilder = new();
-        var @object = new
-        {
-            description.MesEntity,
-            description.Employee,
-            description.Layer,
-            description.PSN,
-            description.RDS,
-            description.Reactor,
-            description.Recipe,
-            description.Zone,
-            logistics.DateTimeFromSequence.Ticks
-        };
-        string[] pair;
-        string safeValue;
-        string[] segments;
-        string serializerValue;
-        foreach (string line in logisticLines.Split(new string[] { Environment.NewLine }, StringSplitOptions.None))
-        {
-            segments = line.Split('\t');
-            if (segments.Length < 2)
-                continue;
-            segments = segments[1].Split(';');
-            _ = stringBuilder.Append('{');
-            foreach (string segment in segments)
-            {
-                pair = segment.Split('=');
-                if (pair.Length != 2 || pair[0].Length < 3)
-                    continue;
-                serializerValue = JsonSerializer.Serialize(pair[1]);
-                safeValue = serializerValue.Substring(1, serializerValue.Length - 2);
-                _ = stringBuilder.Append('"').Append(pair[0].Substring(2)).Append('"').Append(':').Append('"').Append(safeValue).Append('"').Append(',');
-            }
-            if (stringBuilder.Length > 0)
-                _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
-            _ = stringBuilder.Append('}').Append(',');
-        }
-        if (stringBuilder.Length > 0)
-            _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
-        _ = stringBuilder.Append(']').Append('}');
-        _ = stringBuilder.Insert(0, ",\"Logistics\":[");
-        string json = JsonSerializer.Serialize(@object);
-        _ = stringBuilder.Insert(0, json.Substring(0, json.Length - 1));
-        JsonElement? jsonElement = JsonSerializer.Deserialize<JsonElement>(stringBuilder.ToString());
-        result = jsonElement is null ? "{}" : JsonSerializer.Serialize(jsonElement, new JsonSerializerOptions { WriteIndented = true });
-        return result;
-    }
-
-    internal static void Save(string openInsightApiECDirectory, Logistics logistics, string reportFullPath, string logisticLines, json.Description description, string lines, long? subGroupId, string weekOfYear)
-    {
-        string checkFile;
        string fileName = Path.GetFileName(reportFullPath);
-        string json = GetJson(logistics, logisticLines, description);
        string? ecPathRoot = Path.GetPathRoot(openInsightApiECDirectory);
        bool ecExists = ecPathRoot is not null && Directory.Exists(ecPathRoot);
        string weekYear = $"{logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}";
        string ecDirectory = Path.Combine(openInsightApiECDirectory, weekYear, $"-{description.PSN}", $"-{description.Reactor}", $"-{description.RDS}", $"-{subGroupId}");
        if (ecExists && !Directory.Exists(ecDirectory))
            _ = Directory.CreateDirectory(ecDirectory);
-        checkFile = Path.Combine(ecDirectory, fileName);
+        string checkFile = Path.Combine(ecDirectory, fileName);
        if (ecExists && !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(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.json");
-        if (ecExists && !File.Exists(checkFile))
-            File.WriteAllText(checkFile, json);
    }

    private static string GetCommandText(string[] iqsCopyValues)
--- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs
+++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs
@ -19,7 +19,7 @@ public class FileRead : Shared.FileRead, IFileRead
    private readonly string _OpenInsightMetrologyViewerAPI;
    private readonly string _OpenInsightMetrologyViewerFileShare;

-    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<string>> staticRuns, bool useCyclicalForDescription, bool 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;
@ -110,10 +110,10 @@ public class FileRead : Shared.FileRead, IFileRead
        return results;
    }

-    private void SendData(string reportFullPath, DateTime dateTime, List<json.Description> descriptions)
+    private void SendData(string reportFullPath, DateTime dateTime, JsonElement[] jsonElements, List<json.Description> descriptions)
    {
        string checkDirectory;
-        WSRequest wsRequest = new(this, _Logistics, descriptions);
+        WSRequest wsRequest = new(this, _Logistics, jsonElements, descriptions);
        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());
@ -121,16 +121,16 @@ public class FileRead : Shared.FileRead, IFileRead
            _ = 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)
-            throw new Exception(wsResults.ToString());
-        _Log.Debug(wsResults.HeaderID);
+        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(jsonResults);
+            _StaticRuns[_Logistics.Sequence].Add(wsResults);
        }
-        checkDirectory = Path.Combine(directory, $"-{wsResults.HeaderID}");
+        checkDirectory = Path.Combine(directory, $"-{wsResults.HeaderId}");
        if (!Directory.Exists(checkDirectory))
            _ = Directory.CreateDirectory(checkDirectory);
        File.Copy(reportFullPath, Path.Combine(checkDirectory, Path.GetFileName(reportFullPath)), overwrite: true);
@ -139,15 +139,16 @@ 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);
+        string[] lines = File.ReadAllLines(reportFullPath);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines);
+        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
        SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(reportFullPath, lines, processDataStandardFormat);
        List<json.Description> descriptions = json.ProcessData.GetDescriptions(jsonElements);
        Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            SendData(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
+            SendData(reportFullPath, dateTime, jsonElements, descriptions);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs
+++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs
@ -34,7 +34,7 @@ public class WSRequest
    [Obsolete("For json")] public WSRequest() { }

 #pragma warning disable IDE0060
-    internal WSRequest(IFileRead fileRead, Logistics logistics, List<json.Description> descriptions, string processDataStandardFormat = null)
+    internal WSRequest(IFileRead fileRead, Logistics logistics, JsonElement[] jsonElements, List<json.Description> descriptions, string processDataStandardFormat = null)
 #pragma warning restore IDE0060
    {
        Id = -1;
@ -77,32 +77,33 @@ public class WSRequest
            throw new Exception();
    }

-    internal static long GetHeaderId(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, string openInsightMetrologyViewerFileShare, int weekOfYear, string json, List<json.Description> descriptions)
+    internal static long GetHeaderId(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, string openInsightMetrologyViewerFileShare, int weekOfYear, WS.Results results, JsonElement[] jsonElements, List<json.Description> descriptions)
    {
        long result;
-        if (string.IsNullOrEmpty(json))
+        if (results is not null && results.HeaderId is not null)
+            result = results.HeaderId.Value;
+        else
        {
-            WSRequest wsRequest = new(fileRead, logistics, descriptions);
+            WSRequest wsRequest = new(fileRead, logistics, jsonElements, descriptions);
            string directory = Path.Combine(openInsightMetrologyViewerFileShare, logistics.DateTimeFromSequence.Year.ToString(), $"WW{weekOfYear:00}");
-            (json, WS.Results wsResults) = WS.SendData(openInsightMetrologyViewerAPI, logistics.Sequence, directory, wsRequest);
-            if (!wsResults.Success)
+            (_, 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 });
-        result = metrologyWSRequest.HeaderID;
        return result;
    }

 #pragma warning disable IDE0060
-    internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, List<json.Description> descriptions, string matchDirectory, string subGroupId, long headerId, string headerIdDirectory)
+    internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, List<json.Description> descriptions, string matchDirectory, WS.Results results, string headerIdDirectory)
 #pragma warning restore IDE0060
    {
        string[] jsonFiles = Directory.GetFiles(matchDirectory, "*.json", SearchOption.TopDirectoryOnly);
        if (jsonFiles.Length != 1)
-            throw new Exception($"Invalid source file count for <{headerId}>!");
+            throw new Exception($"Invalid source file count for <{results.HeaderId}>!");
        List<WS.Attachment> headerAttachments = new()
        {
-            new WS.Attachment(subGroupId, headerId, headerIdDirectory, descriptions[0].HeaderUniqueId, "Data.json", jsonFiles.First())
+            new WS.Attachment(results, headerIdDirectory, $"{logistics.JobID}_{logistics.MID}_{logistics.DateTimeFromSequence:yyyyMMddHHmmssffff}", "Data.json", jsonFiles.First())
        };
        WS.AttachFiles(openInsightMetrologyViewerAPI, headerAttachments, dataAttachments: null);
    }
--- a/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs
+++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs
@ -18,7 +18,7 @@ public class FileRead : Shared.FileRead, IFileRead
    private readonly string _OpenInsightMetrologyViewerAPI;
    private readonly string _OpenInsightMetrologyViewerFileShare;

-    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<string>> staticRuns, bool useCyclicalForDescription, bool 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;
@ -135,32 +135,27 @@ public class FileRead : Shared.FileRead, IFileRead
        return result;
    }

-    private void PostOpenInsightMetrologyViewerAttachments(List<json.Description> descriptions)
+    private void PostOpenInsightMetrologyViewerAttachments(JsonElement[] jsonElements, List<json.Description> descriptions)
    {
-        string? json;
-        string? subGroupId;
+        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[] matchDirectories = GetInProcessDirectory(jobIdDirectory);
-        if (!_StaticRuns.TryGetValue(_Logistics.Sequence, out List<string>? values))
-            (json, subGroupId) = (null, null);
+        if (!_StaticRuns.TryGetValue(_Logistics.Sequence, out List<Shared.Metrology.WS.Results>? wsResults))
+            results = null;
        else
        {
-            if (values.Count != 1)
-                throw new Exception($"{nameof(_StaticRuns)} {values.Count} != 1 {_Logistics.Sequence}!");
-            string[] segments = values[0].Split(new string[] { "|" }, StringSplitOptions.None);
-            json = segments[0];
-            subGroupId = segments.Length > 1 ? segments[1] : null;
-            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];
        }
        int weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
-        long headerId = !_IsEAFHosted ? -1 : OpenInsightMetrologyViewer.WSRequest.GetHeaderId(this, _Logistics, _OpenInsightMetrologyViewerAPI, _OpenInsightMetrologyViewerFileShare, weekOfYear, json, descriptions);
+        long headerId = !_IsEAFHosted ? -1 : OpenInsightMetrologyViewer.WSRequest.GetHeaderId(this, _Logistics, _OpenInsightMetrologyViewerAPI, _OpenInsightMetrologyViewerFileShare, weekOfYear, results, jsonElements, 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], subGroupId, headerId, headerIdDirectory);
+        OpenInsightMetrologyViewer.WSRequest.PostOpenInsightMetrologyViewerAttachments(this, _Logistics, _OpenInsightMetrologyViewerAPI, descriptions, matchDirectories[0], results, headerIdDirectory);
    }

 #pragma warning disable IDE0060
@ -168,15 +163,16 @@ public class FileRead : Shared.FileRead, IFileRead
 #pragma warning restore IDE0060
    {
        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
-        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
+        string[] lines = File.ReadAllLines(reportFullPath);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines);
+        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
        SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(reportFullPath, lines, processDataStandardFormat);
        List<json.Description> descriptions = json.ProcessData.GetDescriptions(jsonElements);
        Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            PostOpenInsightMetrologyViewerAttachments(descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
+            PostOpenInsightMetrologyViewerAttachments(jsonElements, descriptions);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/Processed/FileRead.cs
+++ b/Adaptation/FileHandlers/Processed/FileRead.cs
@ -17,7 +17,7 @@ public class FileRead : Shared.FileRead, IFileRead
    private readonly string _JobIdParentDirectory;
    private readonly string _JobIdProcessParentDirectory;

-    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<string>> staticRuns, bool useCyclicalForDescription, bool 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;
@ -109,7 +109,7 @@ public class FileRead : Shared.FileRead, IFileRead
    }

 #pragma warning disable IDE0060
-    private void DirectoryMove(string reportFullPath, DateTime dateTime, List<json.Description> descriptions)
+    private void DirectoryMove(string reportFullPath, DateTime dateTime, JsonElement[] jsonElements, List<json.Description> descriptions)
 #pragma warning restore IDE0060
    {
        FileInfo fileInfo = new(reportFullPath);
@ -122,40 +122,68 @@ public class FileRead : Shared.FileRead, IFileRead
            throw new Exception("Didn't find directory by logistics sequence");
        if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime)
            File.SetLastWriteTime(reportFullPath, fileInfo.CreationTime);
-        OpenInsightMetrologyViewer.WSRequest wsRequest = new(this, _Logistics, descriptions);
+        OpenInsightMetrologyViewer.WSRequest wsRequest = new(this, _Logistics, jsonElements, descriptions);
        JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true };
        string json = JsonSerializer.Serialize(wsRequest, wsRequest.GetType(), jsonSerializerOptions);
        string directoryName = $"{Path.GetFileName(matchDirectories[0]).Split(new string[] { logisticsSequence }, StringSplitOptions.None)[0]}{_Logistics.DateTimeFromSequence:yyyy-MM-dd_hh;mm_tt_}{DateTime.Now.Ticks - _Logistics.Sequence}";
        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);
+        string[] lines = File.ReadAllLines(reportFullPath);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines);
+        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
        SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(reportFullPath, lines, processDataStandardFormat);
        List<json.Description> descriptions = json.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), tests, jsonElements, new List<FileInfo>());
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            DirectoryMove(reportFullPath, dateTime, descriptions);
+            DirectoryMove(reportFullPath, dateTime, jsonElements, descriptions);
        else if (!_IsEAFHosted)
        {
-            OpenInsightMetrologyViewer.WSRequest wsRequest = new(this, _Logistics, descriptions);
+            OpenInsightMetrologyViewer.WSRequest wsRequest = new(this, _Logistics, jsonElements, descriptions);
            JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true };
-            string json = JsonSerializer.Serialize(wsRequest, wsRequest.GetType(), jsonSerializerOptions);
+            string check = JsonSerializer.Serialize(wsRequest, wsRequest.GetType(), jsonSerializerOptions);
            string jsonFileName = Path.ChangeExtension(reportFullPath, ".json");
            string historicalText = File.ReadAllText(jsonFileName);
-            if (json != historicalText)
+            if (check != historicalText)
                throw new Exception("File doesn't match historical!");
        }
        return results;
--- a/Adaptation/FileHandlers/SPaCe/FileRead.cs
+++ b/Adaptation/FileHandlers/SPaCe/FileRead.cs
@ -14,7 +14,7 @@ namespace Adaptation.FileHandlers.SPaCe;
 public class FileRead : Shared.FileRead, IFileRead
 {

-    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<string>> staticRuns, bool useCyclicalForDescription, bool 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;
@ -117,15 +117,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), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/csv/Description.cs
+++ b/Adaptation/FileHandlers/csv/Description.cs
@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
+using System.Text.Json.Serialization;

 namespace Adaptation.FileHandlers.csv;

@ -23,6 +24,8 @@ public class Description : IDescription, Shared.Properties.IDescription
    public string ProcessJobID { get; set; }
    public string MID { get; set; }
    //
+    public string Reactor { get; set; }
+    //
    public string RDS { get; set; }
    //
    public string Path { get; set; }
@ -57,6 +60,7 @@ public class Description : IDescription, Shared.Properties.IDescription
        List<string> results = new()
        {
            nameof(RDS),
+            nameof(Reactor),
        };
        return results;
    }
@ -183,6 +187,7 @@ public class Description : IDescription, Shared.Properties.IDescription
            MID = logistics.MID,
            //
            RDS = nameof(RDS),
+            Reactor = nameof(Reactor),
            //
            Path = nameof(Path),
        };
@ -191,4 +196,16 @@ public class Description : IDescription, Shared.Properties.IDescription

    internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt";

+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Description))]
+internal partial class CsvDescriptionSourceGenerationContext : JsonSerializerContext
+{
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Description[]))]
+internal partial class CsvDescriptionArraySourceGenerationContext : JsonSerializerContext
+{
 }
--- a/Adaptation/FileHandlers/csv/FileRead.cs
+++ b/Adaptation/FileHandlers/csv/FileRead.cs
@ -14,7 +14,7 @@ public class FileRead : Shared.FileRead, IFileRead

    private long? _TickOffset;

-    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<string>> staticRuns, bool useCyclicalForDescription, bool 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;
--- a/Adaptation/FileHandlers/csv/ProcessData.cs
+++ b/Adaptation/FileHandlers/csv/ProcessData.cs
@ -26,7 +26,6 @@ public partial class ProcessData : IProcessData

    public ProcessData(IFileRead fileRead, Logistics logistics, List<FileInfo> fileInfoCollection, long tickOffset)
    {
-        fileInfoCollection.Clear();
        _Details = new List<object>();
        _Log = LogManager.GetLogger(typeof(ProcessData));
        _ = Parse(fileRead, logistics, fileInfoCollection);
@ -119,12 +118,11 @@ public partial class ProcessData : IProcessData
    {
        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);
+            description = JsonSerializer.Deserialize(jsonElement.ToString(), CsvDescriptionSourceGenerationContext.Default.Description);
            if (description is null)
                continue;
            results.Add(description);
--- a/Adaptation/FileHandlers/json/Description.cs
+++ b/Adaptation/FileHandlers/json/Description.cs
@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
+using System.Text.Json.Serialization;

 namespace Adaptation.FileHandlers.json;

@ -252,4 +253,16 @@ public class Description : IDescription, Shared.Properties.IDescription

    internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt";

+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Description))]
+internal partial class JsonDescriptionSourceGenerationContext : JsonSerializerContext
+{
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Description[]))]
+internal partial class JsonDescriptionArraySourceGenerationContext : JsonSerializerContext
+{
 }
--- a/Adaptation/FileHandlers/json/FileRead.cs
+++ b/Adaptation/FileHandlers/json/FileRead.cs
@ -15,7 +15,7 @@ public class FileRead : Shared.FileRead, IFileRead

    private long? _TickOffset;

-    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<string>> staticRuns, bool useCyclicalForDescription, bool 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;
--- a/Adaptation/FileHandlers/json/ProcessData.cs
+++ b/Adaptation/FileHandlers/json/ProcessData.cs
@ -42,7 +42,6 @@ public partial class ProcessData : IProcessData
    public ProcessData(IFileRead fileRead, Logistics logistics, List<FileInfo> fileInfoCollection, long tickOffset)
    {
        JobID = logistics.JobID;
-        fileInfoCollection.Clear();
        _Details = new List<object>();
        MesEntity = logistics.MesEntity;
        _Log = LogManager.GetLogger(typeof(ProcessData));
@ -292,12 +291,11 @@ public partial class ProcessData : IProcessData
    {
        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);
+            description = JsonSerializer.Deserialize(jsonElement.ToString(), JsonDescriptionSourceGenerationContext.Default.Description);
            if (description is null)
                continue;
            results.Add(description);
--- a/Adaptation/Infineon/Monitoring/MonA/MonIn.cs
+++ b/Adaptation/Infineon/Monitoring/MonA/MonIn.cs
@ -226,9 +226,9 @@ public class MonIn : IMonIn, IDisposable
    {
        StringBuilder stringBuilder = new();
        if (string.IsNullOrEmpty(subresource))
-            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" {4} \n{5}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : (object)"now", resource.Trim(), stateName.Trim(), state.Trim(), description.Trim());
+            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" {4} \n{5}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : "now", resource.Trim(), stateName.Trim(), state.Trim(), description.Trim());
        else
-            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" \"{4}\" {5} \n{6}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : (object)"now", resource.Trim(), subresource.Trim(), stateName.Trim(), state.Trim(), description.Trim());
+            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" \"{4}\" {5} \n{6}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : "now", resource.Trim(), subresource.Trim(), stateName.Trim(), state.Trim(), description.Trim());
        return stringBuilder.ToString();
    }

@ -247,14 +247,14 @@ public class MonIn : IMonIn, IDisposable
        if (string.IsNullOrEmpty(subresource))
        {
            if (unit.Equals(string.Empty) && !interval.HasValue)
-                _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" {4} \n{5}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : (object)"now", resource.Trim(), performanceName.Trim(), value, description.Trim());
+                _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" {4} \n{5}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : "now", resource.Trim(), performanceName.Trim(), value, description.Trim());
            else
-                _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" {4} {5} {{interval={6}, unit={7}}}\n", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : (object)"now", resource.Trim(), performanceName.Trim(), value, description.Trim(), interval.HasValue ? interval.Value.ToString() : (object)string.Empty, unit.Trim());
+                _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" {4} {5} {{interval={6}, unit={7}}}\n", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : "now", resource.Trim(), performanceName.Trim(), value, description.Trim(), interval.HasValue ? interval.Value.ToString() : string.Empty, unit.Trim());
        }
        else if (unit.Equals(string.Empty) && !interval.HasValue)
-            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" \"{4}\" {5} \n{6}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : (object)"now", resource.Trim(), subresource.Trim(), performanceName.Trim(), value, description.Trim());
+            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" \"{4}\" {5} \n{6}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : "now", resource.Trim(), subresource.Trim(), performanceName.Trim(), value, description.Trim());
        else
-            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" \"{4}\" {5} {6} {{interval={7}, unit={8}}}\n", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : (object)"now", resource.Trim(), subresource.Trim(), performanceName.Trim(), value, description.Trim(), interval.HasValue ? interval.Value.ToString() : (object)string.Empty, unit.Trim());
+            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" \"{4}\" {5} {6} {{interval={7}, unit={8}}}\n", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : "now", resource.Trim(), subresource.Trim(), performanceName.Trim(), value, description.Trim(), interval.HasValue ? interval.Value.ToString() : string.Empty, unit.Trim());
        return stringBuilder.ToString();
    }

--- a/Adaptation/MET08RESISRP2100-Development.yml
+++ b/Adaptation/MET08RESISRP2100-Development.yml
@ -1,190 +1 @@
-trigger:
-  branches:
-    include:
-      - Development
-  paths:
-    include:
-      - "Adaptation/*"
-
-pool:
-  name: eaf
-  demands: MET08RESISRP2100-Development
-
-steps:
-  - script: |
-      set coreVersion=net7.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://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/index.json;D:/vsts-agent-win-x64-2.210.1-eaf/nuget
-      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:
-      Contents: '*'
-      SourceFolder: '\\mesfs.infineon.com\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:
-      Contents: '*'
-      SourceFolder: '\\mesfs.infineon.com\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:
-      Contents: '*'
-      SourceFolder: '\\mesfs.infineon.com\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)/TestResults"
-
-  - task: PublishTestResults@2
-    displayName: "Publish Test Results */coverage.cobertura.xml"
-    inputs:
-      testResultsFormat: VSTest
-      testResultsFiles: "*/coverage.cobertura.xml"
-      testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
-      searchFolder: "$(System.DefaultWorkingDirectory)/TestResults"
-
-  - 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:
-      Contents: "*$(Build.Repository.Name)*"
-      SourceFolder: 'bin\$(Configuration)'
-      TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)'
-      OverWrite: true
-    enabled: false
-
-  - task: CopyFiles@2
-    displayName: 'Copy Files to: Local D EAF Deployment Storage'
-    inputs:
-      Contents: "*$(Build.Repository.Name)*"
-      SourceFolder: 'bin\$(Configuration)'
-      TargetFolder: 'D:\EAF\EAF Deployment Storage\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
--- a/Adaptation/MET08RESISRP2100.Tests.csproj
+++ b/Adaptation/MET08RESISRP2100.Tests.csproj
@ -69,7 +69,7 @@
        <PackageReference Include="System.Text.Json" Version="9.0.0" />
    </ItemGroup>
    <ItemGroup>
-        <PackageReference Include="Infineon.Mesa.PDF.Text.Stripper" Version="4.8.0.1"><NoWarn>NU1701</NoWarn></PackageReference>
+        <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" />
--- a/Adaptation/MET08RESISRP2100.yml
+++ b/Adaptation/MET08RESISRP2100.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,180 +12,273 @@ trigger:
    include:
      - "Adaptation/*"

-pool:
-  name: eaf
-  demands: MET08RESISRP2100
+stages:
+  - stage: DevServer
+    displayName: DevServer

-steps:
-  - script: |
-      set coreVersion=net7.0
-      echo %coreVersion%
-      echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion%
-      echo $(CoreVersion)
-    displayName: CoreVersion
+    pool:
+      name: EAF Mesa Integration
+      demands: MET08RESISRP2100-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://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/index.json;D:/vsts-agent-win-x64-2.210.1-eaf/nuget
-      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:
-      Contents: '*'
-      SourceFolder: '\\mesfs.infineon.com\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:
-      Contents: '*'
-      SourceFolder: '\\mesfs.infineon.com\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:
-      Contents: '*'
-      SourceFolder: '\\mesfs.infineon.com\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)/TestResults"
+          - script: 'move /y "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)/05_TestResults/TestResults" $(System.DefaultWorkingDirectory)'
+            displayName: "Move Results"

-  - task: PublishTestResults@2
-    displayName: "Publish Test Results */coverage.cobertura.xml"
-    inputs:
-      testResultsFormat: VSTest
-      testResultsFiles: "*/coverage.cobertura.xml"
-      testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
-      searchFolder: "$(System.DefaultWorkingDirectory)/TestResults"
+          - script: '"C:\program files\dotnet\dotnet.exe" tool restore'
+            workingDirectory: Adaptation
+            displayName: "Tool Restore"
+            enabled: false

-  - 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" 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\dotnet\dotnet.exe" publish --configuration $(Configuration) --runtime win-x64 --self-contained -o $(Build.ArtifactStagingDirectory)\Adaptation --source $(NugetSource)'
-    workingDirectory: Adaptation
-    displayName: "Core Publish"
-    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"

-  - 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 */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 (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" clean --configuration $(Configuration)
+            workingDirectory: Adaptation
+            displayName: "Core Clean - Adaptation"

-  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)-$(Build.Repository.Name)>bin\$(Configuration)\$(Build.Repository.Name).txt'
-    displayName: "Commit Id"
+          - 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: D:\Framework4.8'
-    inputs:
-      Contents: "*$(Build.Repository.Name)*"
-      SourceFolder: 'bin\$(Configuration)'
-      TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)'
-      OverWrite: true
+  - stage: ProductionServer
+    displayName: ProductionServer

-  - task: CopyFiles@2
-    displayName: 'Copy Files to: Local D EAF Deployment Storage'
-    inputs:
-      Contents: "*$(Build.Repository.Name)*"
-      SourceFolder: 'bin\$(Configuration)'
-      TargetFolder: 'D:\EAF\EAF Deployment Storage\Adaptation_$(Build.Repository.Name)'
-      OverWrite: true
+    pool:
+      name: EAF Mesa Integration
+      demands: MET08RESISRP2100

-  - script: |
-      "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
-    workingDirectory: Adaptation
-    displayName: "Core Clean - Tests"
+    variables:
+      coreVersion: "net8.0"
+      nugetSource: "https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/"

-  - script: |
-      "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
-    workingDirectory: Adaptation
-    displayName: "Core Clean - Adaptation"
+    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: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
-    displayName: "Force Fail"
-    enabled: false
+          - 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
--- a/Adaptation/Shared/Duplicator/Description.cs
+++ b/Adaptation/Shared/Duplicator/Description.cs
@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
+using System.Text.Json.Serialization;

 namespace Adaptation.Shared.Duplicator;

@ -178,4 +179,16 @@ public class Description : IDescription, Properties.IDescription

    internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt";

+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Description))]
+internal partial class SharedDescriptionSourceGenerationContext : JsonSerializerContext
+{
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Description[]))]
+internal partial class SharedDescriptionArraySourceGenerationContext : JsonSerializerContext
+{
 }
--- a/Adaptation/Shared/FileRead.cs
+++ b/Adaptation/Shared/FileRead.cs
@ -9,7 +9,6 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Threading;

 namespace Adaptation.Shared;
@ -44,9 +43,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,7 +62,7 @@ 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, int? connectionCount, 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)
+    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;
@ -491,7 +490,7 @@ public class FileRead : Properties.IFileRead

    protected static void NestExistingFiles(FileConnectorConfiguration fileConnectorConfiguration)
    {
-        if (!fileConnectorConfiguration.IncludeSubDirectories.Value)
+        if (!fileConnectorConfiguration.IncludeSubDirectories.Value && fileConnectorConfiguration.TriggerOnCreated is not null && fileConnectorConfiguration.TriggerOnCreated.Value)
        {
            string[] matches = GetMatches(fileConnectorConfiguration);
            if (matches is not null && matches.Length > 0)
@ -551,12 +550,13 @@ public class FileRead : Properties.IFileRead
    {
        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);
+            description = JsonSerializer.Deserialize(jsonElement.ToString(), Duplicator.SharedDescriptionSourceGenerationContext.Default.Description);
+            if (description is null)
+                continue;
            results.Add(description);
        }
        return results;
@ -591,6 +591,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();
            }
@ -760,17 +763,32 @@ public class FileRead : Properties.IFileRead

    internal string[] GetInProcessDirectory(string jobIdDirectory)
    {
-        string[] results;
+        List<string> results = new();
        if (!_IsEAFHosted)
-            results = new string[] { jobIdDirectory };
+            results = new string[] { jobIdDirectory }.ToList();
        else
        {
-            string logisticsSequence = _Logistics.Sequence.ToString();
-            results = Directory.GetDirectories(jobIdDirectory, string.Concat(_Logistics.MID, '*', logisticsSequence, '*'), SearchOption.TopDirectoryOnly);
+            string[] files;
+            string[] directories;
+            string logisticsSequence;
+            for (int i = 0; i < 10; i++)
+            {
+                logisticsSequence = (_Logistics.Sequence + -i).ToString();
+                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.Count == 1)
+                    break;
+            }
        }
-        if ((results is null) || results.Length != 1)
+        if (results.Count != 1)
            throw new Exception("Didn't find directory by logistics sequence");
-        return results;
+        return results.ToArray();
    }

    internal static string GetFileNameAfterUnderscoreSplit(string reportFullPath)
--- a/Adaptation/Shared/Logistics.cs
+++ b/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,13 +87,13 @@ 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();
+        _Logistics1 = processDataStandardFormat.Logistics.ToList();
        if (Logistics1.Count == 0 || !Logistics1[0].StartsWith("LOGISTICS_1"))
        {
            _NullData = 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;
--- a/Adaptation/Shared/Metrology/WS.Attachment.cs
+++ b/Adaptation/Shared/Metrology/WS.Attachment.cs
@ -6,23 +6,25 @@ public partial class WS
    public class Attachment
    {

-        public string SubGroupId { get; set; }
-        public long HeaderId { get; set; }
-        public string HeaderIdDirectory { get; set; }
-        public string UniqueId { get; set; }
-        public string DestinationFileName { get; set; }
-        public string SourceFileName { get; set; }
-        public string AttachmentId { get; set; }
+#nullable enable

-        public Attachment(string subGroupId, long headerId, string headerIdDirectory, 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)
        {
-            SubGroupId = subGroupId;
-            HeaderId = headerId;
-            HeaderIdDirectory = headerIdDirectory;
            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();
        }

    }
--- a/Adaptation/Shared/Metrology/WS.Results.cs
+++ b/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
+{
 }
--- a/Adaptation/Shared/Metrology/WS.cs
+++ b/Adaptation/Shared/Metrology/WS.cs
@ -10,9 +10,11 @@ namespace Adaptation.Shared.Metrology;
 public partial class WS
 {

+#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,29 +32,20 @@ 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 });
-                string checkDirectory = Path.Combine(directory, $"-{results.HeaderID}");
+                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);
    }

    public static void AttachFile(string url, Attachment attachment, int timeoutSeconds = 60)
@ -69,16 +62,20 @@ public partial class WS
        }
    }

-    public static void AttachFiles(string url, 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)
                {
-                    directory = Path.Combine(Path.GetDirectoryName(attachment.HeaderIdDirectory), attachment.AttachmentId) ?? throw new Exception();
+                    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);
@ -88,7 +85,10 @@ public partial class WS
            {
                foreach (Attachment attachment in dataAttachments)
                {
-                    directory = Path.Combine(Path.GetDirectoryName(attachment.HeaderIdDirectory.Replace("Header", "Data")), attachment.AttachmentId) ?? throw new Exception();
+                    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);
@ -108,7 +108,7 @@ public partial class WS
        }
        catch (Exception e)
        {
-            Exception exception = e;
+            Exception? exception = e;
            StringBuilder stringBuilder = new();
            while (exception is not null)
            {
--- a/Adaptation/Shared/ProcessDataStandardFormat.cs
+++ b/Adaptation/Shared/ProcessDataStandardFormat.cs
--- a/Adaptation/Shared/ProcessDataStandardFormatMapping.cs
+++ b/Adaptation/Shared/ProcessDataStandardFormatMapping.cs
@ -0,0 +1,34 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace Adaptation.Shared;
+
+public class ProcessDataStandardFormatMapping
+{
+
+    public ReadOnlyCollection<int> ColumnIndices { get; private set; }
+    public ReadOnlyCollection<string> NewColumnNames { get; private set; }
+    public ReadOnlyCollection<string> OldColumnNames { get; private set; }
+
+    public ProcessDataStandardFormatMapping(ReadOnlyCollection<int> columnIndices,
+                                            ReadOnlyCollection<string> newColumnNames,
+                                            ReadOnlyCollection<string> oldColumnNames)
+    {
+        ColumnIndices = columnIndices;
+        NewColumnNames = newColumnNames;
+        OldColumnNames = oldColumnNames;
+    }
+
+    internal static ProcessDataStandardFormatMapping Get(string processDataStandardFormatMappingOldColumnNames, string processDataStandardFormatMappingNewColumnNames, string processDataStandardFormatMappingColumnIndices)
+    {
+        ProcessDataStandardFormatMapping result;
+        ReadOnlyCollection<string> newColumnNames = new(processDataStandardFormatMappingNewColumnNames.Split(','));
+        ReadOnlyCollection<string> oldColumnNames = new(processDataStandardFormatMappingOldColumnNames.Split(','));
+        ReadOnlyCollection<int> columnIndices = new(processDataStandardFormatMappingColumnIndices.Split(',').Select(int.Parse).ToArray());
+        result = new(columnIndices: columnIndices,
+                     newColumnNames: newColumnNames,
+                     oldColumnNames: oldColumnNames);
+        return result;
+    }
+
+}
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/MET08RESISRP2100.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/MET08RESISRP2100.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_59_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;

-namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_59_0;
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_59_0;

 [TestClass]
 public class MET08RESISRP2100 : EAFLoggingUnitTesting
@ -52,7 +52,7 @@ public class MET08RESISRP2100 : EAFLoggingUnitTesting
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__MoveMatchingFiles()
+    public void Production__v2_59_0__MET08RESISRP2100__MoveMatchingFiles()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
@ -65,7 +65,7 @@ public class MET08RESISRP2100 : EAFLoggingUnitTesting
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewer()
+    public void Production__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewer()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
@ -78,7 +78,7 @@ public class MET08RESISRP2100 : EAFLoggingUnitTesting
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__IQSSi()
+    public void Production__v2_59_0__MET08RESISRP2100__IQSSi()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
@ -91,7 +91,7 @@ public class MET08RESISRP2100 : EAFLoggingUnitTesting
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__OpenInsight()
+    public void Production__v2_59_0__MET08RESISRP2100__OpenInsight()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
@ -104,7 +104,7 @@ public class MET08RESISRP2100 : EAFLoggingUnitTesting
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments()
+    public void Production__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
@ -117,7 +117,7 @@ public class MET08RESISRP2100 : EAFLoggingUnitTesting
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__APC()
+    public void Production__v2_59_0__MET08RESISRP2100__APC()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
@ -130,7 +130,7 @@ public class MET08RESISRP2100 : EAFLoggingUnitTesting
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__SPaCe()
+    public void Production__v2_59_0__MET08RESISRP2100__SPaCe()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
@ -143,7 +143,7 @@ public class MET08RESISRP2100 : EAFLoggingUnitTesting
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__Processed()
+    public void Production__v2_59_0__MET08RESISRP2100__Processed()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
@ -156,7 +156,7 @@ public class MET08RESISRP2100 : EAFLoggingUnitTesting
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__Archive()
+    public void Production__v2_59_0__MET08RESISRP2100__Archive()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
@ -169,7 +169,7 @@ public class MET08RESISRP2100 : EAFLoggingUnitTesting
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__Dummy()
+    public void Production__v2_59_0__MET08RESISRP2100__Dummy()
    {
        string check = "638191594841489860.zip";
        MethodBase methodBase = new StackFrame().GetMethod();
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/SRP-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/SRP-EQPT.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_59_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;

-namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_59_0;
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_59_0;

 [TestClass]
 public class SRP_EQPT : EAFLoggingUnitTesting
@ -52,7 +52,7 @@ public class SRP_EQPT : EAFLoggingUnitTesting
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__SRP_EQPT__csv()
+    public void Production__v2_59_0__SRP_EQPT__csv()
    {
        string check = "*.csv";
        MethodBase methodBase = new StackFrame().GetMethod();
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/SRP.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/SRP.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_59_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;

-namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_59_0;
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_59_0;

 [TestClass]
 public class SRP : EAFLoggingUnitTesting
@ -52,7 +52,7 @@ public class SRP : EAFLoggingUnitTesting
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__SRP__json()
+    public void Production__v2_59_0__SRP__json()
    {
        string check = "*.json";
        MethodBase methodBase = new StackFrame().GetMethod();
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/MET08RESISRP2100.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/MET08RESISRP2100.cs
@ -0,0 +1,182 @@
+#if v2_60_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_60_0;
+
+[TestClass]
+public class MET08RESISRP2100 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static MET08RESISRP2100 EAFLoggingUnitTesting { get; private set; }
+
+    static MET08RESISRP2100() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public MET08RESISRP2100() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public MET08RESISRP2100(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new MET08RESISRP2100(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_60_0__MET08RESISRP2100__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_60_0__MET08RESISRP2100__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_60_0__MET08RESISRP2100__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_60_0__MET08RESISRP2100__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_60_0__MET08RESISRP2100__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_60_0__MET08RESISRP2100__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_60_0__MET08RESISRP2100__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_60_0__MET08RESISRP2100__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_60_0__MET08RESISRP2100__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_60_0__MET08RESISRP2100__Dummy()
+    {
+        string check = "638191594841489860.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
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/SRP-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/SRP-EQPT.cs
@ -0,0 +1,65 @@
+#if v2_60_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_60_0;
+
+[TestClass]
+public class SRP_EQPT : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static SRP_EQPT EAFLoggingUnitTesting { get; private set; }
+
+    static SRP_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public SRP_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public SRP_EQPT(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new SRP_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_60_0__SRP_EQPT__csv()
+    {
+        string check = "*.csv";
+        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
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/SRP.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/SRP.cs
@ -0,0 +1,65 @@
+#if v2_60_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_60_0;
+
+[TestClass]
+public class SRP : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static SRP EAFLoggingUnitTesting { get; private set; }
+
+    static SRP() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public SRP() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public SRP(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new SRP(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_60_0__SRP__json()
+    {
+        string check = "*.json";
+        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
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/MET08RESISRP2100.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/MET08RESISRP2100.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_61_1;
+
+[TestClass]
+public class MET08RESISRP2100 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static MET08RESISRP2100 EAFLoggingUnitTesting { get; private set; }
+
+    static MET08RESISRP2100() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public MET08RESISRP2100() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public MET08RESISRP2100(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new MET08RESISRP2100(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_61_1__MET08RESISRP2100__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_61_1__MET08RESISRP2100__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_61_1__MET08RESISRP2100__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_61_1__MET08RESISRP2100__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_61_1__MET08RESISRP2100__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_61_1__MET08RESISRP2100__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_61_1__MET08RESISRP2100__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_61_1__MET08RESISRP2100__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_61_1__MET08RESISRP2100__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_61_1__MET08RESISRP2100__Dummy()
+    {
+        string check = "638191594841489860.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
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/SRP-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/SRP-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_61_1;
+
+[TestClass]
+public class SRP_EQPT : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static SRP_EQPT EAFLoggingUnitTesting { get; private set; }
+
+    static SRP_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public SRP_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public SRP_EQPT(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new SRP_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_61_1__SRP_EQPT__csv()
+    {
+        string check = "*.csv";
+        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
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/SRP.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/SRP.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_61_1;
+
+[TestClass]
+public class SRP : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static SRP EAFLoggingUnitTesting { get; private set; }
+
+    static SRP() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public SRP() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public SRP(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new SRP(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_61_1__SRP__json()
+    {
+        string check = "*.json";
+        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
--- a/Adaptation/_Tests/Extract/Production/v2.59.0/MET08RESISRP2100.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.59.0/MET08RESISRP2100.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_59_0
 using Adaptation.Shared;
 using Adaptation.Shared.Methods;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@ -6,7 +6,7 @@ using System;
 using System.Diagnostics;
 using System.Reflection;

-namespace Adaptation._Tests.Extract.Staging.v2_59_0;
+namespace Adaptation._Tests.Extract.Production.v2_59_0;

 [TestClass]
 public class MET08RESISRP2100
@ -15,13 +15,13 @@ public class MET08RESISRP2100
 #pragma warning disable CA2254
 #pragma warning disable IDE0060

-    private static CreateSelfDescription.Staging.v2_59_0.MET08RESISRP2100 _MET08RESISRP2100;
+    private static CreateSelfDescription.Production.v2_59_0.MET08RESISRP2100 _MET08RESISRP2100;

    [ClassInitialize]
    public static void ClassInitialize(TestContext testContext)
    {
-        CreateSelfDescription.Staging.v2_59_0.MET08RESISRP2100.ClassInitialize(testContext);
-        _MET08RESISRP2100 = CreateSelfDescription.Staging.v2_59_0.MET08RESISRP2100.EAFLoggingUnitTesting;
+        CreateSelfDescription.Production.v2_59_0.MET08RESISRP2100.ClassInitialize(testContext);
+        _MET08RESISRP2100 = CreateSelfDescription.Production.v2_59_0.MET08RESISRP2100.EAFLoggingUnitTesting;
    }

    private static void NonThrowTryCatch()
@ -35,23 +35,23 @@ public class MET08RESISRP2100
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__MoveMatchingFiles() => _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__MoveMatchingFiles();
+    public void Production__v2_59_0__MET08RESISRP2100__MoveMatchingFiles() => _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__MoveMatchingFiles();

 #if DEBUG
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewer() => _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewer();
+    public void Production__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewer() => _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewer();

 #if DEBUG
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewer638191594841489860__First()
+    public void Production__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewer638191594841489860__First()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
-        _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewer();
+        _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewer();
        string[] variables = _MET08RESISRP2100.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
        IFileRead fileRead = _MET08RESISRP2100.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
        Logistics logistics = new(fileRead);
@ -63,17 +63,17 @@ public class MET08RESISRP2100
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__IQSSi() => _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__IQSSi();
+    public void Production__v2_59_0__MET08RESISRP2100__IQSSi() => _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__IQSSi();

 #if DEBUG
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__IQSSi638191594841489860__First()
+    public void Production__v2_59_0__MET08RESISRP2100__IQSSi638191594841489860__First()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
-        _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__IQSSi();
+        _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__IQSSi();
        string[] variables = _MET08RESISRP2100.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
        IFileRead fileRead = _MET08RESISRP2100.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
        Logistics logistics = new(fileRead);
@ -85,17 +85,17 @@ public class MET08RESISRP2100
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__OpenInsight() => _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__OpenInsight();
+    public void Production__v2_59_0__MET08RESISRP2100__OpenInsight() => _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__OpenInsight();

 #if DEBUG
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__OpenInsight638191594841489860__First()
+    public void Production__v2_59_0__MET08RESISRP2100__OpenInsight638191594841489860__First()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
-        _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__OpenInsight();
+        _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__OpenInsight();
        string[] variables = _MET08RESISRP2100.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
        IFileRead fileRead = _MET08RESISRP2100.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
        Logistics logistics = new(fileRead);
@ -107,17 +107,17 @@ public class MET08RESISRP2100
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments() => _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments();
+    public void Production__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments() => _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments();

 #if DEBUG
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments638191594841489860__First()
+    public void Production__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments638191594841489860__First()
    {
        string check = "*.pdsf";
        MethodBase methodBase = new StackFrame().GetMethod();
-        _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments();
+        _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments();
        string[] variables = _MET08RESISRP2100.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
        IFileRead fileRead = _MET08RESISRP2100.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
        Logistics logistics = new(fileRead);
@ -129,31 +129,31 @@ public class MET08RESISRP2100
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__APC() => _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__APC();
+    public void Production__v2_59_0__MET08RESISRP2100__APC() => _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__APC();

 #if DEBUG
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__SPaCe() => _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__SPaCe();
+    public void Production__v2_59_0__MET08RESISRP2100__SPaCe() => _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__SPaCe();

 #if DEBUG
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__Processed() => _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__Processed();
+    public void Production__v2_59_0__MET08RESISRP2100__Processed() => _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__Processed();

 #if DEBUG
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__Archive() => _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__Archive();
+    public void Production__v2_59_0__MET08RESISRP2100__Archive() => _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__Archive();

 #if DEBUG
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__MET08RESISRP2100__Dummy() => _MET08RESISRP2100.Staging__v2_59_0__MET08RESISRP2100__Dummy();
+    public void Production__v2_59_0__MET08RESISRP2100__Dummy() => _MET08RESISRP2100.Production__v2_59_0__MET08RESISRP2100__Dummy();

 }
 #endif
--- a/Adaptation/_Tests/Extract/Production/v2.59.0/SRP-EQPT.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.59.0/SRP-EQPT.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_59_0
 using Adaptation.Shared;
 using Adaptation.Shared.Methods;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@ -6,7 +6,7 @@ using System;
 using System.Diagnostics;
 using System.Reflection;

-namespace Adaptation._Tests.Extract.Staging.v2_59_0;
+namespace Adaptation._Tests.Extract.Production.v2_59_0;

 [TestClass]
 public class SRP_EQPT
@ -15,13 +15,13 @@ public class SRP_EQPT
 #pragma warning disable CA2254
 #pragma warning disable IDE0060

-    private static CreateSelfDescription.Staging.v2_59_0.SRP_EQPT _SRP_EQPT;
+    private static CreateSelfDescription.Production.v2_59_0.SRP_EQPT _SRP_EQPT;

    [ClassInitialize]
    public static void ClassInitialize(TestContext testContext)
    {
-        CreateSelfDescription.Staging.v2_59_0.SRP_EQPT.ClassInitialize(testContext);
-        _SRP_EQPT = CreateSelfDescription.Staging.v2_59_0.SRP_EQPT.EAFLoggingUnitTesting;
+        CreateSelfDescription.Production.v2_59_0.SRP_EQPT.ClassInitialize(testContext);
+        _SRP_EQPT = CreateSelfDescription.Production.v2_59_0.SRP_EQPT.EAFLoggingUnitTesting;
    }

    private static void NonThrowTryCatch()
@ -35,15 +35,15 @@ public class SRP_EQPT
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__SRP_EQPT__csv() => _SRP_EQPT.Staging__v2_59_0__SRP_EQPT__csv();
+    public void Production__v2_59_0__SRP_EQPT__csv() => _SRP_EQPT.Production__v2_59_0__SRP_EQPT__csv();

    [Ignore]
    [TestMethod]
-    public void Staging__v2_59_0__SRP_EQPT__csv638185594063339969__First()
+    public void Production__v2_59_0__SRP_EQPT__csv638185594063339969__First()
    {
        string check = "*.csv";
        bool validatePDSF = false;
-        _SRP_EQPT.Staging__v2_59_0__SRP_EQPT__csv();
+        _SRP_EQPT.Production__v2_59_0__SRP_EQPT__csv();
        MethodBase methodBase = new StackFrame().GetMethod();
        string[] variables = _SRP_EQPT.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
        IFileRead fileRead = _SRP_EQPT.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
--- a/Adaptation/_Tests/Extract/Production/v2.59.0/SRP.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.59.0/SRP.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_59_0
 using Adaptation.Shared;
 using Adaptation.Shared.Methods;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@ -6,7 +6,7 @@ using System;
 using System.Diagnostics;
 using System.Reflection;

-namespace Adaptation._Tests.Extract.Staging.v2_59_0;
+namespace Adaptation._Tests.Extract.Production.v2_59_0;

 [TestClass]
 public class SRP
@ -15,13 +15,13 @@ public class SRP
 #pragma warning disable CA2254
 #pragma warning disable IDE0060

-    private static CreateSelfDescription.Staging.v2_59_0.SRP _SRP;
+    private static CreateSelfDescription.Production.v2_59_0.SRP _SRP;

    [ClassInitialize]
    public static void ClassInitialize(TestContext testContext)
    {
-        CreateSelfDescription.Staging.v2_59_0.SRP.ClassInitialize(testContext);
-        _SRP = CreateSelfDescription.Staging.v2_59_0.SRP.EAFLoggingUnitTesting;
+        CreateSelfDescription.Production.v2_59_0.SRP.ClassInitialize(testContext);
+        _SRP = CreateSelfDescription.Production.v2_59_0.SRP.EAFLoggingUnitTesting;
    }

    private static void NonThrowTryCatch()
@ -35,17 +35,17 @@ public class SRP
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__SRP__json() => _SRP.Staging__v2_59_0__SRP__json();
+    public void Production__v2_59_0__SRP__json() => _SRP.Production__v2_59_0__SRP__json();

 #if DEBUG
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging__v2_59_0__SRP__json638185594063339969__First()
+    public void Production__v2_59_0__SRP__json638185594063339969__First()
    {
        string check = "*.json";
        bool validatePDSF = false;
-        _SRP.Staging__v2_59_0__SRP__json();
+        _SRP.Production__v2_59_0__SRP__json();
        MethodBase methodBase = new StackFrame().GetMethod();
        string[] variables = _SRP.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
        IFileRead fileRead = _SRP.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
--- a/Adaptation/_Tests/Extract/Production/v2.60.0/MET08RESISRP2100.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.60.0/MET08RESISRP2100.cs
@ -0,0 +1,159 @@
+#if v2_60_0
+using Adaptation.Shared;
+using Adaptation.Shared.Methods;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Adaptation._Tests.Extract.Production.v2_60_0;
+
+[TestClass]
+public class MET08RESISRP2100
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Production.v2_60_0.MET08RESISRP2100 _MET08RESISRP2100;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Production.v2_60_0.MET08RESISRP2100.ClassInitialize(testContext);
+        _MET08RESISRP2100 = CreateSelfDescription.Production.v2_60_0.MET08RESISRP2100.EAFLoggingUnitTesting;
+    }
+
+    private static void NonThrowTryCatch()
+    {
+        try
+        { throw new Exception(); }
+        catch (Exception) { }
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__MoveMatchingFiles() => _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__MoveMatchingFiles();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__OpenInsightMetrologyViewer() => _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__OpenInsightMetrologyViewer();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__OpenInsightMetrologyViewer638191594841489860__First()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__OpenInsightMetrologyViewer();
+        string[] variables = _MET08RESISRP2100.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _MET08RESISRP2100.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__IQSSi() => _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__IQSSi();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__IQSSi638191594841489860__First()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__IQSSi();
+        string[] variables = _MET08RESISRP2100.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _MET08RESISRP2100.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__OpenInsight() => _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__OpenInsight();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__OpenInsight638191594841489860__First()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__OpenInsight();
+        string[] variables = _MET08RESISRP2100.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _MET08RESISRP2100.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments() => _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments638191594841489860__First()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments();
+        string[] variables = _MET08RESISRP2100.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _MET08RESISRP2100.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__APC() => _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__APC();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__SPaCe() => _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__SPaCe();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__Processed() => _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__Processed();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__Archive() => _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__Archive();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESISRP2100__Dummy() => _MET08RESISRP2100.Production__v2_60_0__MET08RESISRP2100__Dummy();
+
+}
+#endif
--- a/Adaptation/_Tests/Extract/Production/v2.60.0/SRP-EQPT.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.60.0/SRP-EQPT.cs
@ -0,0 +1,56 @@
+#if v2_60_0
+using Adaptation.Shared;
+using Adaptation.Shared.Methods;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Adaptation._Tests.Extract.Production.v2_60_0;
+
+[TestClass]
+public class SRP_EQPT
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Production.v2_60_0.SRP_EQPT _SRP_EQPT;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Production.v2_60_0.SRP_EQPT.ClassInitialize(testContext);
+        _SRP_EQPT = CreateSelfDescription.Production.v2_60_0.SRP_EQPT.EAFLoggingUnitTesting;
+    }
+
+    private static void NonThrowTryCatch()
+    {
+        try
+        { throw new Exception(); }
+        catch (Exception) { }
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__SRP_EQPT__csv() => _SRP_EQPT.Production__v2_60_0__SRP_EQPT__csv();
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_60_0__SRP_EQPT__csv638185594063339969__First()
+    {
+        string check = "*.csv";
+        bool validatePDSF = false;
+        _SRP_EQPT.Production__v2_60_0__SRP_EQPT__csv();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _SRP_EQPT.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _SRP_EQPT.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+        NonThrowTryCatch();
+    }
+
+}
+#endif
--- a/Adaptation/_Tests/Extract/Production/v2.60.0/SRP.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.60.0/SRP.cs
@ -0,0 +1,58 @@
+#if v2_60_0
+using Adaptation.Shared;
+using Adaptation.Shared.Methods;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Adaptation._Tests.Extract.Production.v2_60_0;
+
+[TestClass]
+public class SRP
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Production.v2_60_0.SRP _SRP;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Production.v2_60_0.SRP.ClassInitialize(testContext);
+        _SRP = CreateSelfDescription.Production.v2_60_0.SRP.EAFLoggingUnitTesting;
+    }
+
+    private static void NonThrowTryCatch()
+    {
+        try
+        { throw new Exception(); }
+        catch (Exception) { }
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__SRP__json() => _SRP.Production__v2_60_0__SRP__json();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__SRP__json638185594063339969__First()
+    {
+        string check = "*.json";
+        bool validatePDSF = false;
+        _SRP.Production__v2_60_0__SRP__json();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _SRP.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _SRP.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+        NonThrowTryCatch();
+    }
+
+}
+#endif
--- a/Adaptation/_Tests/Extract/Production/v2.61.1/MET08RESISRP2100.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.61.1/MET08RESISRP2100.cs
@ -0,0 +1,159 @@
+#if true
+using Adaptation.Shared;
+using Adaptation.Shared.Methods;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Adaptation._Tests.Extract.Production.v2_61_1;
+
+[TestClass]
+public class MET08RESISRP2100
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Production.v2_61_1.MET08RESISRP2100 _MET08RESISRP2100;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Production.v2_61_1.MET08RESISRP2100.ClassInitialize(testContext);
+        _MET08RESISRP2100 = CreateSelfDescription.Production.v2_61_1.MET08RESISRP2100.EAFLoggingUnitTesting;
+    }
+
+    private static void NonThrowTryCatch()
+    {
+        try
+        { throw new Exception(); }
+        catch (Exception) { }
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__MoveMatchingFiles() => _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__MoveMatchingFiles();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__OpenInsightMetrologyViewer() => _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__OpenInsightMetrologyViewer();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__OpenInsightMetrologyViewer638191594841489860__First()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__OpenInsightMetrologyViewer();
+        string[] variables = _MET08RESISRP2100.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _MET08RESISRP2100.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__IQSSi() => _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__IQSSi();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__IQSSi638191594841489860__First()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__IQSSi();
+        string[] variables = _MET08RESISRP2100.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _MET08RESISRP2100.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__OpenInsight() => _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__OpenInsight();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__OpenInsight638191594841489860__First()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__OpenInsight();
+        string[] variables = _MET08RESISRP2100.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _MET08RESISRP2100.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments() => _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments638191594841489860__First()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__OpenInsightMetrologyViewerAttachments();
+        string[] variables = _MET08RESISRP2100.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _MET08RESISRP2100.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__APC() => _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__APC();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__SPaCe() => _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__SPaCe();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__Processed() => _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__Processed();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__Archive() => _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__Archive();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08RESISRP2100__Dummy() => _MET08RESISRP2100.Production__v2_61_1__MET08RESISRP2100__Dummy();
+
+}
+#endif
--- a/Adaptation/_Tests/Extract/Production/v2.61.1/SRP-EQPT.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.61.1/SRP-EQPT.cs
@ -0,0 +1,56 @@
+#if true
+using Adaptation.Shared;
+using Adaptation.Shared.Methods;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Adaptation._Tests.Extract.Production.v2_61_1;
+
+[TestClass]
+public class SRP_EQPT
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Production.v2_61_1.SRP_EQPT _SRP_EQPT;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Production.v2_61_1.SRP_EQPT.ClassInitialize(testContext);
+        _SRP_EQPT = CreateSelfDescription.Production.v2_61_1.SRP_EQPT.EAFLoggingUnitTesting;
+    }
+
+    private static void NonThrowTryCatch()
+    {
+        try
+        { throw new Exception(); }
+        catch (Exception) { }
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__SRP_EQPT__csv() => _SRP_EQPT.Production__v2_61_1__SRP_EQPT__csv();
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_61_1__SRP_EQPT__csv638185594063339969__First()
+    {
+        string check = "*.csv";
+        bool validatePDSF = false;
+        _SRP_EQPT.Production__v2_61_1__SRP_EQPT__csv();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _SRP_EQPT.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _SRP_EQPT.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+        NonThrowTryCatch();
+    }
+
+}
+#endif
--- a/Adaptation/_Tests/Extract/Production/v2.61.1/SRP.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.61.1/SRP.cs
@ -0,0 +1,58 @@
+#if true
+using Adaptation.Shared;
+using Adaptation.Shared.Methods;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Adaptation._Tests.Extract.Production.v2_61_1;
+
+[TestClass]
+public class SRP
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Production.v2_61_1.SRP _SRP;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Production.v2_61_1.SRP.ClassInitialize(testContext);
+        _SRP = CreateSelfDescription.Production.v2_61_1.SRP.EAFLoggingUnitTesting;
+    }
+
+    private static void NonThrowTryCatch()
+    {
+        try
+        { throw new Exception(); }
+        catch (Exception) { }
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__SRP__json() => _SRP.Production__v2_61_1__SRP__json();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__SRP__json638185594063339969__First()
+    {
+        string check = "*.json";
+        bool validatePDSF = false;
+        _SRP.Production__v2_61_1__SRP__json();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _SRP.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _SRP.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+        NonThrowTryCatch();
+    }
+
+}
+#endif
--- a/Adaptation/_Tests/Shared/AdaptationTesting.cs
+++ b/Adaptation/_Tests/Shared/AdaptationTesting.cs
--- a/Adaptation/_Tests/Static/MET08RESISRP2100.cs
+++ b/Adaptation/_Tests/Static/MET08RESISRP2100.cs
@ -51,27 +51,27 @@ public class MET08RESISRP2100 : LoggingUnitTesting, IDisposable
    public void TestDateTime()
    {
        DateTime dateTime = DateTime.Now;
-        Assert.IsTrue(dateTime.ToString("M/d/yyyy h:mm:ss tt") == dateTime.ToString());
+        Assert.AreEqual(dateTime.ToString(), dateTime.ToString("M/d/yyyy h:mm:ss tt"));
    }

 #if DEBUG
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging()
+    public void Production()
    {
        MethodBase methodBase = new StackFrame().GetMethod();
        StringBuilder results = new();
        (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[]
        {
-            new("MET08RESISRP2100", "v2.59.0"),
+            new("MET08RESISRP2100", "v2.61.1"),
        };
-        string staging = "http://mestsa07ec.infineon.com:9003/CellInstanceServiceV2";
+        string production = "http://messa08ec.infineon.com:9003/CellInstanceServiceV2";
        Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion;
        LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
        foreach ((string cellInstanceName, string cellInstanceVersionName) in collection)
        {
-            cellInstanceVersion = AdaptationTesting.GetCellInstanceVersion($"{staging}/{cellInstanceName}/{cellInstanceVersionName}/configuration");
+            cellInstanceVersion = AdaptationTesting.GetCellInstanceVersion($"{production}/{cellInstanceName}/{cellInstanceVersionName}/configuration");
            _ = results.AppendLine($"{cellInstanceName}\t{cellInstanceVersionName}\t{cellInstanceVersion.EdaConnection.PortNumber}");
        }
        string sourceDirectory = "D:/Tmp/cellInstanceVersion.EdaConnection.PortNumber";
--- a/Adaptation/_Tests/Static/json.cs
+++ b/Adaptation/_Tests/Static/json.cs
@ -51,7 +51,7 @@ public class JSON : LoggingUnitTesting, IDisposable
    public void TestDateTime()
    {
        DateTime dateTime = DateTime.Now;
-        Assert.IsTrue(dateTime.ToString("M/d/yyyy h:mm:ss tt") == dateTime.ToString());
+        Assert.AreEqual(dateTime.ToString(), dateTime.ToString("M/d/yyyy h:mm:ss tt"));
    }

    [TestMethod]
@ -68,125 +68,125 @@ public class JSON : LoggingUnitTesting, IDisposable
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("12-123456-1234");
-        Assert.IsTrue(descriptor.Reactor is "12");
-        Assert.IsTrue(descriptor.RDS is "123456");
-        Assert.IsTrue(descriptor.PSN is "1234");
+        Assert.AreEqual("12", descriptor.Reactor);
+        Assert.AreEqual("123456", descriptor.RDS);
+        Assert.AreEqual("1234", descriptor.PSN);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("123456");
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
-        Assert.IsTrue(descriptor.RDS is "123456");
+        Assert.AreEqual("123456", descriptor.RDS);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("1T123456");
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
-        Assert.IsTrue(descriptor.RDS is "123456");
+        Assert.AreEqual("123456", descriptor.RDS);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("MP");
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.Employee is "MP");
+        Assert.AreEqual("MP", descriptor.Employee);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("12-123456-1234.2-1");
-        Assert.IsTrue(descriptor.Reactor is "12");
-        Assert.IsTrue(descriptor.RDS is "123456");
-        Assert.IsTrue(descriptor.PSN is "1234");
-        Assert.IsTrue(descriptor.Layer is "2");
-        Assert.IsTrue(descriptor.Zone is "1");
+        Assert.AreEqual("12", descriptor.Reactor);
+        Assert.AreEqual("123456", descriptor.RDS);
+        Assert.AreEqual("1234", descriptor.PSN);
+        Assert.AreEqual("2", descriptor.Layer);
+        Assert.AreEqual("1", descriptor.Zone);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("12-123456-1234.02-1");
-        Assert.IsTrue(descriptor.Reactor is "12");
-        Assert.IsTrue(descriptor.RDS is "123456");
-        Assert.IsTrue(descriptor.PSN is "1234");
-        Assert.IsTrue(descriptor.Layer is "2");
-        Assert.IsTrue(descriptor.Zone is "1");
+        Assert.AreEqual("12", descriptor.Reactor);
+        Assert.AreEqual("123456", descriptor.RDS);
+        Assert.AreEqual("1234", descriptor.PSN);
+        Assert.AreEqual("2", descriptor.Layer);
+        Assert.AreEqual("1", descriptor.Zone);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("20");
-        Assert.IsTrue(descriptor.Reactor is "20");
+        Assert.AreEqual("20", descriptor.Reactor);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("20.2");
-        Assert.IsTrue(descriptor.Reactor is "20");
+        Assert.AreEqual("20", descriptor.Reactor);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.Layer is "2");
+        Assert.AreEqual("2", descriptor.Layer);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("20.2.1");
-        Assert.IsTrue(descriptor.Layer is "2");
+        Assert.AreEqual("2", descriptor.Layer);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "20");
-        Assert.IsTrue(descriptor.Zone is "1");
+        Assert.AreEqual("20", descriptor.Reactor);
+        Assert.AreEqual("1", descriptor.Zone);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("20.1.1");
-        Assert.IsTrue(descriptor.Layer is "1");
+        Assert.AreEqual("1", descriptor.Layer);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "20");
-        Assert.IsTrue(descriptor.Zone is "1");
+        Assert.AreEqual("20", descriptor.Reactor);
+        Assert.AreEqual("1", descriptor.Zone);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("P2-LOW-RR");
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
-        Assert.IsTrue(descriptor.PSN is "RR");
+        Assert.AreEqual("RR", descriptor.PSN);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "P2");
+        Assert.AreEqual("P2", descriptor.Reactor);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
-        Assert.IsTrue(descriptor.PSN is "RR");
+        Assert.AreEqual("RR", descriptor.PSN);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "P2");
+        Assert.AreEqual("P2", descriptor.Reactor);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("i171308.1.51");
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.RDS is "i171308.1.51");
+        Assert.AreEqual("i171308.1.51", descriptor.RDS);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("o171308.1.51");
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.RDS is "o171308.1.51");
+        Assert.AreEqual("o171308.1.51", descriptor.RDS);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("O171308.1.51");
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.RDS is "O171308.1.51");
+        Assert.AreEqual("O171308.1.51", descriptor.RDS);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("171308.1.51");
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.RDS is "171308.1.51");
+        Assert.AreEqual("171308.1.51", descriptor.RDS);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("75-QP1414-SPLIT4");
-        Assert.IsTrue(!string.IsNullOrEmpty(descriptor.Wafer));
+        Assert.IsFalse(string.IsNullOrEmpty(descriptor.Wafer));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
-        Assert.IsTrue(descriptor.PSN is "SPLIT4");
+        Assert.AreEqual("SPLIT4", descriptor.PSN);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "75");
+        Assert.AreEqual("75", descriptor.Reactor);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("B48");
-        Assert.IsTrue(descriptor.Wafer == "B48");
+        Assert.AreEqual("B48", descriptor.Wafer);
        descriptor = FileHandlers.json.ProcessData.GetDescriptor("B48");
-        Assert.IsTrue(descriptor.Wafer == "B48");
+        Assert.AreEqual("B48", descriptor.Wafer);
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
@ -201,20 +201,20 @@ public class JSON : LoggingUnitTesting, IDisposable
    [Ignore]
 #endif
    [TestMethod]
-    public void Staging()
+    public void Production()
    {
        MethodBase methodBase = new StackFrame().GetMethod();
        StringBuilder results = new();
        (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[]
        {
-            new("SRP", "v2.59.0"),
+            new("SRP", "v2.61.1"),
        };
-        string staging = "http://mestsa07ec.infineon.com:9003/CellInstanceServiceV2";
+        string production = "http://messa08ec.infineon.com:9003/CellInstanceServiceV2";
        Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion;
        LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
        foreach ((string cellInstanceName, string cellInstanceVersionName) in collection)
        {
-            cellInstanceVersion = AdaptationTesting.GetCellInstanceVersion($"{staging}/{cellInstanceName}/{cellInstanceVersionName}/configuration");
+            cellInstanceVersion = AdaptationTesting.GetCellInstanceVersion($"{production}/{cellInstanceName}/{cellInstanceVersionName}/configuration");
            _ = results.AppendLine($"{cellInstanceName}\t{cellInstanceVersionName}\t{cellInstanceVersion.EdaConnection.PortNumber}");
        }
        string sourceDirectory = "D:/Tmp/cellInstanceVersion.EdaConnection.PortNumber";
--- a/FileHandlers/FileRead.cs
+++ b/FileHandlers/FileRead.cs
@ -37,7 +37,7 @@ public partial class FileRead : FileReaderHandler, ISMTP
    private FilePathGenerator _FilePathGeneratorForTarget;
    private readonly List<EquipmentParameter> _EquipmentParameters;
    private static readonly Dictionary<string, List<long>> _DummyRuns;
-    private static readonly Dictionary<long, List<string>> _StaticRuns;
+    private static readonly Dictionary<long, List<Adaptation.Shared.Metrology.WS.Results>> _StaticRuns;

    static FileRead()
    {
--- a/MET08RESISRP2100.csproj
+++ b/MET08RESISRP2100.csproj
@ -188,6 +188,7 @@
    <Compile Include="Adaptation\Shared\Metrology\WS.Results.cs" />
    <Compile Include="Adaptation\Shared\ParameterType.cs" />
    <Compile Include="Adaptation\Shared\ProcessDataStandardFormat.cs" />
+    <Compile Include="Adaptation\Shared\ProcessDataStandardFormatMapping.cs" />
    <Compile Include="Adaptation\Shared\Properties\IDescription.cs" />
    <Compile Include="Adaptation\Shared\Properties\IFileRead.cs" />
    <Compile Include="Adaptation\Shared\Properties\ILogistics.cs" />
@ -203,7 +204,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Infineon.EAF.Runtime">
-      <Version>2.59.0</Version>
+      <Version>2.61.1</Version>
    </PackageReference>
    <PackageReference Include="System.Text.Json">
      <Version>8.0.3</Version>
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.59.0.0")]
-[assembly: AssemblyFileVersion("2.59.0.0")]
+[assembly: AssemblyVersion("2.61.1.0")]
+[assembly: AssemblyFileVersion("2.61.1.0")]
Author	SHA1	Message	Date
phares@iscn5cg20977xq	85700c0605	Infineon.EAF.Runtime v2.61.1	2025-10-15 07:47:59 -07:00
phares@iscn5cg20977xq	752a42affc	Synced with other adaptations	2025-10-15 07:47:45 -07:00
Mike Phares	f607dd494f	Synced with other adaptations	2025-06-16 11:31:27 -07:00
Mike Phares	5a601420f4	Infineon.EAF.Runtime v2.60.0	2025-06-16 11:31:20 -07:00