v2.57.0

Adaptation/.vscode/tasks.json

@@ -49,6 +49,16 @@
             ],
             "problemMatcher": "$msCompile"
         },
+        {
+            "label": "Format-Whitespaces",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "format",
+                "whitespace"
+            ],
+            "problemMatcher": "$msCompile"
+        },
         {
             "label": "Nuget Clear",
             "command": "dotnet",

Adaptation/FileHandlers/R32/FileRead.cs

@@ -35,7 +35,6 @@ public class FileRead : Shared.FileRead, IFileRead
         string[] segments;
         Dictionary<string, string> systemStateToNames = new();
         _KeyColumn = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.KeyColumn");
-        _KeyColumn = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.SystemState");
         _TimestampFormat = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.TimestampFormat");
         ModelObjectParameterDefinition[] systemStates = GetProperties(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.SystemState");
         foreach (ModelObjectParameterDefinition modelObjectParameterDefinition in systemStates)
@@ -139,7 +138,7 @@ public class FileRead : Shared.FileRead, IFileRead
 
     private ReadOnlyCollection<string> GetSystemStateValues(List<string> lines, string[] columns, int keyColumnIndex)
     {
-        List<string> results = [];
+        List<string> results = new();
         string[] values;
         string? systemState;
         string keyColumnValue;
@@ -170,9 +169,9 @@ public class FileRead : Shared.FileRead, IFileRead
         string systemState;
         int? keyColumnIndex;
         string checkFileName;
-        List<string> headerLines = [];
+        List<string> headerLines = new();
         ReadOnlyCollection<string> systemStateValues;
-        string missingKeyDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, "Missing-Key");
+        string missingKeyDirectory = Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, "Missing-Key");
         if (!Directory.Exists(missingKeyDirectory))
             _ = Directory.CreateDirectory(missingKeyDirectory);
         string fileName = Path.GetFileName(reportFullPath);
@@ -202,18 +201,18 @@ public class FileRead : Shared.FileRead, IFileRead
             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn);
             if (keyColumnIndex is null)
             {
-                File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.SourceFileLocation, missingKeyDirectory, fileName));
+                File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName));
                 continue;
             }
             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value);
             if (systemStateValues.Count == 0)
             {
-                File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.SourceFileLocation, missingKeyDirectory, fileName));
+                File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName));
                 continue;
             }
             lines.AddRange(headerLines);
-            systemState = string.Join('-', systemStateValues);
+            systemState = string.Join("-", systemStateValues);
-            checkFileName = Path.Combine(Path.GetDirectoryName(reportFullPath) ?? throw new Exception(), $"{equipment}-{timestamp}-{systemState}.pdsf");
+            checkFileName = Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, $"{equipment}-{timestamp}-{systemState}.pdsf");
             File.WriteAllLines(checkFileName, lines);
             // File.Delete(reportFullPath);
             if (DateTime.TryParseExact(timestamp, _TimestampFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))

Adaptation/FileHandlers/R62/FileRead.cs

@@ -35,7 +35,6 @@ public class FileRead : Shared.FileRead, IFileRead
         string[] segments;
         Dictionary<string, string> systemStateToNames = new();
         _KeyColumn = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.KeyColumn");
-        _KeyColumn = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.SystemState");
         _TimestampFormat = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.TimestampFormat");
         ModelObjectParameterDefinition[] systemStates = GetProperties(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.SystemState");
         foreach (ModelObjectParameterDefinition modelObjectParameterDefinition in systemStates)
@@ -139,7 +138,7 @@ public class FileRead : Shared.FileRead, IFileRead
 
     private ReadOnlyCollection<string> GetSystemStateValues(List<string> lines, string[] columns, int keyColumnIndex)
     {
-        List<string> results = [];
+        List<string> results = new();
         string[] values;
         string? systemState;
         string keyColumnValue;
@@ -170,9 +169,9 @@ public class FileRead : Shared.FileRead, IFileRead
         string systemState;
         int? keyColumnIndex;
         string checkFileName;
-        List<string> headerLines = [];
+        List<string> headerLines = new();
         ReadOnlyCollection<string> systemStateValues;
-        string missingKeyDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, "Missing-Key");
+        string missingKeyDirectory = Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, "Missing-Key");
         if (!Directory.Exists(missingKeyDirectory))
             _ = Directory.CreateDirectory(missingKeyDirectory);
         string fileName = Path.GetFileName(reportFullPath);
