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

Adaptation/FileHandlers/APC/FileRead.cs

@@ -128,7 +128,7 @@ public class FileRead : Shared.FileRead, IFileRead
         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>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/Archive/FileRead.cs

@@ -153,7 +153,7 @@ public class FileRead : Shared.FileRead, IFileRead
         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>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/IQSSi/FileRead.cs

@@ -213,7 +213,7 @@ public class FileRead : Shared.FileRead, IFileRead
         JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
         List<pcl.Description> descriptions = pcl.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             SaveIQSFile(reportFullPath, dateTime, descriptions, tests);
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)

Adaptation/FileHandlers/OpenInsight/FileRead.cs

@@ -172,7 +172,7 @@ public class FileRead : Shared.FileRead, IFileRead
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             SaveOpenInsightFile(reportFullPath, dateTime, processDataStandardFormat, descriptions, tests);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs

@@ -147,7 +147,7 @@ public class FileRead : Shared.FileRead, IFileRead
         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>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs

@@ -171,7 +171,7 @@ public class FileRead : Shared.FileRead, IFileRead
         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>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/Processed/FileRead.cs

@@ -172,7 +172,7 @@ public class FileRead : Shared.FileRead, IFileRead
         JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
         List<pcl.Description> descriptions = pcl.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             DirectoryMove(reportFullPath, dateTime, descriptions);
         else if (!_IsEAFHosted)

Adaptation/FileHandlers/SPaCe/FileRead.cs

@@ -125,7 +125,7 @@ public class FileRead : Shared.FileRead, IFileRead
         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>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/pcl/Convert.cs

@@ -75,7 +75,6 @@ internal class Convert
         string[] txtFiles = Directory.GetFiles(sourcePath, $"{sourceFileNameWithoutExtension}_*.txt", SearchOption.TopDirectoryOnly);
         if (txtFiles.Length != 0)
         {
-            txtFiles = (from l in txtFiles orderby l.Length, l select l).ToArray();
             foreach (string txtFile in txtFiles)
             {
                 sourceFiles.Add(txtFile);

Adaptation/MET08DDUPSFS6420.Tests.csproj

@@ -87,16 +87,16 @@
         </None>
     </ItemGroup>
     <ItemGroup>
-        <None Condition="'$(Configuration)' == 'Debug'" Include="D:\EAF-Mesa-Integration\copy\GhostPCL\gpcl6win64\gpcl6dll64.dll">
+        <None Condition="'$(Configuration)' == 'Debug'" Include="\\mestsa003.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64\gpcl6dll64.dll">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Condition="'$(Configuration)' == 'Debug'" Include="D:\EAF-Mesa-Integration\copy\GhostPCL\gpcl6win64\gpcl6win64.exe">
+        <None Condition="'$(Configuration)' == 'Debug'" Include="\\mestsa003.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64\gpcl6win64.exe">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Condition="'$(Configuration)' == 'Release'" Include="D:\EAF-Mesa-Integration\copy\GhostPCL\gpcl6win64\gpcl6dll64.dll">
+        <None Condition="'$(Configuration)' == 'Release'" Include="\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64\gpcl6dll64.dll">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Condition="'$(Configuration)' == 'Release'" Include="D:\EAF-Mesa-Integration\copy\GhostPCL\gpcl6win64\gpcl6win64.exe">
+        <None Condition="'$(Configuration)' == 'Release'" Include="\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64\gpcl6win64.exe">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>

Adaptation/MET08DDUPSFS6420.yml

@@ -41,24 +41,6 @@ stages:
             displayName: "Nuget Clear"
             enabled: false
 
-          - task: CopyFiles@2
-            displayName: 'Copy GhostPCL Files to: D:\EAF-Mesa-Integration\copy'
-            inputs:
-              Contents: "*"
-              SourceFolder: '\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL'
-              TargetFolder: 'D:\EAF-Mesa-Integration\copy\GhostPCL'
-              OverWrite: true
-            enabled: true
-
-          - task: CopyFiles@2
-            displayName: 'Copy LincPDFC Files to: D:\EAF-Mesa-Integration\copy'
-            inputs:
-              Contents: "*"
-              SourceFolder: '\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC'
-              TargetFolder: 'D:\EAF-Mesa-Integration\copy\LincPDFC'
-              OverWrite: true
-            enabled: false
-
           - script: |
               "C:\program files\dotnet\dotnet.exe" user-secrets init
               "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)"
@@ -202,24 +184,6 @@ stages:
             displayName: "Nuget Clear"
             enabled: false
 
-          - task: CopyFiles@2
-            displayName: 'Copy GhostPCL Files to: D:\EAF-Mesa-Integration\copy'
-            inputs:
-              Contents: "*"
-              SourceFolder: '\\mestsa003.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL'
-              TargetFolder: 'D:\EAF-Mesa-Integration\copy\GhostPCL'
-              OverWrite: true
-            enabled: true
-
-          - task: CopyFiles@2
-            displayName: 'Copy LincPDFC Files to: D:\EAF-Mesa-Integration\copy'
-            inputs:
-              Contents: "*"
-              SourceFolder: '\\mestsa003.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC'
-              TargetFolder: 'D:\EAF-Mesa-Integration\copy\LincPDFC'
-              OverWrite: true
-            enabled: false
-
           - script: |
               "C:\program files\dotnet\dotnet.exe" user-secrets init
               "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)"

Adaptation/Shared/FileRead.cs

@@ -478,14 +478,27 @@ public class FileRead : Properties.IFileRead
         }
     }
 
