dotnet test -c Release

Passed!  - Failed:     0, Passed:    31, Skipped:    86, Total:   117

.groovy

@@ -1,172 +0,0 @@
-#!/usr/bin/env groovy
-/* groovylint-disable CompileStatic, ConsecutiveStringConcatenation, DuplicateNumberLiteral, DuplicateStringLiteral, LineLength, NestedBlockDepth, NoDef, VariableTypeRequired */
-import groovy.transform.Field
-
-@Field String _DDrive = 'D:/'
-@Field String _AssemblyName = '...'
-@Field String _TargetLocation = '...'
-@Field String _GitCommitSeven = '...'
-@Field String _GitName = 'MET08DDUPSP1TBI'
-@Field String _TestProjectDirectory = 'Adaptation'
-@Field String _AgentStaging = 'mestsa07ec-ecmeseaf'
-@Field String _DDriveNet = "${_DDrive}Framework4.8"
-@Field String _AgentProduction = 'messa08ec-ecmeseaf'
-@Field String _AgentDevelopment = 'mestsa003-mesedasvc'
-@Field String _ProgramFilesDotnet = 'C:/Program Files/dotnet/dotnet.exe'
-@Field String _ProgramFilesMSBuild = 'C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe'
-
-pipeline {
-    agent {
-        label env.JENKINS_ENVIRONMENT == 'Development' ? _AgentDevelopment : env.JENKINS_ENVIRONMENT == 'Staging' ? _AgentStaging : env.JENKINS_ENVIRONMENT == 'Production' ? _AgentProduction : 'Else'
-    }
-    parameters {
-        string(name: 'GIT_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'mestsa003.infineon.com' : 'mestsa07ec.ec.local', description: 'git server')
-        string(name: 'DEFAULT_FILE_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'messv02ecc1_ec_local' : 'messv02ecc1.ec.local', description: 'Default file server...')
-    }
-    stages {
-        stage('Git') {
-            steps {
-                bat(returnStatus: true, script: 'git init')
-                bat(returnStatus: true, script: 'git remote add origin \\\\' + params.GIT_SERVER + '\\Git\\' + _GitName + '.git')
-                bat(returnStatus: true, script: 'git pull origin master')
-            }
-        }
-        stage('Setup') {
-            steps {
-                script {
-                    _AssemblyName = "${env.JOB_NAME}"
-                    _GitCommitSeven = '1234567'
-                    // _GitCommitSeven = env.GIT_COMMIT.substring(0, 7)
-                    def files = findFiles(glob: '*.csproj')
-                    if (files.length != 1) {
-                        error("Build failed because couldn't find a *.csproj file")
-                    }
-                    echo """
-                        ${files[0].name}
-                        ${files[0].path}
-                        ${files[0].directory}
-                        ${files[0].length}
-                        ${files[0].lastModified}
-                        """
-                    _AssemblyName = files[0].name.split('[.]csproj')[0]
-                    _TargetLocation = "\\\\${params.DEFAULT_FILE_SERVER}\\EC_EAFRepository\\${env.JENKINS_ENVIRONMENT}\\DeploymentStorage\\Adaptation_${_AssemblyName}"
-                }
-            }
-        }
-        stage('Info') {
-            steps {
-                echo "_AssemblyName ${_AssemblyName}" // ...
-                echo "BUILD_NUMBER ${env.BUILD_NUMBER}" // 11
-                echo "DEFAULT_FILE_SERVER ${params.DEFAULT_FILE_SERVER}" // 11
-                echo "GIT_BRANCH ${env.GIT_BRANCH}" // origin/master
-                echo "GIT_COMMIT ${env.GIT_COMMIT}" // 73b814069f2cf0173a62a8228815a9bc9ba93c41
-                echo "GIT_SERVER ${params.GIT_SERVER}" // ...
-                echo "GIT_URL ${env.GIT_URL}" // D:\ProgramData\Git\....git
-                echo "JENKINS_ENVIRONMENT ${env.JENKINS_ENVIRONMENT}" // 11
-                echo "JENKINS_URL ${env.JENKINS_URL}" // http://localhost:8080/
-                echo "JOB_NAME ${env.JOB_NAME}" // ...
-                echo "WORKSPACE ${env.WORKSPACE}" // D:\.jenkins\_\...
-            }
-        }
-        // stage('Restore') {
-        //     steps {
-        //         bat(returnStatus: true, script: 'dotnet --info')
-        //     }
-        // }
-        stage('Safe storage of app secrets') {
-            steps {
-                dir(_TestProjectDirectory) {
-                    bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' +
-                        'user-secrets init')
-                    bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' +
-                        'user-secrets set "BuildNumber" "' + env.BUILD_NUMBER + '"')
-                    bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' +
-                        'user-secrets set "GitCommitSeven" "' + _GitCommitSeven + '"')
-                    bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' +
-                        'user-secrets set "Server" "' + params.DEFAULT_FILE_SERVER + '"')
-                }
-            }
-        }
-        stage('Core Build') {
-            steps {
-                echo "Build number is ${currentBuild.number}"
-                dir(_TestProjectDirectory) {
-                    bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' +
-                        'build --runtime win-x64 --self-contained --verbosity quiet')
-                }
-            }
-        }
-        // stage('Test') {
-        //     options {
-        //         timeout(time: 10, unit: 'MINUTES')
-        //     }
-        //     steps {
-        //         dir(_TestProjectDirectory) {
-        //             bat('dotnet --info')
-        //         }
-        //     }
-        // }
-        stage('Framework Build') {
-            steps {
-                echo "Build number is ${currentBuild.number}"
-                bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' +
-                    '/target:Restore ' +
-                    '/detailedsummary ' +
-                    '/consoleloggerparameters:PerformanceSummary;ErrorsOnly; ' +
-                    '/property:Configuration=Debug;TargetFrameworkVersion=v4.8 ' +
-                    _AssemblyName + '.csproj')
-                bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' +
-                    '/target:Build ' +
-                    '/detailedsummary ' +
-                    '/consoleloggerparameters:PerformanceSummary;ErrorsOnly; ' +
-                    '/property:Configuration=Debug;TargetFrameworkVersion=v4.8 ' +
-                    _AssemblyName + '.csproj')
-            }
-        }
-        stage('Commit Id') {
-            steps {
-                dir('bin/Debug') {
-                    writeFile file: "${_AssemblyName}.txt", text: "${env.GIT_COMMIT}-${env.BUILD_NUMBER}-${env.GIT_URL}"
-                }
-            }
-        }
-        stage('Package') {
-            steps {
-                fileOperations([fileZipOperation(folderPath: 'bin/Debug', outputFolderPath: "${_DDriveNet}/${_GitCommitSeven}-${env.BUILD_NUMBER}-${env.JOB_NAME}-Debug")])
-                fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*", renameFiles: false, sourceCaptureExpression: '', targetLocation: "${_DDriveNet}/${_GitCommitSeven}-${env.BUILD_NUMBER}-${env.JOB_NAME}-Debug", targetNameExpression: '')])
-            }
-        }
-        // stage('Force Fail') {
-        //     steps {
-        //         error("Build failed because of this and that..")
-        //     }
-        // }
-        stage('Copy Files to: file-share') {
-            steps {
-                dir('bin/Debug') {
-                    fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.txt", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')])
-                    fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.dll", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')])
-                    fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.exe", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')])
-                    fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.pdb", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')])
-                }
-            }
-        }
-    }
-    post {
-        always {
-            dir('bin') {
-                deleteDir()
-            }
-            dir('obj') {
-                deleteDir()
-            }
-            dir(_TestProjectDirectory + '/bin') {
-                deleteDir()
-            }
-            dir(_TestProjectDirectory + '/obj') {
-                deleteDir()
-            }
-            // cleanWs()
-        }
-    }
-}

