v2.47.1 - Ready to test IQS query

Adaptation/.editorconfig

@@ -80,9 +80,11 @@ dotnet_diagnostic.CA1825.severity = warning # CA1823: Avoid zero-length array al
 dotnet_diagnostic.CA1829.severity = warning # CA1829: Use Length/Count property instead of Count() when available
 dotnet_diagnostic.CA1834.severity = warning # CA1834: Consider using 'StringBuilder.Append(char)' when applicable
 dotnet_diagnostic.IDE0001.severity = warning # IDE0001: Simplify name
+dotnet_diagnostic.IDE0004.severity = warning # IDE0004: Cast is redundant.
 dotnet_diagnostic.IDE0002.severity = warning # Simplify (member access) - System.Version.Equals("1", "2"); Version.Equals("1", "2");
 dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary
 dotnet_diagnostic.IDE0047.severity = warning # IDE0047: Parentheses can be removed
+dotnet_diagnostic.IDE0049.severity = warning # Use language keywords instead of framework type names for type references (IDE0049)
 dotnet_diagnostic.IDE0060.severity = warning # IDE0060: Remove unused parameter
 dotnet_naming_rule.abstract_method_should_be_pascal_case.severity = warning
 dotnet_naming_rule.abstract_method_should_be_pascal_case.style = pascal_case
@@ -215,7 +217,7 @@ dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
 dotnet_style_parentheses_in_other_operators = never_if_unnecessary
 dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
 dotnet_style_predefined_type_for_locals_parameters_members = true
-dotnet_style_predefined_type_for_member_access = true
+dotnet_style_predefined_type_for_member_access = true:warning
 dotnet_style_prefer_auto_properties = true:warning
 dotnet_style_prefer_compound_assignment = true:warning
 dotnet_style_prefer_conditional_expression_over_assignment = false

Adaptation/FileHandlers/APC/FileRead.cs

@@ -103,10 +103,10 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    private void FileCopy(string reportFullPath, DateTime dateTime)
+    private void FileCopy<T>(string reportFullPath, DateTime dateTime, List<T> descriptions) where T : Shared.Properties.IDescription
     {
         bool isDummyRun = false;
-        List<(Shared.Properties.IScopeInfo, string)> tuples = new();
+        List<(Shared.Properties.IScopeInfo, string)> collection = new();
         string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
         string fileNameAfterUnderscoreSplit = GetFileNameAfterUnderscoreSplit(reportFullPath);
         string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.TargetFileLocation, fileNameAfterUnderscoreSplit);
@@ -114,7 +114,7 @@ public class FileRead : Shared.FileRead, IFileRead
             _ = Directory.CreateDirectory(duplicateDirectory);
         string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
         File.Copy(reportFullPath, duplicateFile, overwrite: true);
-        WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile);
+        WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
@@ -127,7 +127,7 @@ public class FileRead : Shared.FileRead, IFileRead
         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            FileCopy(reportFullPath, dateTime);
+            FileCopy(reportFullPath, dateTime, descriptions);
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }

Adaptation/FileHandlers/IQSSi/FileRead.cs

@@ -121,30 +121,30 @@ public class FileRead : Shared.FileRead, IFileRead
             Tuple<string, string> lines = OpenInsight.FileRead.GetLines(_Logistics, descriptions);
             string check = lines.Item1.Replace(lines.Item2, "$Date$");
             ScopeInfo scopeInfo = new(tests[0], _IQSFile);
-            List<(Shared.Properties.IScopeInfo, string)> tuples = new();
+            List<(Shared.Properties.IScopeInfo, string)> collection = new();
             if (string.IsNullOrEmpty(_LastLines) || check != _LastLines)
-                tuples.Add(new(scopeInfo, lines.Item1));
+                collection.Add(new(scopeInfo, lines.Item1));
             _LastLines = check;
             string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
             string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
             if (!Directory.Exists(duplicateDirectory))
                 _ = Directory.CreateDirectory(duplicateDirectory);
             string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
-            WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile);
+            WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);
         }
     }
 
-    private void FileCopy(string reportFullPath, DateTime dateTime)
+    private void FileCopy<T>(string reportFullPath, DateTime dateTime, List<T> descriptions) where T : Shared.Properties.IDescription
     {
         bool isDummyRun = false;
         string successDirectory = string.Empty;
-        List<(Shared.Properties.IScopeInfo, string)> tuples = new();
+        List<(Shared.Properties.IScopeInfo, string)> collection = new();
         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);
-        WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile);
+        WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
@@ -161,7 +161,7 @@ public class FileRead : Shared.FileRead, IFileRead
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             SaveIQSFile(reportFullPath, dateTime, descriptions, tests);
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            FileCopy(reportFullPath, dateTime);
+            FileCopy(reportFullPath, dateTime, descriptions);
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }

Adaptation/FileHandlers/MoveAllFiles/FileRead.cs

@@ -13,6 +13,8 @@ namespace Adaptation.FileHandlers.MoveAllFiles;
 public class FileRead : Shared.FileRead, IFileRead
 {
 
+    private long? _TickOffset;
+
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
         base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
     {
@@ -97,7 +99,8 @@ public class FileRead : Shared.FileRead, IFileRead
         if (dateTime == DateTime.MinValue)
         { }
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results = new(string.Empty, null, null, new List<FileInfo>());
-        _Logistics = new Logistics(this, reportFullPath, useSplitForMID: true);
+        _TickOffset ??= new FileInfo(reportFullPath).LastWriteTime.Ticks - dateTime.Ticks;
+        _Logistics = new Logistics(this, _TickOffset.Value, reportFullPath, useSplitForMID: true);
         SetFileParameterLotIDToLogisticsMID();
 
         return results;

Adaptation/FileHandlers/OpenInsight/FileRead.cs

@@ -17,6 +17,7 @@ public class FileRead : Shared.FileRead, IFileRead
 {
 
     private string _LastLines;
+    private readonly string _IqsConnectionString;
     private readonly string _OpenInsightFilePattern;
 
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
@@ -32,6 +33,7 @@ public class FileRead : Shared.FileRead, IFileRead
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
         _LastLines = string.Empty;
+        _IqsConnectionString = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "IQS.ConnectionString");
         _OpenInsightFilePattern = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.FilePattern");
     }
 
@@ -167,27 +169,32 @@ public class FileRead : Shared.FileRead, IFileRead
     {
         if (dateTime == DateTime.MinValue)
         { }
-        if (!tests.Any())
+        bool isDummyRun = false;
+        List<(Shared.Properties.IScopeInfo, string)> collection = new();
+        string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
+        string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation);
+        if (parentParent.Contains(_CellInstanceName))
+            parentParent = Path.GetDirectoryName(parentParent);
+        string duplicateDirectory = Path.Combine(parentParent, "Data");
+        if (!descriptions.Any() || !tests.Any())
             _LastLines = string.Empty;
         else
         {
-            bool isDummyRun = false;
             Tuple<string, string> lines = GetLines(_Logistics, descriptions);
             string check = lines.Item1.Replace(lines.Item2, "$Date$");
-            ScopeInfo scopeInfo = new(tests[0], _OpenInsightFilePattern);
+            bool save = string.IsNullOrEmpty(_LastLines) || check != _LastLines;
-            List<(Shared.Properties.IScopeInfo, string)> tuples = new();
+            if (save && !string.IsNullOrEmpty(check))
-            if (string.IsNullOrEmpty(_LastLines) || check != _LastLines)
+                collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), lines.Item1));
-                tuples.Add(new(scopeInfo, lines.Item1));
             _LastLines = check;