@@ -202,18 +201,18 @@ public class FileRead : Shared.FileRead, IFileRead
             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn);
             if (keyColumnIndex is null)
             {
-                File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.SourceFileLocation, missingKeyDirectory, fileName));
+                File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName));
                 continue;
             }
             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value);
             if (systemStateValues.Count == 0)
             {
-                File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.SourceFileLocation, missingKeyDirectory, fileName));
+                File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName));
                 continue;
             }
             lines.AddRange(headerLines);
-            systemState = string.Join('-', systemStateValues);
+            systemState = string.Join("-", systemStateValues);
-            checkFileName = Path.Combine(Path.GetDirectoryName(reportFullPath) ?? throw new Exception(), $"{equipment}-{timestamp}-{systemState}.pdsf");
+            checkFileName = Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, $"{equipment}-{timestamp}-{systemState}.pdsf");
             File.WriteAllLines(checkFileName, lines);
             // File.Delete(reportFullPath);
             if (DateTime.TryParseExact(timestamp, _TimestampFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))

Adaptation/_Tests/CreateSelfDescription/Production/v2.56.0/DEP08CEPIEPSILON.cs

@@ -1,4 +1,4 @@
-#if true
+#if v2_56_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -19,7 +19,7 @@ public class DEP08CEPIEPSILON : EAFLoggingUnitTesting
     internal static string DummyRoot { get; private set; }
     internal static DEP08CEPIEPSILON EAFLoggingUnitTesting { get; private set; }
 
-    static DEP08CEPIEPSILON() => DummyRoot = @"\\mestsa003.infineon.com\EC_Characterization_Si\Dummy";
+    static DEP08CEPIEPSILON() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
 
     public DEP08CEPIEPSILON() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
     {
@@ -48,9 +48,7 @@ public class DEP08CEPIEPSILON : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if DEBUG
     [Ignore]
-#endif
     [TestMethod]
     public void Production__v2_56_0__DEP08CEPIEPSILON__R32()
     {
@@ -61,9 +59,7 @@ public class DEP08CEPIEPSILON : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if DEBUG
     [Ignore]
-#endif
     [TestMethod]
     public void Production__v2_56_0__DEP08CEPIEPSILON__R62()
     {

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

@@ -0,0 +1,74 @@
+#if v2_57_0
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_57_0;
+
+[TestClass]
+public class DEP08CEPIEPSILON : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static DEP08CEPIEPSILON EAFLoggingUnitTesting { get; private set; }
+
+    static DEP08CEPIEPSILON() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public DEP08CEPIEPSILON() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public DEP08CEPIEPSILON(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new DEP08CEPIEPSILON(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();
+    }
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_57_0__DEP08CEPIEPSILON__R32()
+    {
+        string check = "T27*.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"));
+    }
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_57_0__DEP08CEPIEPSILON__R62()
+    {
+        string check = "T41*.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"));
+    }
+
+}
+#endif

Adaptation/_Tests/Extract/Production/v2.56.0/DEP08CEPIEPSILON.cs

@@ -1,4 +1,4 @@
-#if true
+#if v2_56_0
 using Adaptation._Tests.Shared;
 using Adaptation.Shared;
 using Adaptation.Shared.Methods;
@@ -32,15 +32,11 @@ public class DEP08CEPIEPSILON
         catch (Exception) { }
     }
 
-#if DEBUG
     [Ignore]
-#endif
     [TestMethod]
     public void Production__v2_56_0__DEP08CEPIEPSILON__R32() => _DEP08CEPIEPSILON.Production__v2_56_0__DEP08CEPIEPSILON__R32();
 
-#if (!DEBUG)
     [Ignore]
-#endif
     [TestMethod]
     public void Production__v2_56_0__DEP08CEPIEPSILON__R32638594189939758135__First()
     {
@@ -54,15 +50,11 @@ public class DEP08CEPIEPSILON
         NonThrowTryCatch();
     }
 
-#if DEBUG
     [Ignore]