Adaptation/.vscode/launch.json

@@ -4,7 +4,7 @@
       "name": ".NET Core Attach",
       "type": "coreclr",
       "request": "attach",
-      "processId": 17476
+      "processId": 21276
     }
   ]
 }

Adaptation/FileHandlers/OpenInsight/FileRead.cs

@@ -184,12 +184,20 @@ public class FileRead : Shared.FileRead, IFileRead
             string check = lines.Item1.Replace(lines.Item2, "$Date$");
             bool save = string.IsNullOrEmpty(_LastLines) || check != _LastLines;
             if (save && !string.IsNullOrEmpty(check))
-                collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), lines.Item1));
+            {
-            _LastLines = check;
+                _LastLines = check;
-            _ = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0]);
+                long? subGroupId;
-            // string commandText = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0]);
+                long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks;
-            // if (save && !string.IsNullOrEmpty(commandText))
+                long preWait = _FileConnectorConfiguration?.FileHandleWaitTime is null ? dateTime.AddMilliseconds(1234).Ticks : dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
-            //     collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), commandText));
+                if (string.IsNullOrEmpty(descriptions[0].Reactor) || string.IsNullOrEmpty(descriptions[0].PSN) || string.IsNullOrEmpty(descriptions[0].RDS))
+                    subGroupId = null;
+                else
+                    (subGroupId, string _) = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0], breakAfter, preWait);
+                if (subGroupId is null)
+                    collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), lines.Item1));
+                else
+                    collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} {_OpenInsightFilePattern}"), lines.Item1));
+            }
             if (!Directory.Exists(duplicateDirectory))
                 _ = Directory.CreateDirectory(duplicateDirectory);
             string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));

Adaptation/FileHandlers/OpenInsight/FromIQS.cs

@@ -6,6 +6,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
+using System.Threading;
 
 namespace Adaptation.FileHandlers.OpenInsight;
 
@@ -14,7 +15,7 @@ public class FromIQS
 
 #nullable enable
 
-    private static string GetCommandText(Logistics logistics, txt.Description description, string dateTime, string? sid)
+    private static string GetCommandText(Logistics logistics, txt.Description description, string dateTime, long? subGroupId)
     {
         StringBuilder result = new();
         _ = result
@@ -41,8 +42,8 @@ public class FromIQS
                 .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))
+        if (subGroupId is not null)
-            _ = result.Append("   and se.f_sgrp = ").Append(sid).AppendLine("  ");
+            _ = result.Append("   and se.f_sgrp = ").Append(subGroupId).AppendLine("  ");
         _ = result
                 .Append("   and rd.f_name = '").Append(description.Reactor).AppendLine("' ")
                 .Append("   and pd.f_name = '").Append(description.PSN).AppendLine("' ")
@@ -66,10 +67,11 @@ public class FromIQS
         return stringBuilder;
     }
 