-            string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
+            _ = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0]);
-            string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation);
+            // string commandText = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0]);
-            if (parentParent.Contains(_CellInstanceName))
+            // if (save && !string.IsNullOrEmpty(commandText))
-                parentParent = Path.GetDirectoryName(parentParent);
+            //     collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), commandText));
-            string duplicateDirectory = Path.Combine(parentParent, "Data");
             if (!Directory.Exists(duplicateDirectory))
                 _ = Directory.CreateDirectory(duplicateDirectory);
             string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
-            WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile);
+            if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
+                WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);
         }
     }
 

Adaptation/FileHandlers/OpenInsight/FromIQS.cs

@@ -0,0 +1,103 @@
+using Adaptation.Shared;
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+
+namespace Adaptation.FileHandlers.OpenInsight;
+
+public class FromIQS
+{
+
+#nullable enable
+
+    private static string GetCommandText(Logistics logistics, txt.Description description, string dateTime, string? sid)
+    {
+        StringBuilder result = new();
+        _ = result
+                .AppendLine(" select ")
+                .AppendLine("       se.f_sgrp se_sgrp, ")
+                .AppendLine("       se.f_sgtm se_sgtm, ")
+                .AppendLine("       se.f_tsno se_tsno, ")
+                .AppendLine("       se.f_val se_val, ")
+                .AppendLine("       rd.f_name rd_name, ")
+                .AppendLine("       jd.f_name jd_name, ")
+                .AppendLine("       pl.f_name pl_name, ")
+                .AppendLine("       pd.f_name pd_name, ")
+                .AppendLine("       td.f_test td_test, ")
+                .AppendLine("       td.f_name td_name ")
+                .AppendLine(" from [spcepiworld].[dbo].[sgrp_ext] se ")
+                .AppendLine(" join [spcepiworld].[dbo].[prcs_dat] rd ")
+                .AppendLine("   on se.f_prcs = rd.f_prcs ")
+                .AppendLine(" join [spcepiworld].[dbo].[job_dat] jd ")
+                .AppendLine("   on se.f_job = jd.f_job ")
+                .AppendLine(" join [spcepiworld].[dbo].[part_lot] pl ")
+                .AppendLine("   on se.f_lot = pl.f_lot ")
+                .AppendLine(" join [spcepiworld].[dbo].[part_dat] pd ")
+                .AppendLine("   on se.f_part = pd.f_part ")
+                .AppendLine(" join [spcepiworld].[dbo].[test_dat] td  ")
+                .AppendLine("   on se.f_test = td.f_test ")
+                .AppendLine(" where se.f_flag = 0 ");
+        if (!string.IsNullOrEmpty(sid))
+            _ = result.Append("   and se.f_sgrp = ").Append(sid).AppendLine("  ");
+        _ = result
+                .Append("   and rd.f_name = '").Append(description.Reactor).AppendLine("' ")
+                .Append("   and pd.f_name = '").Append(description.PSN).AppendLine("' ")
+                .AppendLine("   and jd.f_name in ('SP1') ")
+                .Append("   and jd.f_name = '").Append(logistics.MesEntity).AppendLine("' ")
+                .Append("   and pl.f_name = '").Append(description.RDS).AppendLine("' ")
+                .Append("   and dateadd(HH, -7, (dateadd(SS, convert(bigint, se.f_sgtm), '19700101'))) = '").Append(dateTime).AppendLine("' ")
+                .AppendLine("   for json path ");
+        return result.ToString();
+    }
+
+    private static StringBuilder GetForJsonPath(string connectionString, string commandText)
+    {
+        StringBuilder stringBuilder = new();
+        using SqlConnection sqlConnection = new(connectionString);
+        sqlConnection.Open();
+        using SqlCommand sqlCommand = new(commandText, sqlConnection);
+        SqlDataReader sqlDataReader = sqlCommand.ExecuteReader(CommandBehavior.SequentialAccess);
+        while (sqlDataReader.Read())
+            _ = stringBuilder.Append(sqlDataReader.GetString(0));
+        return stringBuilder;
+    }
+
+    internal static string GetCommandText(string connectionString, Logistics logistics, txt.Description description)
+    {
+        string result;
+        string dateTime;
+        string dateFormat = txt.Description.GetDateFormat();
+        if (DateTime.TryParseExact(description.Date, dateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime dateTimeParsed))
+            dateTime = dateTimeParsed.ToString("yyyy-MM-dd HH:mm:ss");
+        else if (DateTime.TryParse(description.Date, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTimeParsed))
+            dateTime = dateTimeParsed.ToString("yyyy-MM-dd HH:mm:ss");
+        else
+            dateTime = logistics.DateTimeFromSequence.ToString("yyyy-MM-dd HH:mm:ss");
+        string commandText = GetCommandText(logistics, description, dateTime, sid: null);
+        StringBuilder stringBuilder = GetForJsonPath(connectionString, commandText);
+        if (stringBuilder.Length == 0)
+            result = commandText;
+        else
+        {
+            JsonElement[]? jsonElements = JsonSerializer.Deserialize<JsonElement[]>(stringBuilder.ToString());
+            if (jsonElements is null || !jsonElements.Any() || jsonElements[0].ValueKind != JsonValueKind.Object)
+                result = commandText;
+            else
+            {
+                JsonProperty[] jsonProperties = jsonElements[0].EnumerateObject().ToArray();
+                if (!jsonProperties.Any() || jsonProperties[0].Name != "se_sgrp")
+                    result = commandText;
+                else
+                    result = GetCommandText(logistics, description, dateTime, sid: jsonProperties[0].Value.ToString());
+            }
+        }
+        return result;
+    }
+
+#nullable disable
+
+}

Adaptation/FileHandlers/SPaCe/FileRead.cs

@@ -103,15 +103,15 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    private void FileCopy(string reportFullPath, DateTime dateTime)
+    private void FileCopy<T>(string reportFullPath, DateTime dateTime, List<T> descriptions) where T : Shared.Properties.IDescription
     {
         bool isDummyRun = false;
         string successDirectory = string.Empty;
-        List<(Shared.Properties.IScopeInfo, string)> tuples = new();
+        List<(Shared.Properties.IScopeInfo, string)> collection = new();
         string duplicateDirectory = _FileConnectorConfiguration.TargetFileLocation;
         string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
         File.Copy(reportFullPath, duplicateFile, overwrite: true);
-        WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile);
+        WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
@@ -126,7 +126,7 @@ public class FileRead : Shared.FileRead, IFileRead
         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            FileCopy(reportFullPath, dateTime);
+            FileCopy(reportFullPath, dateTime, descriptions);
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }

Adaptation/FileHandlers/TIBCO/FileRead.cs