-    protected static void WritePDSF(IFileRead fileRead, JsonElement[] jsonElements)
+    protected void WritePDSF(IFileRead fileRead, JsonElement[] jsonElements)
     {
-#pragma warning disable CA1510
-        if (fileRead is null)
-            throw new ArgumentNullException(nameof(fileRead));
-        if (jsonElements is null)
-            throw new ArgumentNullException(nameof(jsonElements));
-#pragma warning restore CA1510
+        string directory;
+        string day = $"{_Logistics.DateTimeFromSequence:yyyy-MM-dd}";
+        string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
+        string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}";
+        if (!_CellInstanceConnectionName.StartsWith(_CellInstanceName) && _CellInstanceConnectionNameBase == _EquipmentType)
+            directory = Path.Combine(_TracePath, _EquipmentType, "Target", weekDirectory, day, _CellInstanceName, _CellInstanceConnectionName);
+        else
+            directory = Path.Combine(_TracePath, _EquipmentType, "Source", weekDirectory, day, _CellInstanceName, _CellInstanceConnectionName);
+        if (!Directory.Exists(directory))
+            _ = Directory.CreateDirectory(directory);
+        string file = Path.Combine(directory, string.Concat(_Logistics.MesEntity, "_", _Logistics.Sequence, ".ipdsf"));
+        string lines = ProcessDataStandardFormat.GetPDSFText(fileRead, _Logistics, jsonElements, logisticsText: string.Empty);
+        File.WriteAllText(file, lines);
+        if (_Logistics.TotalSecondsSinceLastWriteTimeFromSequence > 600)
+        {
+            try
+            { File.SetLastWriteTime(file, _Logistics.DateTimeFromSequence); }
+            catch (Exception) { }
+        }
     }
 
     protected void WaitForThread(Thread thread, List<Exception> threadExceptions)

Adaptation/Shared/ProcessDataStandardFormat.cs

@@ -136,7 +136,6 @@ internal class ProcessDataStandardFormat
     internal static ProcessDataStandardFormat GetProcessDataStandardFormat(string reportFullPath, string[]? lines = null, int columnsLine = 6)
     {
         ProcessDataStandardFormat result;
-        long? sequence;
         string segment;
         string[] segments;
         bool addToFooter = false;
@@ -187,25 +186,13 @@ internal class ProcessDataStandardFormat
         }
         string? linesOne = lines.Length > 0 && body.Count == 0 && columns.Count == 0 ? lines[1] : null;
         logistics = GetLogistics(footer, linesOne: linesOne);