-    internal static string GetCommandText(string connectionString, Logistics logistics, txt.Description description)
+    internal static (long?, string) GetCommandText(string connectionString, Logistics logistics, txt.Description description, long breakAfter, long preWait)
     {
-        string result;
         string dateTime;
+        string commandText;
+        long? result = null;
         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");
@@ -77,25 +79,44 @@ public class FromIQS
             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);
+        commandText = GetCommandText(logistics, description, dateTime, subGroupId: null);
-        StringBuilder stringBuilder = GetForJsonPath(connectionString, commandText);
+        for (short i = 0; i < short.MaxValue; i++)
+        {
+            if (DateTime.Now.Ticks > preWait)
+                break;
+            Thread.Sleep(100);
+        }
+        StringBuilder stringBuilder = new();
+        for (short z = 0; z < short.MaxValue; z++)
+        {
+            stringBuilder = GetForJsonPath(connectionString, commandText);
+            if (stringBuilder.Length > 0)
+                break;
+            if (DateTime.Now.Ticks > breakAfter)
+                // throw new Exception($"After {breakAfterSeconds} seconds, didn't find sub group id!");
+                break;
+            Thread.Sleep(250);
+        }
         if (stringBuilder.Length == 0)
-            result = commandText;
+            commandText = stringBuilder.ToString();
         else
         {
             JsonElement[]? jsonElements = JsonSerializer.Deserialize<JsonElement[]>(stringBuilder.ToString());
             if (jsonElements is null || !jsonElements.Any() || jsonElements[0].ValueKind != JsonValueKind.Object)
-                result = commandText;
+                commandText = stringBuilder.ToString();
             else
             {
                 JsonProperty[] jsonProperties = jsonElements[0].EnumerateObject().ToArray();
-                if (!jsonProperties.Any() || jsonProperties[0].Name != "se_sgrp")
+                if (!jsonProperties.Any() || jsonProperties[0].Name != "se_sgrp" || !long.TryParse(jsonProperties[0].Value.ToString(), out long subGroupId))
-                    result = commandText;
+                    commandText = stringBuilder.ToString();
                 else
-                    result = GetCommandText(logistics, description, dateTime, sid: jsonProperties[0].Value.ToString());
+                {
+                    result = subGroupId;
+                    commandText = GetCommandText(logistics, description, dateTime, subGroupId);
+                }
             }
         }
-        return result;
+        return new(result, commandText);
     }
 
 #nullable disable

Adaptation/MET08DDUPSP1TBI-Development.yml