@@ -13,6 +13,8 @@ namespace Adaptation.FileHandlers.TIBCO;
 public class FileRead : Shared.FileRead, IFileRead
 {
 
+    private long? _TickOffset;
+
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
         base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
     {
@@ -125,7 +127,8 @@ public class FileRead : Shared.FileRead, IFileRead
         if (dateTime == DateTime.MinValue)
         { }
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results = new(string.Empty, null, null, new List<FileInfo>());
-        _Logistics = new Logistics(this, reportFullPath, useSplitForMID: true);
+        _TickOffset ??= new FileInfo(reportFullPath).LastWriteTime.Ticks - dateTime.Ticks;
+        _Logistics = new Logistics(this, _TickOffset.Value, reportFullPath, useSplitForMID: true);
         SetFileParameterLotIDToLogisticsMID();
         return results;
     }

Adaptation/FileHandlers/TIBCO/Transport/Job.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
@@ -289,10 +290,28 @@ public class Job
 
     private static string GetRunJson(string lsl2SQLConnectionString, int? rds, int? workOrderNumber, int? workOrderCassette, int? slot, int? reactor)
     {
-        string result;
+        StringBuilder result = new();
-        object scalar = null;
+        string commandText = GetCommandText(rds, workOrderNumber, workOrderCassette, slot, reactor);
-        StringBuilder sql = new();
+        try
-        _ = sql.Append(" select ").
+        {
+            using SqlConnection sqlConnection = new(lsl2SQLConnectionString);
+            sqlConnection.Open();
+            using SqlCommand sqlCommand = new(commandText, sqlConnection);
+            SqlDataReader sqlDataReader = sqlCommand.ExecuteReader(CommandBehavior.SequentialAccess);
+            while (sqlDataReader.Read())
+                _ = result.Append(sqlDataReader.GetString(0));
+        }
+        catch (Exception)
+        {
+            _ = result.Clear();
+        }
+        return result.ToString();
+    }
+
+    private static string GetCommandText(int? rds, int? workOrderNumber, int? workOrderCassette, int? slot, int? reactor)
+    {
+        StringBuilder result = new();
+        _ = result.Append(" select ").
                 Append("         rr.rds_no ").
                 Append("       , rr.reactor ").
                 Append("       , rr.ps_no ").
@@ -364,21 +383,7 @@ public class Job
                 Append("       and qa.reactor = ").Append(reactor is null ? -1 : reactor.Value).Append(' ').
                 Append(" ) ").
                 Append(" for json path ");
-        try
+        return result.ToString();
-        {
-            using SqlConnection sqlConnection = new(lsl2SQLConnectionString);
-            sqlConnection.Open();
-            using (SqlCommand sqlCommand = new(sql.ToString(), sqlConnection))
-                scalar = sqlCommand.ExecuteScalar();
-            sqlConnection.Close();
-        }
-        catch (Exception)
-        { }
-        if (scalar is null)
-            result = string.Empty;
-        else
-            result = scalar.ToString();
-        return result;
     }
 
     private static (string, string, int?, string, int?, string) Get(string lsl2SQLConnectionString, string layer, string psn, int? reactorNumber, int? slotNumber, int? workOrderNumber, int? workOrderCassette, string zone)

Adaptation/FileHandlers/txt/Description.cs

@@ -776,7 +776,7 @@ public class Description : IDescription, Shared.Properties.IDescription
                     ProcessJobID = logistics.ProcessJobID,
                     MID = logistics.MID,
                     //
-                    Date = processData.Date,
+                    Date = processData.Date.ToString(GetDateFormat()),
                     Employee = processData.Employee,
                     Lot = processData.Lot,
                     PSN = processData.PSN,
@@ -1442,4 +1442,6 @@ public class Description : IDescription, Shared.Properties.IDescription
         return result;
     }
 
+    internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt";
+
 }

Adaptation/FileHandlers/txt/FileRead.cs

@@ -14,6 +14,8 @@ namespace Adaptation.FileHandlers.txt;
 public class FileRead : Shared.FileRead, IFileRead
 {
 
+    private long? _TickOffset;
+
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
         base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
     {
@@ -96,7 +98,8 @@ 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 = new(string.Empty, null, null, new List<FileInfo>());
-        _Logistics = new Logistics(this, reportFullPath, useSplitForMID: true);
+        _TickOffset ??= new FileInfo(reportFullPath).LastWriteTime.Ticks - dateTime.Ticks;
+        _Logistics = new Logistics(this, _TickOffset.Value, reportFullPath, useSplitForMID: true);
         SetFileParameterLotIDToLogisticsMID();
         if (_Logistics.FileInfo.Length < _MinFileLength)
             results.Item4.Add(_Logistics.FileInfo);

Adaptation/FileHandlers/txt/ProcessData.cs

@@ -23,7 +23,7 @@ public class ProcessData : IProcessData
 
     public string JobID { get; set; }
     public string MesEntity { get; set; }
-    public string Date { get; set; }
+    public DateTime Date { get; set; }
     public string DcnAllMax { get; set; }
     public string DcnAllMean { get; set; }
     public string DcnAllMin { get; set; }
@@ -283,7 +283,7 @@ public class ProcessData : IProcessData
         _Data = string.Empty;
         JobID = logistics.JobID;
         MesEntity = logistics.MesEntity;
-        Date = DateTime.Now.ToString();
+        Date = DateTime.Now;
         _Log = LogManager.GetLogger(typeof(ProcessData));
         Parse(fileRead, logistics, fileInfoCollection);
     }

Adaptation/MET08DDUPSP1TBI.Tests.csproj

@@ -39,11 +39,11 @@
         <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.json" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
         <PackageReference Include="Microsoft.Win32.SystemEvents" Version="6.0.1" />
     </ItemGroup>
     <ItemGroup>
@@ -51,11 +51,11 @@
         <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
         <PackageReference Include="System.Data.OleDb" Version="6.0.0" />
-        <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+        <PackageReference Include="System.Data.SqlClient" Version="4.8.4" />
         <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-        <PackageReference Include="System.Text.Json" Version="6.0.3" />
+        <PackageReference Include="System.Text.Json" Version="6.0.6" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="coverlet.collector" Version="3.1.2">
@@ -65,7 +65,7 @@
         <PackageReference Include="FFMpegCore" Version="4.8.0" />
         <PackageReference Include="Infineon.Yoda" Version="5.4.1" />
         <PackageReference Include="Instances" Version="2.0.0" />
-        <PackageReference Include="RoboSharp" Version="1.2.7" />
+        <PackageReference Include="RoboSharp" Version="1.2.8" />
         <PackageReference Include="Tesseract" Version="4.1.1" />
         <PackageReference Include="Tibco.Rendezvous" Version="8.5.0" />
     </ItemGroup>

Adaptation/Shared/Duplicator/Description.cs

@@ -12,6 +12,7 @@ public class Description : IDescription, Properties.IDescription
     public int Test { get; set; }
     public int Count { get; set; }
     public int Index { get; set; }
+    public string RDS { get; set; }
     //
     public string EventName { get; set; }
     public string NullData { get; set; }
@@ -139,4 +140,6 @@ public class Description : IDescription, Properties.IDescription
         return result;
     }
 
+    internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt";
+
 }

Adaptation/Shared/FileRead.cs

@@ -260,24 +260,23 @@ public class FileRead : Properties.IFileRead
         return results;
     }
 