-#endif
     [TestMethod]
     public void Production__v2_56_0__DEP08CEPIEPSILON__R62() => _DEP08CEPIEPSILON.Production__v2_56_0__DEP08CEPIEPSILON__R62();
 
-#if (!DEBUG)
     [Ignore]
-#endif
     [TestMethod]
     public void Production__v2_56_0__DEP08CEPIEPSILON__R62638594189939758135__First()
     {

Adaptation/_Tests/Extract/Production/v2.57.0/DEP08CEPIEPSILON.cs

@@ -0,0 +1,72 @@
+#if v2_57_0
+using Adaptation._Tests.Shared;
+using Adaptation.Shared;
+using Adaptation.Shared.Methods;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Adaptation._Tests.Extract.Production.v2_57_0;
+
+[TestClass]
+public class DEP08CEPIEPSILON
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Production.v2_57_0.DEP08CEPIEPSILON _DEP08CEPIEPSILON;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Production.v2_57_0.DEP08CEPIEPSILON.ClassInitialize(testContext);
+        _DEP08CEPIEPSILON = CreateSelfDescription.Production.v2_57_0.DEP08CEPIEPSILON.EAFLoggingUnitTesting;
+    }
+
+    private static void NonThrowTryCatch()
+    {
+        try
+        { throw new Exception(); }
+        catch (Exception) { }
+    }
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_57_0__DEP08CEPIEPSILON__R32() => _DEP08CEPIEPSILON.Production__v2_57_0__DEP08CEPIEPSILON__R32();
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_57_0__DEP08CEPIEPSILON__R32638594189939758135__First()
+    {
+        string check = "T27*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _DEP08CEPIEPSILON.Production__v2_57_0__DEP08CEPIEPSILON__R32();
+        string[] variables = _DEP08CEPIEPSILON.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _DEP08CEPIEPSILON.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+        NonThrowTryCatch();
+    }
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_57_0__DEP08CEPIEPSILON__R62() => _DEP08CEPIEPSILON.Production__v2_57_0__DEP08CEPIEPSILON__R62();
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_57_0__DEP08CEPIEPSILON__R62638594189939758135__First()
+    {
+        string check = "T41*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _DEP08CEPIEPSILON.Production__v2_57_0__DEP08CEPIEPSILON__R62();
+        string[] variables = _DEP08CEPIEPSILON.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _DEP08CEPIEPSILON.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+        NonThrowTryCatch();
+    }
+
+}
+#endif

Adaptation/_Tests/Static/DEP08CEPIEPSILON.cs

@@ -64,7 +64,7 @@ public class DEP08CEPIEPSILON : LoggingUnitTesting, IDisposable
         StringBuilder results = new();
         (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[]
         {
-            new("DEP08CEPIEPSILON", "v2.56.0"),
+            new("DEP08CEPIEPSILON", "v2.57.0"),
         };
         string production = "http://messa08ec.infineon.com:9003/CellInstanceServiceV2";
         Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion;

DEP08CEPIEPSILON.csproj

@@ -103,7 +103,6 @@
     <Compile Include="Adaptation\Eaf\Management\ConfigurationData\CellAutomation\ModelObjectParameterDefinition.cs" />
     <Compile Include="Adaptation\Eaf\Management\ConfigurationData\CellAutomation\ModelObjectParameterType.cs" />
     <Compile Include="Adaptation\Eaf\Management\ConfigurationData\Semiconductor\CellInstances\SecsConnectionConfiguration.cs" />
-    <Compile Include="Adaptation\FileHandlers\Archive\FileRead.cs" />
     <Compile Include="Adaptation\FileHandlers\CellInstanceConnectionName.cs" />
     <Compile Include="Adaptation\FileHandlers\Dummy\FileRead.cs" />
     <Compile Include="Adaptation\FileHandlers\R32\FileRead.cs" />
@@ -159,7 +158,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Infineon.EAF.Runtime">
-      <Version>2.56.0</Version>
+      <Version>2.57.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNet.WebApi.Core">
       <Version>5.2.7</Version>

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.56.0.0")]
+[assembly: AssemblyVersion("2.57.0.0")]
-[assembly: AssemblyFileVersion("2.56.0.0")]
+[assembly: AssemblyFileVersion("2.57.0.0")]