@@ -0,0 +1,153 @@
+trigger:
+  branches:
+    include:
+      - development
+  paths:
+    include:
+      - "Adaptation/*"
+
+pool:
+  name: Mesa-Windows-Service
+  demands: MET08DDUPSP1TBI-Development
+
+steps:
+  - script: |
+      set coreVersion=net6.0
+      echo %coreVersion%
+      echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion%
+      echo $(CoreVersion)
+    displayName: CoreVersion
+
+  - script: |
+      set configuration=Debug
+      echo %configuration%
+      echo ##vso[task.setvariable variable=Configuration;]%configuration%
+      echo ($Configuration)
+    displayName: Configuration
+
+  - script: |
+      set nugetSource=https://messa017.infineon.com/v3/index.json
+      echo %nugetSource%
+      echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
+      echo $(NugetSource)
+    displayName: NugetSource
+
+  - script: |
+      set gitCommit=$(Build.SourceVersion)
+      set gitCommitSeven=%gitCommit:~0,7%
+      echo %gitCommitSeven%
+      echo ##vso[task.setvariable variable=GitCommitSeven;]%gitCommitSeven%
+      echo $(GitCommitSeven)
+    displayName: GitCommitSeven
+
+  - script: |
+      echo $(Build.BuildId)
+      echo $(Build.Reason)
+      echo $(Build.Repository.Id)
+      echo $(Build.Repository.Name)
+      echo $(Build.SourceVersion)
+      echo $(CoreVersion)
+      echo $(Configuration)
+      echo $(NugetSource)
+      echo $(GitCommitSeven)
+      REM echo $(pipelinePassword)
+    displayName: "Echo Check"
+
+  - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
+    displayName: "Nuget Clear"
+    # enabled: false
+
+  - script: |
+      "C:\program files\dotnet\dotnet.exe" user-secrets init
+      "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)"
+      "C:\program files\dotnet\dotnet.exe" user-secrets set "GitCommitSeven" "$(GitCommitSeven)"
+      "C:\program files\dotnet\dotnet.exe" user-secrets list
+    workingDirectory: Adaptation
+    displayName: "Safe storage of app secrets - Adaptation"
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: - GhostPCL'
+    inputs:
+      SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64 '
+      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
+      OverWrite: true
+    enabled: false
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: - LincPDFC'
+    inputs:
+      SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC\v2.6.6.21'
+      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
+      OverWrite: true
+    enabled: false
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: - PDF-Text-Stripper'
+    inputs:
+      SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\PDF-Text-Stripper\v4.8.0.1'
+      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
+      OverWrite: true
+    enabled: false
+
+  - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
+    workingDirectory: Adaptation
+    displayName: "Core Build - Adaptation"
+
+  - script: "dotnet test --configuration $(Configuration)"
+    workingDirectory: Tests
+    displayName: "Core Test"
+
+  - script: '"C:\program files\dotnet\dotnet.exe" tool restore'
+    workingDirectory: Adaptation
+    displayName: "Tool Restore"
+    enabled: false
+
+  - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:.vscode/TestResults/*/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark'
+    workingDirectory: Adaptation
+    displayName: "Report Generator"
+    enabled: false
+
+  - script: '"C:\program files\dotnet\dotnet.exe" publish --configuration $(Configuration) --runtime win-x64 --self-contained -o $(Build.ArtifactStagingDirectory)\Adaptation --source $(NugetSource)'
+    workingDirectory: Adaptation
+    displayName: "Core Publish"
+
+  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8 /p:RestoreSources=$(NugetSource)'
+    displayName: 'MSBuild Restore'
+
+  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8'
+    displayName: MSBuild
+
+  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)-$(Build.Repository.Name)>bin\$(Configuration)\$(Build.Repository.Name).txt'
+    displayName: 'Commit Id'
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: D:\Framework4.8'
+    inputs:
+      SourceFolder: 'bin\$(Configuration)'
+      Contents: '*$(Build.Repository.Name)*'
+      TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)'
+      OverWrite: true
+    enabled: false
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: \\messv02ecc1.ec.local\EC_EAFRepository'
+    inputs:
+      SourceFolder: 'bin\$(Configuration)'
+      Contents: '*$(Build.Repository.Name)*'
+      TargetFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)'
+      OverWrite: true
+    enabled: false
+
+  - script: |
+      "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
+    workingDirectory: Tests
+    displayName: "Core Clean - Tests"
+
+  - script: |
+      "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
+    workingDirectory: Adaptation
+    displayName: "Core Clean - Adaptation"
+
+  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
+    displayName: 'Force Fail'
+    enabled: false

Adaptation/MET08DDUPSP1TBI.Tests.csproj

@@ -33,42 +33,47 @@
         <DefineConstants>Linux</DefineConstants>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+        <PackageReference Include="Infineon.Mesa.gpcl6" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.2" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.json" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.json" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Win32.SystemEvents" Version="6.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="Microsoft.Win32.SystemEvents" Version="7.0.0" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
         <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
-        <PackageReference Include="System.Data.OleDb" Version="6.0.0" />
+        <PackageReference Include="System.Data.OleDb" Version="7.0.0" />
-        <PackageReference Include="System.Data.SqlClient" Version="4.8.4" />
+        <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-        <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
-        <PackageReference Include="System.Text.Json" Version="6.0.6" />
+        <PackageReference Include="System.Text.Json" Version="7.0.1" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="3.1.2">
+        <PackageReference Include="coverlet.collector" Version="3.2.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <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.8" />
-        <PackageReference Include="Tesseract" Version="4.1.1" />
+        <PackageReference Include="Tesseract" Version="5.2.0" />
+    </ItemGroup>
+    <ItemGroup>
         <PackageReference Include="Tibco.Rendezvous" Version="8.5.0" />
     </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Infineon.Yoda" Version="5.4.1" />
+    </ItemGroup>
     <ItemGroup>
         <PackageReference Include="External.Common.Logging.Core" Version="3.3.1"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="External.Common.Logging" Version="3.3.1"><NoWarn>NU1701</NoWarn></PackageReference>

Adaptation/MET08DDUPSP1TBI.yml

@@ -0,0 +1,148 @@
+trigger:
+  branches:
+    include:
+      - master
+  paths:
+    include:
+      - "Adaptation/*"
+
+pool:
+  name: Mesa-Windows-Service
+  demands: MET08DDUPSP1TBI
+
+steps:
+  - script: |
+      set coreVersion=net6.0
+      echo %coreVersion%
+      echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion%
+      echo $(CoreVersion)
+    displayName: CoreVersion
+
+  - script: |
+      set configuration=Release
+      echo %configuration%
+      echo ##vso[task.setvariable variable=Configuration;]%configuration%
+      echo ($Configuration)
+    displayName: Configuration
+
+  - script: |
+      set nugetSource=https://messa08ec.ec.local/v3/index.json
+      echo %nugetSource%
+      echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
+      echo $(NugetSource)
+    displayName: NugetSource
+
+  - script: |
+      set gitCommit=$(Build.SourceVersion)
+      set gitCommitSeven=%gitCommit:~0,7%
+      echo %gitCommitSeven%
+      echo ##vso[task.setvariable variable=GitCommitSeven;]%gitCommitSeven%
+      echo $(GitCommitSeven)
+    displayName: GitCommitSeven
+
+  - script: |
+      echo $(Build.BuildId)
+      echo $(Build.Reason)
+      echo $(Build.Repository.Id)
+      echo $(Build.Repository.Name)
+      echo $(Build.SourceVersion)
+      echo $(CoreVersion)
+      echo $(Configuration)
+      echo $(NugetSource)
+      echo $(GitCommitSeven)
+      REM echo $(pipelinePassword)
+    displayName: "Echo Check"
+
+  - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
+    displayName: "Nuget Clear"
+    enabled: false
+
+  - script: |
+      "C:\program files\dotnet\dotnet.exe" user-secrets init
+      "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)"
+      "C:\program files\dotnet\dotnet.exe" user-secrets set "GitCommitSeven" "$(GitCommitSeven)"
+      "C:\program files\dotnet\dotnet.exe" user-secrets list
+    workingDirectory: Adaptation
+    displayName: "Safe storage of app secrets - Adaptation"
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: - GhostPCL'
+    inputs:
+      SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64 '
+      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
+      OverWrite: true
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: - LincPDFC'
+    inputs:
+      SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC\v2.6.6.21'
+      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
+      OverWrite: true
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: - PDF-Text-Stripper'
+    inputs:
+      SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\PDF-Text-Stripper\v4.8.0.1'
+      TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
+      OverWrite: true
+
+  - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
+    workingDirectory: Adaptation
+    displayName: "Core Build - Adaptation"
+
+  - script: "dotnet test --configuration $(Configuration)"
+    workingDirectory: Tests
+    displayName: "Core Test"
+
+  - script: '"C:\program files\dotnet\dotnet.exe" tool restore'
+    workingDirectory: Adaptation
+    displayName: "Tool Restore"
+    enabled: false
+
+  - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:.vscode/TestResults/*/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark'
+    workingDirectory: Adaptation
+    displayName: "Report Generator"
+    enabled: false
+
+  - script: '"C:\program files\dotnet\dotnet.exe" publish --configuration $(Configuration) --runtime win-x64 --self-contained -o $(Build.ArtifactStagingDirectory)\Adaptation --source $(NugetSource)'
+    workingDirectory: Adaptation
+    displayName: "Core Publish"
+
+  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8 /p:RestoreSources=$(NugetSource)'
+    displayName: 'MSBuild Restore'
+
+  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8'
+    displayName: MSBuild
+
+  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)-$(Build.Repository.Name)>bin\$(Configuration)\$(Build.Repository.Name).txt'
+    displayName: 'Commit Id'
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: D:\Framework4.8'
+    inputs:
+      SourceFolder: 'bin\$(Configuration)'
+      Contents: '*$(Build.Repository.Name)*'
+      TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)'
+      OverWrite: true
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: \\messv02ecc1.ec.local\EC_EAFRepository'
+    inputs:
+      SourceFolder: 'bin\$(Configuration)'
+      Contents: '*$(Build.Repository.Name)*'
+      TargetFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)'
+      OverWrite: true
+
+  - script: |
+      "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
+    workingDirectory: Tests
+    displayName: "Core Clean - Tests"
+
+  - script: |
+      "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
+    workingDirectory: Adaptation
+    displayName: "Core Clean - Adaptation"
+
+  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
+    displayName: 'Force Fail'
+    enabled: false