-    protected static string GetTupleFile(Logistics logistics, Properties.IScopeInfo scopeInfo, string duplicateDirectory)
+    protected static string GetTupleFile<T>(Logistics logistics, List<T> descriptions, Properties.IScopeInfo scopeInfo, string duplicateDirectory) where T : Properties.IDescription
     {
         string result;
         string rds;
         string dateValue;
-        string datePlaceholder;
+        string rdsPlaceholder = "%RDS%";
-        string[] segments = logistics.MID.Split('-');
+        if (!descriptions.Any() || string.IsNullOrEmpty(descriptions[0].RDS))
-        if (segments.Length < 2)
+            rds = logistics.MID;
-            rds = "%RDS%";
         else
-            rds = segments[1];
+            rds = descriptions[0].RDS;
-        segments = scopeInfo.FileName.Split(new string[] { "DateTime:" }, StringSplitOptions.RemoveEmptyEntries);
+        string[] segments = scopeInfo.FileName.Split(new string[] { "DateTime:" }, StringSplitOptions.RemoveEmptyEntries);
         if (segments.Length == 0)
-            result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileNameWithoutExtension.Replace("%RDS%", rds));
+            result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileNameWithoutExtension.Replace(rdsPlaceholder, rds));
         else
         {
-            datePlaceholder = "%DateTime%";
             segments = segments[1].Split('%');
+            string datePlaceholder = "%DateTime%";
             dateValue = logistics.DateTimeFromSequence.ToString(segments[0]);
             foreach (string segment in scopeInfo.FileName.Split('%'))
             {
@@ -285,18 +284,19 @@ public class FileRead : Properties.IFileRead
                     continue;
                 datePlaceholder = string.Concat('%', segment, '%');
             }
-            result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileName.Replace("%RDS%", rds).Replace(datePlaceholder, dateValue));
+            result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileName.Replace(rdsPlaceholder, rds).Replace(datePlaceholder, dateValue));
         }
         if (result.Contains('%'))
             throw new Exception("Placeholder exists!");
         return result;
     }
 
