diff --git a/Adaptation/.vscode/tasks.json b/Adaptation/.vscode/tasks.json
index b160d04..81d3cea 100644
--- a/Adaptation/.vscode/tasks.json
+++ b/Adaptation/.vscode/tasks.json
@@ -46,7 +46,7 @@
"args": [
"/target:Build",
"/restore:True",
- "/p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json%3Bhttps://localhost/v3/index.json",
+ "/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",
"/detailedsummary",
"/consoleloggerparameters:PerformanceSummary;ErrorsOnly;",
"/property:Configuration=Debug;TargetFrameworkVersion=v4.8",
@@ -55,9 +55,15 @@
"problemMatcher": "$msCompile"
},
{
- "label": "File-Folder-Helper AOT s M .Kanbn Tasks",
+ "label": "Project",
"type": "shell",
- "command": "& L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net7.0/win-x64/publish/File-Folder-Helper.exe s M T:/EC/06_SourceCode/EC/Adaptation -s T:/EC/06_SourceCode/EC/Adaptation/.kanbn/tasks",
+ "command": "code ../EC.csproj",
+ "problemMatcher": []
+ },
+ {
+ "label": "Git Config",
+ "type": "shell",
+ "command": "code ../.git/config",
"problemMatcher": []
},
{
diff --git a/Adaptation/EC.Tests.csproj b/Adaptation/EC.Tests.csproj
index ba0e328..f85e4a7 100644
--- a/Adaptation/EC.Tests.csproj
+++ b/Adaptation/EC.Tests.csproj
@@ -33,7 +33,7 @@
Linux
-
+
NU1701
NU1701
@@ -42,41 +42,39 @@
NU1701
NU1701
NU1701
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
NU1701
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
NU1701
- NU1701
- NU1701
- NU1701
+
+
+
+
+
diff --git a/Adaptation/Shared/ProcessDataStandardFormat.cs b/Adaptation/Shared/ProcessDataStandardFormat.cs
index b256f0f..e523676 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/EC.cs b/Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/EC.cs
new file mode 100644
index 0000000..37c81ba
--- /dev/null
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.59.0/EC.cs
@@ -0,0 +1,49 @@
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_59_0;
+
+[TestClass]
+public class EC : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+ internal static string DummyRoot { get; private set; }
+ internal static EC EAFLoggingUnitTesting { get; private set; }
+
+ static EC() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+ public EC() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+ {
+ if (EAFLoggingUnitTesting is null)
+ throw new Exception();
+ }
+
+ public EC(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+ {
+ }
+
+ [ClassInitialize]
+ public static void ClassInitialize(TestContext testContext)
+ {
+ EAFLoggingUnitTesting ??= new EC(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();
+ }
+
+}
\ No newline at end of file
diff --git a/Adaptation/_Tests/Extract/Production/v2.59.0/EC.cs b/Adaptation/_Tests/Extract/Production/v2.59.0/EC.cs
new file mode 100644
index 0000000..b032554
--- /dev/null
+++ b/Adaptation/_Tests/Extract/Production/v2.59.0/EC.cs
@@ -0,0 +1,21 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Adaptation._Tests.Extract.Production.v2_59_0;
+
+[TestClass]
+public class EC
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+ private static CreateSelfDescription.Production.v2_59_0.EC _EC;
+
+ [ClassInitialize]
+ public static void ClassInitialize(TestContext testContext)
+ {
+ CreateSelfDescription.Production.v2_59_0.EC.ClassInitialize(testContext);
+ _EC = CreateSelfDescription.Production.v2_59_0.EC.EAFLoggingUnitTesting;
+ }
+
+}
\ No newline at end of file
diff --git a/Adaptation/_Tests/Static/EC.cs b/Adaptation/_Tests/Static/EC.cs
index 1fa0bbf..762f750 100644
--- a/Adaptation/_Tests/Static/EC.cs
+++ b/Adaptation/_Tests/Static/EC.cs
@@ -49,23 +49,26 @@ public class EC : 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("EC", "v2.43.0"),
+ new("EC", "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}");
}
- File.WriteAllText($"D:/Tmp/{methodBase.Module.Name}-{methodBase.ReflectedType.Name}-{methodBase.Name}.tsv", results.ToString());
+ string sourceDirectory = "D:/Tmp/cellInstanceVersion.EdaConnection.PortNumber";
+ if (!Directory.Exists(sourceDirectory))
+ _ = Directory.CreateDirectory(sourceDirectory);
+ File.WriteAllText(Path.Combine(sourceDirectory, $"{methodBase.Module.Name}-{methodBase.ReflectedType.Name}-{methodBase.Name}.tsv"), results.ToString());
LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
}
diff --git a/EC.csproj b/EC.csproj
index a7fd301..c0c870e 100644
--- a/EC.csproj
+++ b/EC.csproj
@@ -151,10 +151,10 @@
- 2.49.3
+ 2.59.0
- 6.0.3
+ 8.0.3
6.0.3
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index ae53965..0bb0d04 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.49.3.0")]
-[assembly: AssemblyFileVersion("2.49.3.0")]
+[assembly: AssemblyVersion("2.59.0.0")]
+[assembly: AssemblyFileVersion("2.59.0.0")]