Adaptation/Shared/FileRead.cs

@@ -327,7 +327,7 @@ public class FileRead : Properties.IFileRead
         {
             if (DateTime.Now.Ticks > preWait)
                 break;
-            Thread.Sleep(500);
+            Thread.Sleep(100);
         }
         if (!moreThanAnHour)
         {
@@ -373,7 +373,7 @@ public class FileRead : Properties.IFileRead
                     }
                     throw new Exception(string.Concat("After {", _BreakAfterSeconds, "} seconds, right side of {", sourceDirectoryCloaking, "} didn't consume file(s) ", stringBuilder));
                 }
-                Thread.Sleep(500);
+                Thread.Sleep(250);
             }
         }
     }

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

@@ -5,7 +5,7 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
-namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1;
+namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_47_0;
 
 [TestClass]
 public class SP101_EQPT : EAFLoggingUnitTesting
@@ -46,11 +46,11 @@ public class SP101_EQPT : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
-    public void Staging__v2_47_1__SP101_EQPT__MoveAllFiles()
+    public void Staging__v2_47_0__SP101_EQPT__MoveAllFiles()
     {
         string check = "*";
         MethodBase methodBase = new StackFrame().GetMethod();

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

@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 
-namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1;
+namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_47_0;
 
 [TestClass]
 public class SP101 : EAFLoggingUnitTesting
@@ -47,11 +47,11 @@ public class SP101 : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
-    public void Staging__v2_47_1__SP101__txt()
+    public void Staging__v2_47_0__SP101__txt()
     {
         string check = "*.txt";
         MethodBase methodBase = new StackFrame().GetMethod();

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

@@ -47,7 +47,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
         EAFLoggingUnitTesting?.Dispose();
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -60,7 +60,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -73,7 +73,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -86,7 +86,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -99,7 +99,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -112,7 +112,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -125,7 +125,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -138,7 +138,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -151,7 +151,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -164,7 +164,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]

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

@@ -4,7 +4,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Diagnostics;
 using System.Reflection;
 
-namespace Adaptation._Tests.Extract.Staging.v2_47_1;
+namespace Adaptation._Tests.Extract.Staging.v2_47_0;
 
 [TestClass]
 public class SP101
@@ -13,30 +13,30 @@ public class SP101
 #pragma warning disable CA2254
 #pragma warning disable IDE0060
 
-    private static CreateSelfDescription.Staging.v2_47_1.SP101 _SP101;
+    private static CreateSelfDescription.Staging.v2_47_0.SP101 _SP101;
 
     [ClassInitialize]
     public static void ClassInitialize(TestContext testContext)
     {
-        CreateSelfDescription.Staging.v2_47_1.SP101.ClassInitialize(testContext);
+        CreateSelfDescription.Staging.v2_47_0.SP101.ClassInitialize(testContext);
-        _SP101 = CreateSelfDescription.Staging.v2_47_1.SP101.EAFLoggingUnitTesting;
+        _SP101 = CreateSelfDescription.Staging.v2_47_0.SP101.EAFLoggingUnitTesting;
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
-    public void Staging__v2_47_1__SP101__txt() => _SP101.Staging__v2_47_1__SP101__txt();
+    public void Staging__v2_47_0__SP101__txt() => _SP101.Staging__v2_47_0__SP101__txt();
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
-    public void Staging__v2_47_1__SP101__txt637955319879801344__Normal()
+    public void Staging__v2_47_0__SP101__txt637955319879801344__Normal()
     {
         string check = "*.txt";
         bool validatePDSF = false;
-        _SP101.Staging__v2_47_1__SP101__txt();
+        _SP101.Staging__v2_47_0__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);

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

@@ -22,13 +22,13 @@ public class MET08DDUPSP1TBI
         _MET08DDUPSP1TBI = CreateSelfDescription.Staging.v2_47_1.MET08DDUPSP1TBI.EAFLoggingUnitTesting;
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
     public void Staging__v2_47_1__MET08DDUPSP1TBI__MoveMatchingFiles() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__MoveMatchingFiles();
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -44,25 +44,25 @@ public class MET08DDUPSP1TBI
         _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
     public void Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsightMetrologyViewer();
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
     public void Staging__v2_47_1__MET08DDUPSP1TBI__IQSSi() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__IQSSi();
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
     public void Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsight() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsight();
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
@@ -77,37 +77,37 @@ public class MET08DDUPSP1TBI
         _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
     }
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
     public void Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments();
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
     public void Staging__v2_47_1__MET08DDUPSP1TBI__APC() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__APC();
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
     public void Staging__v2_47_1__MET08DDUPSP1TBI__SPaCe() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__SPaCe();
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
     public void Staging__v2_47_1__MET08DDUPSP1TBI__Processed() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__Processed();
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]
     public void Staging__v2_47_1__MET08DDUPSP1TBI__Archive() => _MET08DDUPSP1TBI.Staging__v2_47_1__MET08DDUPSP1TBI__Archive();
 