-        if (logistics.Count == 0)
-            sequence = null;
-        else
-        {
-            segments = logistics[0].Split(new string[] { "SEQUENCE=" }, StringSplitOptions.None);
-            sequence = segments.Length < 2 || !long.TryParse(segments[1].Split(';')[0], out long s) ? null : s;
-        }
-        if (sequence is null && !string.IsNullOrEmpty(reportFullPath))
-        {
-            FileInfo fileInfo = new(reportFullPath);
-            sequence = fileInfo.LastWriteTime.Ticks;
-        }
         result = new(body: body.AsReadOnly(),
                      columns: columns.AsReadOnly(),
                      footer: footer.AsReadOnly(),
                      header: header.AsReadOnly(),
                      inputPDSF: null,
                      logistics: logistics,
-                     sequence: sequence);
+                     sequence: null);
         return result;
     }
 
@@ -249,7 +236,7 @@ internal class ProcessDataStandardFormat
     private static ProcessDataStandardFormat GetProcessDataStandardFormat(DateTime lastWriteTime, int columnsLine, string path, string[]? lines)
     {
         ProcessDataStandardFormat result;
-        long? sequence;
+        long sequence;
         string[] segments;
         bool addToFooter = false;
         List<string> body = new();
@@ -281,13 +268,12 @@ internal class ProcessDataStandardFormat
         }
         logistics = GetLogistics(footer, linesOne: null);
         if (logistics.Count == 0)
-            sequence = null;
+            sequence = lastWriteTime.Ticks;
         else
         {
             segments = logistics[0].Split(new string[] { "SEQUENCE=" }, StringSplitOptions.None);
-            sequence = segments.Length < 2 || !long.TryParse(segments[1].Split(';')[0], out long s) ? null : s;
+            sequence = segments.Length < 2 || !long.TryParse(segments[1].Split(';')[0], out long s) ? lastWriteTime.Ticks : s;
         }
-        sequence ??= lastWriteTime.Ticks;
         result = new(body: body.AsReadOnly(),
                      columns: new(columns),
                      footer: footer.AsReadOnly(),
@@ -316,7 +302,7 @@ internal class ProcessDataStandardFormat
                 segments = bodyLine.Split('\t').ToList();
                 for (int c = 0; c < segments.Count; c++)
                 {
-                    value = segments[c].Replace("\\", "\\\\").Replace("\"", "\\\"");
+                    value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\");
                     _ = stringBuilder.Append('"').Append(processDataStandardFormat.Columns[c]).Append("\":\"").Append(value).Append("\",");
                 }
                 _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
@@ -392,27 +378,19 @@ internal class ProcessDataStandardFormat
                 break;
             for (int c = 0; c < segments.Length; c++)
             {
-                value = segments[c].Replace("\\", "\\\\").Replace("\"", "\\\"");
+                value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\");
                 line += string.Concat('"', processDataStandardFormat.InputPDSF.Columns[c].Trim('"'), '"', ':', '"', value, '"', ',');
             }
             line = string.Concat(line.Substring(0, line.Length - 1), '}');
             lines.Add(line);
         }
-        string? json = null;
-        if (processDataStandardFormat.Footer is not null && processDataStandardFormat.Footer.Count > 0)
-        {
-            Dictionary<string, string> footerKeyValuePairs = GetFooterKeyValuePairs(processDataStandardFormat.Footer);
-            Dictionary<string, Dictionary<string, string>> logisticKeyValuePairs = GetLogisticKeyValuePairs(processDataStandardFormat.Footer, footerKeyValuePairs);
-            json = JsonSerializer.Serialize(logisticKeyValuePairs, DictionaryStringDictionaryStringStringSourceGenerationContext.Default.DictionaryStringDictionaryStringString);
-        }
-        string footerText = string.IsNullOrEmpty(json) || json == "{}" ? string.Empty : $",{Environment.NewLine}\"PDSF\":{Environment.NewLine}{json}";
         result = string.Concat(
             '{',
             Environment.NewLine,
             '"',
             "Count",
             '"',
-            ": ",
+            ": ",            
             processDataStandardFormat.Body.Count,
             ',',
             Environment.NewLine,
@@ -431,88 +409,12 @@ internal class ProcessDataStandardFormat
             '"',
             "Sequence",
             '"',
-            ": ",
+            ": ",            
             processDataStandardFormat.Sequence,
             Environment.NewLine,
-            footerText,
-            Environment.NewLine,
             '}');
         return result;
