diff --git a/Adaptation/.vscode/tasks.json b/Adaptation/.vscode/tasks.json index ba53259..6304974 100644 --- a/Adaptation/.vscode/tasks.json +++ b/Adaptation/.vscode/tasks.json @@ -68,7 +68,7 @@ "args": [ "/target:Build", "/restore:True", - "/p:RestoreSources=https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json%3Bhttps://tfs.intra.infineon.com/tfs/FactoryIntegration/_packaging/EAF%40Local/nuget/v3/index.json%3Bhttps://api.nuget.org/v3/index.json", + "/p:RestoreSources=https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/%3Bhttps://tfs.intra.infineon.com/tfs/FactoryIntegration/_packaging/EAF/nuget/v3/index.json%3Bhttps://tfs.intra.infineon.com/tfs/FactoryIntegration/_packaging/EAF%40Local/nuget/v3/index.json%3Bhttps://api.nuget.org/v3/index.json", "/detailedsummary", "/consoleloggerparameters:PerformanceSummary;ErrorsOnly;", "/property:Configuration=Debug;TargetFrameworkVersion=v4.8", @@ -76,6 +76,18 @@ ], "problemMatcher": "$msCompile" }, + { + "label": "Project", + "type": "shell", + "command": "code ../DEP08SIHTRPLC.csproj", + "problemMatcher": [] + }, + { + "label": "Git Config", + "type": "shell", + "command": "code ../.git/config", + "problemMatcher": [] + }, { "label": "Kanbn Console", "type": "npm", diff --git a/Adaptation/DEP08SIHTRPLC.Tests.csproj b/Adaptation/DEP08SIHTRPLC.Tests.csproj index a7255f7..fbe5f66 100644 --- a/Adaptation/DEP08SIHTRPLC.Tests.csproj +++ b/Adaptation/DEP08SIHTRPLC.Tests.csproj @@ -35,7 +35,7 @@ - + NU1701 NU1701 @@ -44,41 +44,39 @@ NU1701 NU1701 NU1701 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + NU1701 - - - + + + - - - - - - - + + NU1701 - NU1701 - NU1701 - NU1701 + + + + + diff --git a/Adaptation/Shared/ProcessDataStandardFormat.cs b/Adaptation/Shared/ProcessDataStandardFormat.cs index 136ccae..b2ca7b6 100644 --- a/Adaptation/Shared/ProcessDataStandardFormat.cs +++ b/Adaptation/Shared/ProcessDataStandardFormat.cs @@ -152,9 +152,11 @@ public class ProcessDataStandardFormat { string value; string[] segments; + List lines = new(); StringBuilder stringBuilder = new(); foreach (string bodyLine in bodyLines) { + _ = stringBuilder.Clear(); _ = stringBuilder.Append('{'); segments = bodyLine.Trim().Split('\t'); if (!lookForNumbers) @@ -179,10 +181,11 @@ public class ProcessDataStandardFormat } } _ = stringBuilder.Remove(stringBuilder.Length - 1, 1); - _ = stringBuilder.AppendLine("},"); + _ = stringBuilder.AppendLine("}"); + lines.Add(stringBuilder.ToString()); } - _ = stringBuilder.Remove(stringBuilder.Length - 3, 3); - results = JsonSerializer.Deserialize(string.Concat("[", stringBuilder, "]")); + string json = $"[{string.Join(",", lines)}]"; + results = JsonSerializer.Deserialize(json); } return results; } diff --git a/Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/DEP08SIHTRPLC.cs b/Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/DEP08SIHTRPLC.cs new file mode 100644 index 0000000..d7afb2d --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/DEP08SIHTRPLC.cs @@ -0,0 +1,65 @@ +#if true +using Adaptation._Tests.Shared; +using Microsoft.Extensions.Logging; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; + +namespace Adaptation._Tests.CreateSelfDescription.Production.v2_59_0; + +[TestClass] +public class DEP08SIHTRPLC : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static DEP08SIHTRPLC EAFLoggingUnitTesting { get; private set; } + + static DEP08SIHTRPLC() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; + + public DEP08SIHTRPLC() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public DEP08SIHTRPLC(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new DEP08SIHTRPLC(testContext); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); + string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); + File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); + File.WriteAllText(fileNameAndText[2], fileNameAndText[3]); + } + + [ClassCleanup()] + public static void ClassCleanup() + { + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Production__v2_59_0__DEP08SIHTRPLC__ZipFilesByDate() + { + 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")); + } + +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.57.0/DEP08SIHTRPLC.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.57.0/DEP08SIHTRPLC.cs index 72f77ab..ed2509c 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.57.0/DEP08SIHTRPLC.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.57.0/DEP08SIHTRPLC.cs @@ -1,4 +1,4 @@ -#if true +#if v2_57_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/Adaptation/_Tests/Extract/Production/v2.59.0/DEP08SIHTRPLC.cs b/Adaptation/_Tests/Extract/Production/v2.59.0/DEP08SIHTRPLC.cs new file mode 100644 index 0000000..4da437f --- /dev/null +++ b/Adaptation/_Tests/Extract/Production/v2.59.0/DEP08SIHTRPLC.cs @@ -0,0 +1,29 @@ +#if true +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Adaptation._Tests.Extract.Production.v2_59_0; + +[TestClass] +public class DEP08SIHTRPLC +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Production.v2_59_0.DEP08SIHTRPLC _DEP08SIHTRPLC; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Production.v2_59_0.DEP08SIHTRPLC.ClassInitialize(testContext); + _DEP08SIHTRPLC = CreateSelfDescription.Production.v2_59_0.DEP08SIHTRPLC.EAFLoggingUnitTesting; + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Production__v2_59_0__DEP08SIHTRPLC__ZipFilesByDate() => _DEP08SIHTRPLC.Production__v2_59_0__DEP08SIHTRPLC__ZipFilesByDate(); + +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.57.0/DEP08SIHTRPLC.cs b/Adaptation/_Tests/Extract/Staging/v2.57.0/DEP08SIHTRPLC.cs index 0b952da..159896d 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.57.0/DEP08SIHTRPLC.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.57.0/DEP08SIHTRPLC.cs @@ -1,4 +1,4 @@ -#if true +#if v2_57_0 using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Adaptation._Tests.Extract.Staging.v2_57_0; diff --git a/Adaptation/_Tests/Static/DEP08SIHTRPLC.cs b/Adaptation/_Tests/Static/DEP08SIHTRPLC.cs index 04cf4e4..0086824 100644 --- a/Adaptation/_Tests/Static/DEP08SIHTRPLC.cs +++ b/Adaptation/_Tests/Static/DEP08SIHTRPLC.cs @@ -58,20 +58,20 @@ public class DEP08SIHTRPLC : LoggingUnitTesting, IDisposable [Ignore] #endif [TestMethod] - public void Staging() + public void Production() { MethodBase methodBase = new StackFrame().GetMethod(); StringBuilder results = new(); (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] { - new("DEP08SIHTRPLC", "v2.57.0"), + new("DEP08SIHTRPLC", "v2.59.0"), }; - string staging = "http://mestsa07ec.infineon.com:9003/CellInstanceServiceV2"; + string production = "http://messa08ec.infineon.com:9003/CellInstanceServiceV2"; Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion; LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); foreach ((string cellInstanceName, string cellInstanceVersionName) in collection) { - cellInstanceVersion = AdaptationTesting.GetCellInstanceVersion($"{staging}/{cellInstanceName}/{cellInstanceVersionName}/configuration"); + cellInstanceVersion = AdaptationTesting.GetCellInstanceVersion($"{production}/{cellInstanceName}/{cellInstanceVersionName}/configuration"); _ = results.AppendLine($"{cellInstanceName}\t{cellInstanceVersionName}\t{cellInstanceVersion.EdaConnection.PortNumber}"); } string sourceDirectory = "D:/Tmp/cellInstanceVersion.EdaConnection.PortNumber"; diff --git a/Adaptation/_Tests/Static/PLC.cs b/Adaptation/_Tests/Static/PLC.cs index b6ada30..91ccb9f 100644 --- a/Adaptation/_Tests/Static/PLC.cs +++ b/Adaptation/_Tests/Static/PLC.cs @@ -58,7 +58,7 @@ public class PLC : LoggingUnitTesting, IDisposable [Ignore] #endif [TestMethod] - public void Staging() + public void Production() { MethodBase methodBase = new StackFrame().GetMethod(); StringBuilder results = new(); @@ -70,12 +70,12 @@ public class PLC : LoggingUnitTesting, IDisposable new("R73-PLC", "v2.19.0"), new("R74-PLC", "v2.19.0"), }; - string staging = "http://mestsa07ec.infineon.com:9003/CellInstanceServiceV2"; + string production = "http://messa08ec.infineon.com:9003/CellInstanceServiceV2"; Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion; LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); foreach ((string cellInstanceName, string cellInstanceVersionName) in collection) { - cellInstanceVersion = AdaptationTesting.GetCellInstanceVersion($"{staging}/{cellInstanceName}/{cellInstanceVersionName}/configuration"); + cellInstanceVersion = AdaptationTesting.GetCellInstanceVersion($"{production}/{cellInstanceName}/{cellInstanceVersionName}/configuration"); _ = results.AppendLine($"{cellInstanceName}\t{cellInstanceVersionName}\t{cellInstanceVersion.EdaConnection.PortNumber}"); } string sourceDirectory = "D:/Tmp/cellInstanceVersion.EdaConnection.PortNumber"; diff --git a/DEP08SIHTRPLC.csproj b/DEP08SIHTRPLC.csproj index e652486..01a57ff 100644 --- a/DEP08SIHTRPLC.csproj +++ b/DEP08SIHTRPLC.csproj @@ -150,13 +150,13 @@ 4.7.0 - 2.57.0 + 2.59.0 1.6.1 - 6.0.3 + 8.0.3 4.1.1 diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index fca83dc..577f42b 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.57.0.0")] -[assembly: AssemblyFileVersion("2.57.0.0")] +[assembly: AssemblyVersion("2.59.0.0")] +[assembly: AssemblyFileVersion("2.59.0.0")]