-#if true
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]

Adaptation/_Tests/Shared/AdaptationTesting.cs

@@ -343,7 +343,7 @@ public class AdaptationTesting : ISMTP
         return result as T;
     }
 
-    protected static CellInstanceVersion GetCellInstanceVersion(string url)
+    public static CellInstanceVersion GetCellInstanceVersion(string url)
     {
         CellInstanceVersion result;
         byte[] byteArray;
@@ -874,7 +874,7 @@ public class AdaptationTesting : ISMTP
         return result;
     }
 
-    protected Dictionary<string, object> GetKeyValuePairs(string cellInstanceName, string cellInstanceVersionName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, List<Tuple<string, string>> equipmentDictionaryIsAlwaysEnabledEvents)
+    protected Dictionary<string, object> GetKeyValuePairs(string cellInstanceName, string cellInstanceVersionName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, List<Tuple<string, string>> equipmentDictionaryIsAlwaysEnabledEvents, int edaConnectionPortNumber)
     {
         Dictionary<string, object> results = new()
         {
@@ -883,6 +883,7 @@ public class AdaptationTesting : ISMTP
             { nameof(cellInstanceName), cellInstanceName },
             { nameof(equipmentTypeName), equipmentTypeName },
             { nameof(cellInstanceVersionName), cellInstanceVersionName },
+            { nameof(edaConnectionPortNumber), edaConnectionPortNumber },
             { nameof(equipmentDictionaryName), equipmentDictionaryName },
             { nameof(cellInstanceConnectionName), cellInstanceConnectionName },
             { nameof(FileConnectorConfiguration), fileConnectorConfiguration },
@@ -930,7 +931,7 @@ public class AdaptationTesting : ISMTP
         Tuple<string, IList<ModelObjectParameterDefinition>> modelObjectParametersTuple = GetModelObjectParameters(equipmentTypeVersionTuple);
         Tuple<string, string, string, EquipmentDictionaryVersion> equipmentDictionaryVersionTuple = GetEquipmentDictionaryVersionTuple(cellInstanceVersionTuple.Item2, mbn.CellInstanceConnectionName, equipmentTypeVersionTuple.Item4);
         Tuple<string, List<Tuple<string, string>>> equipmentDictionaryIsAlwaysEnabledEventsTuple = GetEquipmentDictionaryIsAlwaysEnabledEventsTuple(equipmentDictionaryVersionTuple);
-        Dictionary<string, object> objects = GetKeyValuePairs(mbn.CellInstanceName, mbn.CellInstanceVersionName, mbn.CellInstanceConnectionName, fileConnectorConfigurationTuple.Item2, equipmentTypeVersionTuple.Item2, parameterizedModelObjectDefinitionTypeTuple.Item2, modelObjectParametersTuple.Item2, equipmentDictionaryVersionTuple.Item2, equipmentDictionaryIsAlwaysEnabledEventsTuple.Item2);
+        Dictionary<string, object> objects = GetKeyValuePairs(mbn.CellInstanceName, mbn.CellInstanceVersionName, mbn.CellInstanceConnectionName, fileConnectorConfigurationTuple.Item2, equipmentTypeVersionTuple.Item2, parameterizedModelObjectDefinitionTypeTuple.Item2, modelObjectParametersTuple.Item2, equipmentDictionaryVersionTuple.Item2, equipmentDictionaryIsAlwaysEnabledEventsTuple.Item2, cellInstanceVersionTuple.Item2.EdaConnection.PortNumber);
         string json = JsonSerializer.Serialize(objects, new JsonSerializerOptions { WriteIndented = true });
         results = new string[] { fileInfo.FullName, json };
         return results;

Adaptation/_Tests/Static/MET08DDUPSP1TBI.cs

@@ -0,0 +1,72 @@
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Text;
+
+namespace Adaptation._Tests.Static;
+
+[TestClass]
+public class MET08DDUPSP1TBI : LoggingUnitTesting, IDisposable
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static MET08DDUPSP1TBI LoggingUnitTesting { get; private set; }
+
+    public MET08DDUPSP1TBI() : base(testContext: null, declaringType: null)
+    {
+        if (LoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public MET08DDUPSP1TBI(TestContext testContext) : base(testContext, new StackFrame().GetMethod().DeclaringType)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext) => LoggingUnitTesting ??= new MET08DDUPSP1TBI(testContext);
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        LoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        LoggingUnitTesting?.Dispose();
+    }
+
+    [TestMethod]
+    public void TestDateTime()
+    {
+        DateTime dateTime = DateTime.Now;
+        Assert.IsTrue(dateTime.ToString("M/d/yyyy h:mm:ss tt") == dateTime.ToString());
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging()
+    {
+        MethodBase methodBase = new StackFrame().GetMethod();
+        StringBuilder results = new();
+        (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[]
+        {
+            new("MET08DDUPSP1TBI", "v2.47.0"),
+        };
+        string staging = "http://mestsa07ec.ec.local: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");
+            _ = results.AppendLine($"{cellInstanceName}\t{cellInstanceVersionName}\t{cellInstanceVersion.EdaConnection.PortNumber}");
+        }
+        File.WriteAllText($"D:/Tmp/{methodBase.Module.Name}-{methodBase.ReflectedType.Name}-{methodBase.Name}.tsv", results.ToString());
+        LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}

Adaptation/_Tests/Static/txt.cs

@@ -3,7 +3,9 @@ using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Reflection;
+using System.Text;
 
 namespace Adaptation._Tests.Static;
 
@@ -129,4 +131,29 @@ public class TXT : LoggingUnitTesting, IDisposable
         LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging()
+    {
+        MethodBase methodBase = new StackFrame().GetMethod();
+        StringBuilder results = new();
+        (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[]
+        {
+            new("SP101", "v2.47.0"),
+            new("SP101-EQPT", "v2.47.0"),
+        };
+        string staging = "http://mestsa07ec.ec.local: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");
+            _ = results.AppendLine($"{cellInstanceName}\t{cellInstanceVersionName}\t{cellInstanceVersion.EdaConnection.PortNumber}");
+        }
+        File.WriteAllText($"D:/Tmp/{methodBase.Module.Name}-{methodBase.ReflectedType.Name}-{methodBase.Name}.tsv", results.ToString());
+        LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
 }

Jenkinsfile

@@ -1,172 +0,0 @@
-#!/usr/bin/env groovy
-/* groovylint-disable CompileStatic, ConsecutiveStringConcatenation, DuplicateNumberLiteral, DuplicateStringLiteral, LineLength, NestedBlockDepth, NoDef, VariableTypeRequired */
-import groovy.transform.Field
-
-@Field String _DDrive = 'D:/'
-@Field String _AssemblyName = '...'
-@Field String _TargetLocation = '...'
-@Field String _GitCommitSeven = '...'
-@Field String _GitName = 'MET08DDUPSP1TBI'
-@Field String _TestProjectDirectory = 'Adaptation'
-@Field String _AgentStaging = 'mestsa07ec-ecmeseaf'
-@Field String _DDriveNet = "${_DDrive}Framework4.8"
-@Field String _AgentProduction = 'messa08ec-ecmeseaf'
-@Field String _AgentDevelopment = 'mestsa003-mesedasvc'
-@Field String _ProgramFilesDotnet = 'C:/Program Files/dotnet/dotnet.exe'
-@Field String _ProgramFilesMSBuild = 'C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe'
-
-pipeline {
-    agent {
-        label env.JENKINS_ENVIRONMENT == 'Development' ? _AgentDevelopment : env.JENKINS_ENVIRONMENT == 'Staging' ? _AgentStaging : env.JENKINS_ENVIRONMENT == 'Production' ? _AgentProduction : 'Else'
-    }
-    parameters {
-        string(name: 'GIT_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'mestsa003.infineon.com' : 'mestsa07ec.ec.local', description: 'git server')
-        string(name: 'DEFAULT_FILE_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'messv02ecc1_ec_local' : 'messv02ecc1.ec.local', description: 'Default file server...')
-    }
-    stages {
-        // stage('Git') {
-        //     steps {
-        //         bat(returnStatus: true, script: 'git init')
-        //         bat(returnStatus: true, script: 'git remote add origin \\\\' + params.GIT_SERVER + '\\Git\\' + _GitName + '.git')
-        //         bat(returnStatus: true, script: 'git pull origin master')
-        //     }
-        // }
-        stage('Setup') {
-            steps {
-                script {
-                    _AssemblyName = "${env.JOB_NAME}"
-                    // _GitCommitSeven = '1234567'
-                    _GitCommitSeven = env.GIT_COMMIT.substring(0, 7)
-                    def files = findFiles(glob: '*.csproj')
-                    if (files.length != 1) {
-                        error("Build failed because couldn't find a *.csproj file")
-                    }
-                    echo """
-                        ${files[0].name}
-                        ${files[0].path}
-                        ${files[0].directory}
-                        ${files[0].length}
-                        ${files[0].lastModified}
-                        """
-                    _AssemblyName = files[0].name.split('[.]csproj')[0]
-                    _TargetLocation = "\\\\${params.DEFAULT_FILE_SERVER}\\EC_EAFRepository\\${env.JENKINS_ENVIRONMENT}\\DeploymentStorage\\Adaptation_${_AssemblyName}"
-                }
-            }
-        }
-        stage('Info') {
-            steps {
-                echo "_AssemblyName ${_AssemblyName}" // ...
-                echo "BUILD_NUMBER ${env.BUILD_NUMBER}" // 11
-                echo "DEFAULT_FILE_SERVER ${params.DEFAULT_FILE_SERVER}" // 11
-                echo "GIT_BRANCH ${env.GIT_BRANCH}" // origin/master
-                echo "GIT_COMMIT ${env.GIT_COMMIT}" // 73b814069f2cf0173a62a8228815a9bc9ba93c41
-                echo "GIT_SERVER ${params.GIT_SERVER}" // ...
-                echo "GIT_URL ${env.GIT_URL}" // D:\ProgramData\Git\....git
-                echo "JENKINS_ENVIRONMENT ${env.JENKINS_ENVIRONMENT}" // 11
-                echo "JENKINS_URL ${env.JENKINS_URL}" // http://localhost:8080/
-                echo "JOB_NAME ${env.JOB_NAME}" // ...
-                echo "WORKSPACE ${env.WORKSPACE}" // D:\.jenkins\_\...
-            }
-        }
-        // stage('Restore') {
-        //     steps {
-        //         bat(returnStatus: true, script: 'dotnet --info')
-        //     }
-        // }
-        stage('Safe storage of app secrets') {
-            steps {
-                dir(_TestProjectDirectory) {
-                    bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' +
-                        'user-secrets init')
-                    bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' +
-                        'user-secrets set "BuildNumber" "' + env.BUILD_NUMBER + '"')
-                    bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' +
-                        'user-secrets set "GitCommitSeven" "' + _GitCommitSeven + '"')
-                    bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' +
-                        'user-secrets set "Server" "' + params.DEFAULT_FILE_SERVER + '"')
-                }
-            }
-        }
-        stage('Core Build') {
-            steps {
-                echo "Build number is ${currentBuild.number}"
-                dir(_TestProjectDirectory) {
-                    bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' +
-                        'build --runtime win-x64 --self-contained --verbosity quiet')
-                }
-            }
-        }
-        // stage('Test') {
-        //     options {
-        //         timeout(time: 10, unit: 'MINUTES')
-        //     }
-        //     steps {
-        //         dir(_TestProjectDirectory) {
-        //             bat('dotnet --info')
-        //         }
-        //     }
-        // }
-        stage('Framework Build') {
-            steps {
-                echo "Build number is ${currentBuild.number}"
-                bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' +
-                    '/target:Restore ' +
-                    '/detailedsummary ' +
-                    '/consoleloggerparameters:PerformanceSummary;ErrorsOnly; ' +
-                    '/property:Configuration=Debug;TargetFrameworkVersion=v4.8 ' +
-                    _AssemblyName + '.csproj')
-                bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' +
-                    '/target:Build ' +
-                    '/detailedsummary ' +
-                    '/consoleloggerparameters:PerformanceSummary;ErrorsOnly; ' +
-                    '/property:Configuration=Debug;TargetFrameworkVersion=v4.8 ' +
-                    _AssemblyName + '.csproj')
-            }
-        }
-        stage('Commit Id') {
-            steps {
-                dir('bin/Debug') {
-                    writeFile file: "${_AssemblyName}.txt", text: "${env.GIT_COMMIT}-${env.BUILD_NUMBER}-${env.GIT_URL}"
-                }
-            }
-        }
-        stage('Package') {
-            steps {
-                fileOperations([fileZipOperation(folderPath: 'bin/Debug', outputFolderPath: "${_DDriveNet}/${_GitCommitSeven}-${env.BUILD_NUMBER}-${env.JOB_NAME}-Debug")])
-                fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*", renameFiles: false, sourceCaptureExpression: '', targetLocation: "${_DDriveNet}/${_GitCommitSeven}-${env.BUILD_NUMBER}-${env.JOB_NAME}-Debug", targetNameExpression: '')])
-            }
-        }
-        // stage('Force Fail') {
-        //     steps {
-        //         error("Build failed because of this and that..")
-        //     }
-        // }
-        stage('Copy Files to: file-share') {
-            steps {
-                dir('bin/Debug') {
-                    fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.txt", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')])
-                    fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.dll", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')])
-                    fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.exe", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')])
-                    fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.pdb", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')])
-                }
-            }
-        }
-    }
-    post {
-        always {
-            dir('bin') {
-                deleteDir()
-            }
-            dir('obj') {
-                deleteDir()
-            }
-            dir(_TestProjectDirectory + '/bin') {
-                deleteDir()
-            }
-            dir(_TestProjectDirectory + '/obj') {
-                deleteDir()
-            }
-            cleanWs()
-        }
-    }
-}