-    }
-
-    private static Dictionary<string, string> GetFooterKeyValuePairs(ReadOnlyCollection<string> footerLines)
-    {
-        Dictionary<string, string> results = new();
-        string[] segments;
-        foreach (string footerLine in footerLines)
-        {
-            segments = footerLine.Split('\t');
-            if (segments.Length != 2 || string.IsNullOrEmpty(segments[1].Trim()))
-            {
-                continue;
-            }
-            if (segments[1].Contains(';'))
-            {
-                continue;
-            }
-            else
-            {
-                if (results.ContainsKey(segments[0]))
-                {
-                    continue;
-                }
-                results.Add(segments[0], segments[1]);
-            }
-        }
-        return results;
-    }
-
-    private static Dictionary<string, Dictionary<string, string>> GetLogisticKeyValuePairs(ReadOnlyCollection<string> footerLines, Dictionary<string, string> footerKeyValuePairs)
-    {
-        Dictionary<string, Dictionary<string, string>> results = new();
-        string[] segments;
-        string[] subSegments;
-        string[] subSubSegments;
-        Dictionary<string, string>? keyValue;
-        results.Add("Footer", footerKeyValuePairs);
-        foreach (string footerLine in footerLines)
-        {
-            segments = footerLine.Split('\t');
-            if (segments.Length != 2 || string.IsNullOrEmpty(segments[1].Trim()))
-            {
-                continue;
-            }
-            if (!segments[1].Contains(';') || !segments[1].Contains('='))
-            {
-                continue;
-            }
-            else
-            {
-                subSegments = segments[1].Split(';');
-                if (subSegments.Length < 1)
-                {
-                    continue;
-                }
-                if (!results.TryGetValue(segments[0], out keyValue))
-                {
-                    results.Add(segments[0], new());
-                    if (!results.TryGetValue(segments[0], out keyValue))
-                    {
-                        throw new Exception();
-                    }
-                }
-                foreach (string segment in subSegments)
-                {
-                    subSubSegments = segment.Split('=');
-                    if (subSubSegments.Length != 2)
-                    {
-                        continue;
-                    }
-                    keyValue.Add(subSubSegments[0], subSubSegments[1]);
-                }
-            }
-        }
-        return results;
+#pragma warning restore CA1845, IDE0057
     }
 
     internal static void Write(string path, ProcessDataStandardFormat processDataStandardFormat, List<Metrology.WS.Results>? wsResults)
@@ -616,7 +518,7 @@ internal class ProcessDataStandardFormat
                 {
                     for (int c = 1; c < segments.Length; c++)
                     {
-                        value = segments[c].Replace("\\", "\\\\").Replace("\"", "\\\"");
+                        value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\");
                         _ = stringBuilder.Append('"').Append(processDataStandardFormat.Columns[c]).Append("\":\"").Append(value).Append("\",");
                     }
                 }