-    protected void WaitForFileConsumption(string sourceDirectoryCloaking, Logistics logistics, DateTime dateTime, string successDirectory, string duplicateDirectory, string duplicateFile, List<(Properties.IScopeInfo, string)> tuples)
+    protected void WaitForFileConsumption<T>(string sourceDirectoryCloaking, Logistics logistics, DateTime dateTime, List<T> descriptions, string successDirectory, string duplicateDirectory, string duplicateFile, List<(Properties.IScopeInfo, string)> collection) where T : Properties.IDescription
     {
         bool check;
         long preWait;
         string tupleFile;
+        string tupleFileName = string.Empty;
         List<string> duplicateFiles = new();
         StringBuilder stringBuilder = new();
         List<int> consumedFileIndices = new();
@@ -306,20 +306,22 @@ public class FileRead : Properties.IFileRead
             preWait = dateTime.AddMilliseconds(1234).Ticks;
         else
             preWait = dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
-        if (!tuples.Any())
+        if (!collection.Any())
             duplicateFiles.Add(duplicateFile);
         string fileName = Path.GetFileNameWithoutExtension(logistics.ReportFullPath);
         string successFile = string.Concat(successDirectory, @"\", Path.GetFileName(logistics.ReportFullPath));
-        foreach ((Properties.IScopeInfo scopeInfo, string text) in tuples)
+        foreach ((Properties.IScopeInfo scopeInfo, string text) in collection)
         {
             if (scopeInfo.FileName.StartsWith(@"\"))
                 tupleFile = scopeInfo.FileName;
             else if (!scopeInfo.FileName.Contains('%'))
                 tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", scopeInfo.FileNameWithoutExtension, ".pdsfc");
             else
-                tupleFile = GetTupleFile(logistics, scopeInfo, duplicateDirectory);
+                tupleFile = GetTupleFile(logistics, descriptions, scopeInfo, duplicateDirectory);
+            tupleFileName = Path.GetFileNameWithoutExtension(tupleFile).Split('.')[0];
             duplicateFiles.Add(tupleFile);
-            File.WriteAllText(tupleFile, text);
+            if (_IsEAFHosted)
+                File.WriteAllText(tupleFile, text);
         }
         for (short i = 0; i < short.MaxValue; i++)
         {
@@ -340,7 +342,17 @@ public class FileRead : Properties.IFileRead
                         for (int i = 0; i < duplicateFiles.Count; i++)
                         {
                             if (!File.Exists(duplicateFiles[i]))
-                                consumedFileIndices.Add(i);
+                            {
+                                if (string.IsNullOrEmpty(tupleFileName))
+                                    consumedFileIndices.Add(i);
+                                else if (duplicateFiles.All(l => Path.GetFileNameWithoutExtension(l).Split('.')[0] == tupleFileName))
+                                {
+                                    for (int j = 0; j < duplicateFiles.Count; j++)
+                                        consumedFileIndices.Add(j);
+                                }
+                                else
+                                    consumedFileIndices.Add(i);
+                            }
                         }
                         if (consumedFileIndices.Count == duplicateFiles.Count)
                             break;
@@ -599,10 +611,10 @@ public class FileRead : Properties.IFileRead
         }
     }
 
-    protected void WaitForFileConsumption(DateTime dateTime, bool isDummyRun, string successDirectory, string duplicateDirectory, List<(Properties.IScopeInfo, string)> tuples, string duplicateFile)
+    protected void WaitForFileConsumption<T>(DateTime dateTime, List<T> descriptions, bool isDummyRun, string successDirectory, string duplicateDirectory, List<(Properties.IScopeInfo, string)> collection, string duplicateFile) where T : Properties.IDescription
     {
         if (!isDummyRun && _IsEAFHosted)
-            WaitForFileConsumption(_FileConnectorConfiguration.SourceDirectoryCloaking, _Logistics, dateTime, successDirectory, duplicateDirectory, duplicateFile, tuples);
+            WaitForFileConsumption(_FileConnectorConfiguration.SourceDirectoryCloaking, _Logistics, dateTime, descriptions, successDirectory, duplicateDirectory, duplicateFile, collection);
         else
         {
             long breakAfter = DateTime.Now.AddSeconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;

Adaptation/Shared/Logistics.cs

@@ -51,7 +51,7 @@ public class Logistics : ILogistics
         _Logistics2 = new List<Logistics2>();
     }
 
-    public Logistics(IFileRead fileRead, string reportFullPath, bool useSplitForMID, int? fileInfoLength = null)
+    public Logistics(IFileRead fileRead, long tickOffset, string reportFullPath, bool useSplitForMID, int? fileInfoLength = null)
     {
         if (string.IsNullOrEmpty(fileRead.CellInstanceName))
             throw new Exception();
@@ -59,7 +59,7 @@ public class Logistics : ILogistics
             throw new Exception();
         _NullData = fileRead.NullData;
         _FileInfo = new(reportFullPath);
-        DateTime dateTime = _FileInfo.LastWriteTime;
+        DateTime dateTime = new(_FileInfo.LastWriteTime.Ticks + tickOffset);
         if (fileInfoLength.HasValue && _FileInfo.Length < fileInfoLength.Value)
             dateTime = dateTime.AddTicks(-1);
         _JobID = fileRead.CellInstanceName;

Adaptation/Shared/Metrology/ScopeInfo.cs

@@ -16,7 +16,7 @@ public class ScopeInfo : Properties.IScopeInfo
     public string QueryFilter { get; private set; }
     public string FileNameWithoutExtension { get; private set; }
 
-    public ScopeInfo(Test test, string fileName, string queryFilter = "", string title = "", string html = "")
+    public ScopeInfo(Test test, string fileName, string queryFilter = "", string title = "", string html = "", string extraExtension = "")
     {
         Enum = test;
         Test = test;

Adaptation/Shared/Metrology/WS.cs

@@ -44,8 +44,7 @@ public partial class WS
                 _ = stringBuilder.AppendLine(exception.Message);
                 exception = exception.InnerException;
             }
-            if (results.Errors is null)
+            results.Errors ??= new List<string>();
-                results.Errors = new List<string>();
             results.Errors.Add(stringBuilder.ToString());
         }
         return new(resultsJson, results);

Adaptation/Shared/ProcessDataStandardFormat.cs

@@ -91,8 +91,7 @@ public class ProcessDataStandardFormat
         string segment;
         List<string> body = new();
         StringBuilder logistics = new();
-        if (lines is null)
+        lines ??= File.ReadAllLines(reportFullPath);
-            lines = File.ReadAllLines(reportFullPath);
         string[] segments;
         if (lines.Length < 7)
             segments = Array.Empty<string>();
@@ -276,8 +275,7 @@ public class ProcessDataStandardFormat
     public static string GetLines(Logistics logistics, Properties.IScopeInfo scopeInfo, List<string> names, Dictionary<string, List<string>> keyValuePairs, string dateFormat, string timeFormat, List<string> pairedParameterNames, bool useDateTimeFromSequence = true, string format = "", List<string> ignoreParameterNames = null)
     {
         StringBuilder result = new();
-        if (ignoreParameterNames is null)
+        ignoreParameterNames ??= new List<string>();
-            ignoreParameterNames = new List<string>();
         if (useDateTimeFromSequence && !string.IsNullOrEmpty(format))
             throw new Exception();
         else if (!useDateTimeFromSequence && string.IsNullOrEmpty(format))
@@ -357,8 +355,7 @@ public class ProcessDataStandardFormat
             if (string.IsNullOrEmpty(lines[i]))
                 continue;
             segments = lines[i].Split(inputSeparator);
-            if (currentGroup is null)
+            currentGroup ??= segments.Length;
-                currentGroup = segments.Length;
             if (segments.Length != currentGroup)
             {
                 currentGroup = segments.Length;

Adaptation/Shared/Properties/IDescription.cs

@@ -6,5 +6,6 @@ public interface IDescription
     int Test { get; }
     int Count { get; }
     int Index { get; }
+    string RDS { get; }
 
 }

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

@@ -31,8 +31,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
     [ClassInitialize]
     public static void ClassInitialize(TestContext testContext)
     {
-        if (EAFLoggingUnitTesting is null)
+        EAFLoggingUnitTesting ??= new MET08DDUPSP1TBI(testContext);
-            EAFLoggingUnitTesting = new MET08DDUPSP1TBI(testContext);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
         string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
         File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
@@ -42,10 +41,8 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
     [ClassCleanup()]
     public static void ClassCleanup()
     {
-        if (EAFLoggingUnitTesting.Logger is not null)
+        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
-            EAFLoggingUnitTesting.Logger.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
-        if (EAFLoggingUnitTesting is not null)
-            EAFLoggingUnitTesting.Dispose();
     }
 
 #if true

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

@@ -30,8 +30,7 @@ public class SP101_EQPT : EAFLoggingUnitTesting
     [ClassInitialize]
     public static void ClassInitialize(TestContext testContext)
     {
-        if (EAFLoggingUnitTesting is null)
+        EAFLoggingUnitTesting ??= new SP101_EQPT(testContext);
-            EAFLoggingUnitTesting = new SP101_EQPT(testContext);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
         string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
         File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
@@ -41,10 +40,8 @@ public class SP101_EQPT : EAFLoggingUnitTesting
     [ClassCleanup()]
     public static void ClassCleanup()
     {
-        if (EAFLoggingUnitTesting.Logger is not null)
+        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
-            EAFLoggingUnitTesting.Logger.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
-        if (EAFLoggingUnitTesting is not null)
-            EAFLoggingUnitTesting.Dispose();
     }
 
 #if true

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

@@ -31,8 +31,7 @@ public class SP101 : EAFLoggingUnitTesting
     [ClassInitialize]
     public static void ClassInitialize(TestContext testContext)
     {
-        if (EAFLoggingUnitTesting is null)
+        EAFLoggingUnitTesting ??= new SP101(testContext);
-            EAFLoggingUnitTesting = new SP101(testContext);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
         string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
         File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
@@ -42,10 +41,8 @@ public class SP101 : EAFLoggingUnitTesting
     [ClassCleanup()]
     public static void ClassCleanup()
     {
-        if (EAFLoggingUnitTesting.Logger is not null)
+        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
-            EAFLoggingUnitTesting.Logger.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
-        if (EAFLoggingUnitTesting is not null)
-            EAFLoggingUnitTesting.Dispose();
     }
 
 #if true

Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/MET08DDUPSP1TBI.cs

@@ -31,8 +31,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
     [ClassInitialize]
     public static void ClassInitialize(TestContext testContext)
     {
-        if (EAFLoggingUnitTesting is null)
+        EAFLoggingUnitTesting ??= new MET08DDUPSP1TBI(testContext);
-            EAFLoggingUnitTesting = new MET08DDUPSP1TBI(testContext);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
         string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
         File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
@@ -42,10 +41,8 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
     [ClassCleanup()]
     public static void ClassCleanup()
     {
-        if (EAFLoggingUnitTesting.Logger is not null)
+        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
-            EAFLoggingUnitTesting.Logger.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
-        if (EAFLoggingUnitTesting is not null)
-            EAFLoggingUnitTesting.Dispose();
     }
 
 #if true

Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/SP101-EQPT.cs

@@ -30,8 +30,7 @@ public class SP101_EQPT : EAFLoggingUnitTesting
     [ClassInitialize]
     public static void ClassInitialize(TestContext testContext)
     {
-        if (EAFLoggingUnitTesting is null)
+        EAFLoggingUnitTesting ??= new SP101_EQPT(testContext);
-            EAFLoggingUnitTesting = new SP101_EQPT(testContext);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
         string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
         File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
@@ -41,10 +40,8 @@ public class SP101_EQPT : EAFLoggingUnitTesting
     [ClassCleanup()]
     public static void ClassCleanup()
     {
-        if (EAFLoggingUnitTesting.Logger is not null)
+        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
-            EAFLoggingUnitTesting.Logger.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
-        if (EAFLoggingUnitTesting is not null)
-            EAFLoggingUnitTesting.Dispose();
     }
 
 #if true

Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/SP101.cs

@@ -31,8 +31,7 @@ public class SP101 : EAFLoggingUnitTesting
     [ClassInitialize]
     public static void ClassInitialize(TestContext testContext)
     {
-        if (EAFLoggingUnitTesting is null)
+        EAFLoggingUnitTesting ??= new SP101(testContext);
-            EAFLoggingUnitTesting = new SP101(testContext);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
         string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
         File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
@@ -42,10 +41,8 @@ public class SP101 : EAFLoggingUnitTesting
     [ClassCleanup()]
     public static void ClassCleanup()
     {
-        if (EAFLoggingUnitTesting.Logger is not null)
+        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
-            EAFLoggingUnitTesting.Logger.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
-        if (EAFLoggingUnitTesting is not null)
-            EAFLoggingUnitTesting.Dispose();
     }
 
 #if true

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

@@ -31,8 +31,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
     [ClassInitialize]
     public static void ClassInitialize(TestContext testContext)
     {
-        if (EAFLoggingUnitTesting is null)
+        EAFLoggingUnitTesting ??= new MET08DDUPSP1TBI(testContext);
-            EAFLoggingUnitTesting = new MET08DDUPSP1TBI(testContext);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
         string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
         File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
@@ -42,10 +41,8 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
     [ClassCleanup()]
     public static void ClassCleanup()
     {
-        if (EAFLoggingUnitTesting.Logger is not null)
+        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
-            EAFLoggingUnitTesting.Logger.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
-        if (EAFLoggingUnitTesting is not null)
-            EAFLoggingUnitTesting.Dispose();
     }
 
 #if true

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

@@ -33,8 +33,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
     [ClassInitialize]
     public static void ClassInitialize(TestContext testContext)
     {
-        if (EAFLoggingUnitTesting is null)
+        EAFLoggingUnitTesting ??= new MET08DDUPSP1TBI(testContext);
-            EAFLoggingUnitTesting = new MET08DDUPSP1TBI(testContext);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
         string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
         File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
@@ -44,10 +43,8 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
     [ClassCleanup()]
     public static void ClassCleanup()
     {
-        if (EAFLoggingUnitTesting.Logger is not null)
+        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
-            EAFLoggingUnitTesting.Logger.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
-        if (EAFLoggingUnitTesting is not null)
-            EAFLoggingUnitTesting.Dispose();
     }
 
 #if true

Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101-EQPT.cs

@@ -32,8 +32,7 @@ public class SP101_EQPT : EAFLoggingUnitTesting
     [ClassInitialize]
     public static void ClassInitialize(TestContext testContext)
     {
-        if (EAFLoggingUnitTesting is null)
+        EAFLoggingUnitTesting ??= new SP101_EQPT(testContext);
-            EAFLoggingUnitTesting = new SP101_EQPT(testContext);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
         string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
         File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
@@ -43,10 +42,8 @@ public class SP101_EQPT : EAFLoggingUnitTesting
     [ClassCleanup()]
     public static void ClassCleanup()
     {
-        if (EAFLoggingUnitTesting.Logger is not null)
+        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
-            EAFLoggingUnitTesting.Logger.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
-        if (EAFLoggingUnitTesting is not null)
-            EAFLoggingUnitTesting.Dispose();
     }
 
 #if true

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

@@ -33,8 +33,7 @@ public class SP101 : EAFLoggingUnitTesting
     [ClassInitialize]
     public static void ClassInitialize(TestContext testContext)
     {
-        if (EAFLoggingUnitTesting is null)
+        EAFLoggingUnitTesting ??= new SP101(testContext);
-            EAFLoggingUnitTesting = new SP101(testContext);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
         string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
         File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
@@ -44,10 +43,8 @@ public class SP101 : EAFLoggingUnitTesting
     [ClassCleanup()]
     public static void ClassCleanup()
     {
-        if (EAFLoggingUnitTesting.Logger is not null)
+        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
-            EAFLoggingUnitTesting.Logger.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
-        if (EAFLoggingUnitTesting is not null)
-            EAFLoggingUnitTesting.Dispose();
     }
 
 #if true

Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08DDUPSP1TBI.cs

@@ -0,0 +1,180 @@
+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.Staging.v2_47_1;
+
+[TestClass]
+public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static MET08DDUPSP1TBI EAFLoggingUnitTesting { get; private set; }
+
+    static MET08DDUPSP1TBI() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+
+    public MET08DDUPSP1TBI() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public MET08DDUPSP1TBI(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new MET08DDUPSP1TBI(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 true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__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 true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__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 true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__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 true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__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 true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__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 true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__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 true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__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 true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__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 true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__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 true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__Dummy()
+    {
+        string check = "637400762024374000.zip";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}

Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/SP101-EQPT.cs

@@ -0,0 +1,62 @@
+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.Staging.v2_47_1;
+
+[TestClass]
+public class SP101_EQPT : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static SP101_EQPT EAFLoggingUnitTesting { get; private set; }
+
+    static SP101_EQPT() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+
+    public SP101_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public SP101_EQPT(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new SP101_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 true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__SP101_EQPT__MoveAllFiles()
+    {
+        string check = "*";
+        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"));
+    }
+
+}

Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/SP101.cs

@@ -0,0 +1,63 @@
+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.Staging.v2_47_1;
+
+[TestClass]
+public class SP101 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static SP101 EAFLoggingUnitTesting { get; private set; }
+
+    static SP101() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+
+    public SP101() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public SP101(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new SP101(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 true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__SP101__txt()
+    {
+        string check = "*.txt";
+        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"));
+    }
+
+}

Adaptation/_Tests/Extract/Staging/v2.43.4/MET08DDUPSP1TBI.cs

@@ -28,6 +28,9 @@ public class MET08DDUPSP1TBI
     [TestMethod]
     public void Staging__v2_43_4__MET08DDUPSP1TBI__MoveMatchingFiles() => _MET08DDUPSP1TBI.Staging__v2_43_4__MET08DDUPSP1TBI__MoveMatchingFiles();
 
+#if true
+    [Ignore]
+#endif
     [TestMethod]
     public void Staging__v2_43_4__MET08DDUPSP1TBI__MoveMatchingFiles637955319879801344__Normal()
     {

Adaptation/_Tests/Extract/Staging/v2.43.4/SP101.cs

@@ -28,6 +28,9 @@ public class SP101
     [TestMethod]
     public void Staging__v2_43_4__SP101__txt() => _SP101.Staging__v2_43_4__SP101__txt();
 
+#if true
+    [Ignore]
+#endif
     [TestMethod]
     public void Staging__v2_43_4__SP101__txt637955319879801344__Normal()
     {

Adaptation/_Tests/Extract/Staging/v2.47.1/MET08DDUPSP1TBI.cs

@@ -0,0 +1,116 @@
+using Adaptation.Shared;
+using Adaptation.Shared.Methods;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Adaptation._Tests.Extract.Staging.v2_47_1;
+
+[TestClass]
+public class MET08DDUPSP1TBI
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Staging.v2_47_1.MET08DDUPSP1TBI _MET08DDUPSP1TBI;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Staging.v2_47_1.MET08DDUPSP1TBI.ClassInitialize(testContext);
+        _MET08DDUPSP1TBI = CreateSelfDescription.Staging.v2_47_1.MET08DDUPSP1TBI.EAFLoggingUnitTesting;
+    }
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__MoveMatchingFiles() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__MoveMatchingFiles();
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__MoveMatchingFiles637955319879801344__Normal()
+    {
+        string check = "*.pdsf";
+        bool validatePDSF = false;
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__MoveMatchingFiles();
+        string[] variables = _MET08DDUPSP1TBI.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _MET08DDUPSP1TBI.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+    }
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsightMetrologyViewer();
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__IQSSi() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__IQSSi();
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsight() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsight();
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsight638052814829645888__IqsSql()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsight();
+        string[] variables = _MET08DDUPSP1TBI.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _MET08DDUPSP1TBI.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+    }
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments();
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__APC() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__APC();
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__SPaCe() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__SPaCe();
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__Processed() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__Processed();
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__Archive() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__Archive();
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__MET08DDUPSP1TBI__Dummy() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__Dummy();
+
+}

Adaptation/_Tests/Extract/Staging/v2.47.1/SP101.cs

@@ -0,0 +1,47 @@
+using Adaptation.Shared;
+using Adaptation.Shared.Methods;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Adaptation._Tests.Extract.Staging.v2_47_1;
+
+[TestClass]
+public class SP101
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Staging.v2_47_1.SP101 _SP101;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Staging.v2_47_1.SP101.ClassInitialize(testContext);
+        _SP101 = CreateSelfDescription.Staging.v2_47_1.SP101.EAFLoggingUnitTesting;
+    }
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__SP101__txt() => _SP101.Staging__v2_47_1__SP101__txt();
+
+#if true
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_1__SP101__txt637955319879801344__Normal()
+    {
+        string check = "*.txt";
+        bool validatePDSF = false;
+        _SP101.Staging__v2_47_1__SP101__txt();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _SP101.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _SP101.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+    }
+
+}

Adaptation/_Tests/Shared/AdaptationTesting.cs

@@ -621,14 +621,10 @@ public class AdaptationTesting : ISMTP
         result = JsonSerializer.Deserialize<FileConnectorConfiguration>(json, jsonSerializerOptions);
         if (string.IsNullOrEmpty(result.SourceFileFilter))
             result.SourceFileFilter = string.Empty;
-        if (result.ErrorTargetFileLocation is null)
+        result.ErrorTargetFileLocation ??= string.Empty;
-            result.ErrorTargetFileLocation = string.Empty;
+        result.SourceFileLocation ??= string.Empty;
-        if (result.SourceFileLocation is null)
+        result.TargetFileLocation ??= string.Empty;
-            result.SourceFileLocation = string.Empty;
+        result.FolderAgeCheckIndividualSubFolders ??= false;
-        if (result.TargetFileLocation is null)
-            result.TargetFileLocation = string.Empty;
-        if (result.FolderAgeCheckIndividualSubFolders is null)
-            result.FolderAgeCheckIndividualSubFolders = false;
         result.ConnectionSettings = new List<ConnectionSetting>();
         result.SourceFileFilters = result.SourceFileFilter.Split('|').ToList();
         if (componentsCellComponentCellComponent.Equipment?.ConnectionSettings is not null)

Adaptation/_Tests/Shared/UnitTesting.cs

@@ -55,8 +55,7 @@ public class UnitTesting
                         _IsEnvironment = new IsEnvironment(testCategory);
                 }
             }
-            if (_IsEnvironment is null)
+            _IsEnvironment ??= new IsEnvironment(processesCount: null, nullASPNetCoreEnvironmentIsDevelopment: Debugger.IsAttached, nullASPNetCoreEnvironmentIsProduction: !Debugger.IsAttached);
-                _IsEnvironment = new IsEnvironment(processesCount: null, nullASPNetCoreEnvironmentIsDevelopment: Debugger.IsAttached, nullASPNetCoreEnvironmentIsProduction: !Debugger.IsAttached);
         }
     }
 

Adaptation/_Tests/Static/Job.cs

@@ -27,19 +27,13 @@ public class Job : LoggingUnitTesting, IDisposable
     }
 
     [ClassInitialize]
-    public static void ClassInitialize(TestContext testContext)
+    public static void ClassInitialize(TestContext testContext) => LoggingUnitTesting ??= new Job(testContext);
-    {
-        if (LoggingUnitTesting is null)
-            LoggingUnitTesting = new Job(testContext);
-    }
 
     [ClassCleanup()]
     public static void ClassCleanup()
     {
-        if (LoggingUnitTesting.Logger is not null)
+        LoggingUnitTesting.Logger?.LogInformation("Cleanup");
-            LoggingUnitTesting.Logger.LogInformation("Cleanup");
+        LoggingUnitTesting?.Dispose();
-        if (LoggingUnitTesting is not null)
-            LoggingUnitTesting.Dispose();
     }
 
     [TestMethod]

Adaptation/_Tests/Static/txt.cs

@@ -27,19 +27,20 @@ public class TXT : LoggingUnitTesting, IDisposable
     }
 
     [ClassInitialize]
-    public static void ClassInitialize(TestContext testContext)
+    public static void ClassInitialize(TestContext testContext) => LoggingUnitTesting ??= new TXT(testContext);
-    {
-        if (LoggingUnitTesting is null)
-            LoggingUnitTesting = new TXT(testContext);
-    }
 
     [ClassCleanup()]
     public static void ClassCleanup()
     {
-        if (LoggingUnitTesting.Logger is not null)
+        LoggingUnitTesting.Logger?.LogInformation("Cleanup");
-            LoggingUnitTesting.Logger.LogInformation("Cleanup");
+        LoggingUnitTesting?.Dispose();
-        if (LoggingUnitTesting is not null)
+    }
-            LoggingUnitTesting.Dispose();
+
+    [TestMethod]
+    public void TestDateTime()
+    {
+        DateTime dateTime = DateTime.Now;
+        Assert.IsTrue(dateTime.ToString("M/d/yyyy h:mm:ss tt") == dateTime.ToString());
     }
 
     [TestMethod]

Adaptation/appsettings.Development.json

@@ -59,7 +59,7 @@
       "Password": "tLIPgqM6R9hVQOteRnTHwPqIg3Zxv8CohTjFkjkFz8k="
     },
     {
-      "Use": true,
+      "Use": false,
       "Letter": "k",
       "Share": "\\\\messdv002.na.infineon.com\\GaN_NEC\\Characterization",
       "User": "INFINEON\\MESGaNEAF",
@@ -80,35 +80,35 @@
       "Password": "CUGygiPwahy4U3j+6KqqoMZ08STyVDR1rKm6MwPpt00="
     },
     {
-      "Use": true,
+      "Use": false,
       "Letter": "n",
       "Share": "\\\\10.95.154.22\\C",
       "User": "10.95.154.22\\Aixtron",
       "Password": "DYVBOr2HJdB7KOhd/IFhLA=="
     },
     {
-      "Use": true,
+      "Use": false,
       "Letter": "o",
       "Share": "\\\\10.95.154.16\\Aixtron",
       "User": "10.95.154.16\\Aixtron",
       "Password": "DYVBOr2HJdB7KOhd/IFhLA=="
     },
     {
-      "Use": true,
+      "Use": false,
       "Letter": "p",
       "Share": "\\\\10.95.154.15\\Aixtron",
       "User": "10.95.154.15\\Aixtron",
       "Password": "DYVBOr2HJdB7KOhd/IFhLA=="
     },
     {
-      "Use": true,
+      "Use": false,
       "Letter": "q",
       "Share": "\\\\10.95.154.21\\Data",
       "User": "10.95.154.21\\XRD04Admin",
       "Password": "v1NOsEOCvbnhzKabspPcCQ=="
     },
     {
-      "Use": true,
+      "Use": false,
       "Letter": "r",
       "Share": "\\\\10.95.154.23\\Data",
       "User": "\"10.95.154.23\\infineon us\"",

Adaptation/appsettings.json

@@ -59,7 +59,7 @@
       "Password": "tLIPgqM6R9hVQOteRnTHwPqIg3Zxv8CohTjFkjkFz8k="
     },
     {
-      "Use": true,
+      "Use": false,
       "Letter": "k",
       "Share": "\\\\messdv002.na.infineon.com\\GaN_NEC\\Characterization",
       "User": "INFINEON\\MESGaNEAF",
@@ -80,35 +80,35 @@
       "Password": "CUGygiPwahy4U3j+6KqqoMZ08STyVDR1rKm6MwPpt00="
     },
     {
-      "Use": true,
+      "Use": false,
       "Letter": "n",
       "Share": "\\\\10.95.154.22\\C",
       "User": "10.95.154.22\\Aixtron",
       "Password": "DYVBOr2HJdB7KOhd/IFhLA=="
     },
     {
-      "Use": true,
+      "Use": false,
       "Letter": "o",
       "Share": "\\\\10.95.154.16\\Aixtron",
       "User": "10.95.154.16\\Aixtron",
       "Password": "DYVBOr2HJdB7KOhd/IFhLA=="
     },
     {
-      "Use": true,
+      "Use": false,
       "Letter": "p",
       "Share": "\\\\10.95.154.15\\Aixtron",
       "User": "10.95.154.15\\Aixtron",
       "Password": "DYVBOr2HJdB7KOhd/IFhLA=="
     },
     {
-      "Use": true,
+      "Use": false,
       "Letter": "q",
       "Share": "\\\\10.95.154.21\\Data",
       "User": "10.95.154.21\\XRD04Admin",
       "Password": "v1NOsEOCvbnhzKabspPcCQ=="
     },
     {
-      "Use": true,
+      "Use": false,
       "Letter": "r",
       "Share": "\\\\10.95.154.23\\Data",
       "User": "\"10.95.154.23\\infineon us\"",

Adaptation/package.json

@@ -1,14 +1,15 @@
 {
     "scripts": {
-        "AA-CreateSelfDescription.Staging.v2_43_4-SP101_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~SP101_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
+        "AA-CreateSelfDescription.Staging.v2_47_1-SP101_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~SP101_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
-        "BA-CreateSelfDescription.Staging.v2_43_4-SP101": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~SP101\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
+        "BA-CreateSelfDescription.Staging.v2_47_1-SP101": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~SP101\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
-        "CA-CreateSelfDescription.Staging.v2_43_4-MET08DDUPSP1TBI": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~MET08DDUPSP1TBI\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
+        "CA-CreateSelfDescription.Staging.v2_47_1-MET08DDUPSP1TBI": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~MET08DDUPSP1TBI\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
-        "DA-CreateSelfDescription.Staging.v2_43_4": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
+        "DA-CreateSelfDescription.Staging.v2_47_1": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
-        "EA-Extract.Staging.v2_43_4-SP101_EQPT-Staging__v2_43_4__SP101_EQPT__DownloadRsMFile637953072332628623__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~SP101_EQPT & Name~Staging__v2_43_4__SP101_EQPT__DownloadRsMFile637953072332628623__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
+        "EA-Extract.Staging.v2_47_1-SP101_EQPT-Staging__v2_47_1__SP101_EQPT__DownloadRsMFile637953072332628623__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~SP101_EQPT & Name~Staging__v2_47_1__SP101_EQPT__DownloadRsMFile637953072332628623__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
-        "FA-Extract.Staging.v2_43_4-SP101-Staging__v2_43_4__SP101__txt637955319879801344__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~SP101 & Name~Staging__v2_43_4__SP101__txt637955319879801344__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
+        "FA-Extract.Staging.v2_47_1-SP101-Staging__v2_47_1__SP101__txt637955319879801344__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~SP101 & Name~Staging__v2_47_1__SP101__txt637955319879801344__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
-        "GA-Extract.Staging.v2_43_4-MET08DDUPSP1TBI-Staging__v2_43_4__MET08DDUPSP1TBI__MoveMatchingFiles637955319879801344__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~MET08DDUPSP1TBI & Name~Staging__v2_43_4__MET08DDUPSP1TBI__MoveMatchingFiles637955319879801344__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
+        "GA-Extract.Staging.v2_47_1-MET08DDUPSP1TBI-Staging__v2_47_1__MET08DDUPSP1TBI__MoveMatchingFiles637955319879801344__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08DDUPSP1TBI & Name~Staging__v2_47_1__MET08DDUPSP1TBI__MoveMatchingFiles637955319879801344__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
-        "HA-Extract.Staging.v2_43_4-SP101-Staging__v2_43_4__SP101__pcl637812984345592512__MinFileLength": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~SP101 & Name~Staging__v2_43_4__SP101__pcl637812984345592512__MinFileLength\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
+        "HA-Extract.Staging.v2_47_1-SP101-Staging__v2_47_1__SP101__pcl637812984345592512__MinFileLength": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~SP101 & Name~Staging__v2_47_1__SP101__pcl637812984345592512__MinFileLength\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
-        "IA-Extract.Staging.v2_43_4-MET08DDUPSP1TBI-Staging__v2_43_4__MET08DDUPSP1TBI__TIBCO": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~MET08DDUPSP1TBI & Name~Staging__v2_43_4__MET08DDUPSP1TBI__TIBCO\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
+        "HB-Extract.Staging.v2_47_1-MET08DDUPSP1TBI-Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsight638052814829645888__IqsSql": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08DDUPSP1TBI & Name~Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsight638052814829645888__IqsSql\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
+        "IA-Extract.Staging.v2_47_1-MET08DDUPSP1TBI-Staging__v2_47_1__MET08DDUPSP1TBI__TIBCO": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08DDUPSP1TBI & Name~Staging__v2_47_1__MET08DDUPSP1TBI__TIBCO\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
         "Alpha": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
         "nuget-clear": "dotnet nuget locals all --clear",
         "build": "dotnet build --runtime win-x64 --self-contained",

MET08DDUPSP1TBI.csproj

@@ -107,6 +107,7 @@
     <Compile Include="Adaptation\FileHandlers\OpenInsightMetrologyViewer\FileRead.cs" />
     <Compile Include="Adaptation\FileHandlers\OpenInsightMetrologyViewer\WSRequest.cs" />
     <Compile Include="Adaptation\FileHandlers\OpenInsight\FileRead.cs" />
+    <Compile Include="Adaptation\FileHandlers\OpenInsight\FromIQS.cs" />
     <Compile Include="Adaptation\FileHandlers\Processed\FileRead.cs" />
     <Compile Include="Adaptation\FileHandlers\SPaCe\FileRead.cs" />
     <Compile Include="Adaptation\FileHandlers\TIBCO\FileRead.cs" />

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.47.0.0")]
+[assembly: AssemblyVersion("2.47.1.0")]
-[assembly: AssemblyFileVersion("2.47.0.0")]
+[assembly: AssemblyFileVersion("2.47.1.0")]