@@ -624,7 +526,7 @@ internal class ProcessDataStandardFormat
                 {
                     for (int c = 1; c < segments.Length; c++)
                     {
-                        value = segments[c].Replace("\\", "\\\\").Replace("\"", "\\\"");
+                        value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\");
                         if (string.IsNullOrEmpty(value))
                             _ = stringBuilder.Append('"').Append(processDataStandardFormat.Columns[c]).Append("\":").Append(value).Append("null,");
                         else if (value.All(char.IsDigit))
@@ -861,10 +763,4 @@ internal class ProcessDataStandardFormat
 [JsonSerializable(typeof(JsonElement[]))]
 internal partial class JsonElementCollectionSourceGenerationContext : JsonSerializerContext
 {
-}
-
-[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
-[JsonSerializable(typeof(Dictionary<string, Dictionary<string, string>>))]
-internal partial class DictionaryStringDictionaryStringStringSourceGenerationContext : JsonSerializerContext
-{
 }

Adaptation/_Tests/Extract/Production/v2.60.0/MET08DDUPSFS6420.cs

@@ -47,7 +47,7 @@ public class MET08DDUPSFS6420
     [Ignore]
 #endif
     [TestMethod]
-    public void Production__v2_60_0__MET08DDUPSFS6420__OpenInsightMetrologyViewer638851139271252054__Normal()
+    public void Production__v2_60_0__MET08DDUPSFS6420__OpenInsightMetrologyViewer637810124350899080__Normal()
     {
         string check = "*.pdsf";
         bool validatePDSF = false;
@@ -76,7 +76,7 @@ public class MET08DDUPSFS6420
     [Ignore]
 #endif
     [TestMethod]
-    public void Production__v2_60_0__MET08DDUPSFS6420__OpenInsight638851304220990490__IqsSql()
+    public void Production__v2_60_0__MET08DDUPSFS6420__OpenInsight638052163299572098__IqsSql()
     {
         string check = "*.pdsf";
         MethodBase methodBase = new StackFrame().GetMethod();
@@ -98,7 +98,7 @@ public class MET08DDUPSFS6420
     [Ignore]
 #endif
     [TestMethod]
-    public void Production__v2_60_0__MET08DDUPSFS6420__OpenInsightMetrologyViewerAttachments638851355286349752__HeaderId()
+    public void Production__v2_60_0__MET08DDUPSFS6420__OpenInsightMetrologyViewerAttachments638519735942138814__HeaderId()
     {
         string check = "*.pdsf";
         MethodBase methodBase = new StackFrame().GetMethod();

Adaptation/_Tests/Extract/Production/v2.60.0/TENCOR1.cs

@@ -41,7 +41,26 @@ public class TENCOR1
     [Ignore]
 #endif
     [TestMethod]
-    public void Production__v2_60_0__TENCOR1__pcl638851335365053074__Normal()
+    [ExpectedException(typeof(MissingMethodException))]
+    public void Production__v2_60_0__TENCOR1__pcl637955518212649513__Normal()
+    {
+        string check = "*.pcl";
+        bool validatePDSF = false;
+        _TENCOR1.Production__v2_60_0__TENCOR1__pcl();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _TENCOR1.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _TENCOR1.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    [ExpectedException(typeof(MissingMethodException))]
+    public void Production__v2_60_0__TENCOR1__pcl638838745567643708__TooMany()
     {
         string check = "*.pcl";
         bool validatePDSF = false;

Adaptation/_Tests/Extract/Production/v2.60.0/TENCOR2.cs

@@ -41,24 +41,8 @@ public class TENCOR2
     [Ignore]
 #endif
     [TestMethod]
-    public void Production__v2_60_0__TENCOR2__pcl638851352261289484__Normal()
-    {
-        string check = "*.pcl";
-        bool validatePDSF = false;
-        _TENCOR2.Production__v2_60_0__TENCOR2__pcl();
-        MethodBase methodBase = new StackFrame().GetMethod();
-        string[] variables = _TENCOR2.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
-        IFileRead fileRead = _TENCOR2.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
-        Logistics logistics = new(fileRead);
-        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
-        NonThrowTryCatch();
-    }
-
-#if DEBUG
-    [Ignore]
-#endif
-    [TestMethod]
-    public void Production__v2_60_0__TENCOR2__pcl638860965797666706__TwoRuns()
+    [ExpectedException(typeof(MissingMethodException))]
+    public void Production__v2_60_0__TENCOR2__pcl637955534973701250__Normal()
     {
         string check = "*.pcl";
         bool validatePDSF = false;

Adaptation/_Tests/Extract/Production/v2.60.0/TENCOR3.cs

@@ -41,7 +41,26 @@ public class TENCOR3
     [Ignore]
 #endif
     [TestMethod]
-    public void Production__v2_60_0__TENCOR3__pcl638851336413561558__Normal()
+    [ExpectedException(typeof(MissingMethodException))]
+    public void Production__v2_60_0__TENCOR3__pcl637955520360305921__Normal()
+    {
+        string check = "*.pcl";
+        bool validatePDSF = false;
+        _TENCOR3.Production__v2_60_0__TENCOR3__pcl();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _TENCOR3.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _TENCOR3.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    [ExpectedException(typeof(MissingMethodException))]
+    public void Production__v2_60_0__TENCOR3__pcl638725158781216195__Parital()
     {
         string check = "*.pcl";
         bool validatePDSF = false;