diff --git a/.groovy b/.groovy
deleted file mode 100644
index 802a026..0000000
--- a/.groovy
+++ /dev/null
@@ -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 = 'MET08THFTIRQS408M'
-@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()
- }
- }
-}
diff --git a/Adaptation/.vscode/launch.json b/Adaptation/.vscode/launch.json
index c7465c7..f5e348e 100644
--- a/Adaptation/.vscode/launch.json
+++ b/Adaptation/.vscode/launch.json
@@ -4,7 +4,7 @@
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
- "processId": 12736
+ "processId": 24580
}
]
}
diff --git a/Adaptation/MET08THFTIRQS408M-Development.yml b/Adaptation/MET08THFTIRQS408M-Development.yml
new file mode 100644
index 0000000..14b26c9
--- /dev/null
+++ b/Adaptation/MET08THFTIRQS408M-Development.yml
@@ -0,0 +1,153 @@
+trigger:
+ branches:
+ include:
+ - development
+ paths:
+ include:
+ - "Adaptation/*"
+
+pool:
+ name: Mesa-Windows-Service
+ demands: MET08THFTIRQS408M-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
diff --git a/Adaptation/MET08THFTIRQS408M.Tests.csproj b/Adaptation/MET08THFTIRQS408M.Tests.csproj
index bbfaaa1..65b2204 100644
--- a/Adaptation/MET08THFTIRQS408M.Tests.csproj
+++ b/Adaptation/MET08THFTIRQS408M.Tests.csproj
@@ -33,40 +33,41 @@
Linux
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
+
diff --git a/Adaptation/MET08THFTIRQS408M.yml b/Adaptation/MET08THFTIRQS408M.yml
new file mode 100644
index 0000000..c326828
--- /dev/null
+++ b/Adaptation/MET08THFTIRQS408M.yml
@@ -0,0 +1,148 @@
+trigger:
+ branches:
+ include:
+ - master
+ paths:
+ include:
+ - "Adaptation/*"
+
+pool:
+ name: Mesa-Windows-Service
+ demands: MET08THFTIRQS408M
+
+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
diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/BIORAD2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/BIORAD2.cs
similarity index 92%
rename from Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/BIORAD2.cs
rename to Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/BIORAD2.cs
index 39333da..5c9824a 100644
--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/BIORAD2.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/BIORAD2.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 BIORAD2 : EAFLoggingUnitTesting
@@ -18,6 +18,8 @@ public class BIORAD2 : EAFLoggingUnitTesting
internal static string DummyRoot { get; private set; }
internal static BIORAD2 EAFLoggingUnitTesting { get; private set; }
+ static BIORAD2() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+
public BIORAD2() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
{
if (EAFLoggingUnitTesting is null)
@@ -45,11 +47,11 @@ public class BIORAD2 : EAFLoggingUnitTesting
EAFLoggingUnitTesting?.Dispose();
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
- public void Staging__v2_47_1__BIORAD2__QS408M()
+ public void Staging__v2_47_0__BIORAD2__QS408M()
{
string check = "*.txt";
MethodBase methodBase = new StackFrame().GetMethod();
diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/BIORAD3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/BIORAD3.cs
similarity index 92%
rename from Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/BIORAD3.cs
rename to Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/BIORAD3.cs
index 95475e4..8f45b5b 100644
--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/BIORAD3.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/BIORAD3.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 BIORAD3 : EAFLoggingUnitTesting
@@ -18,6 +18,8 @@ public class BIORAD3 : EAFLoggingUnitTesting
internal static string DummyRoot { get; private set; }
internal static BIORAD3 EAFLoggingUnitTesting { get; private set; }
+ static BIORAD3() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+
public BIORAD3() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
{
if (EAFLoggingUnitTesting is null)
@@ -45,11 +47,11 @@ public class BIORAD3 : EAFLoggingUnitTesting
EAFLoggingUnitTesting?.Dispose();
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
- public void Staging__v2_47_1__BIORAD3__QS408M()
+ public void Staging__v2_47_0__BIORAD3__QS408M()
{
string check = "*.txt";
MethodBase methodBase = new StackFrame().GetMethod();
diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08THFTIRQS408M.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08THFTIRQS408M.cs
index 82bce7f..2e2e01e 100644
--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08THFTIRQS408M.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08THFTIRQS408M.cs
@@ -18,6 +18,8 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting
internal static string DummyRoot { get; private set; }
internal static MET08THFTIRQS408M EAFLoggingUnitTesting { get; private set; }
+ static MET08THFTIRQS408M() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy";
+
public MET08THFTIRQS408M() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
{
if (EAFLoggingUnitTesting is null)
@@ -45,7 +47,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting
EAFLoggingUnitTesting?.Dispose();
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
@@ -58,7 +60,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting
EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
@@ -71,7 +73,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting
EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
@@ -84,7 +86,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting
EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
@@ -97,7 +99,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting
EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
@@ -110,7 +112,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting
EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
@@ -123,7 +125,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting
EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
@@ -136,7 +138,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting
EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
@@ -149,7 +151,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting
EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
@@ -162,7 +164,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting
EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.0/BIORAD2.cs b/Adaptation/_Tests/Extract/Staging/v2.47.0/BIORAD2.cs
new file mode 100644
index 0000000..5b57feb
--- /dev/null
+++ b/Adaptation/_Tests/Extract/Staging/v2.47.0/BIORAD2.cs
@@ -0,0 +1,27 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Adaptation._Tests.Extract.Staging.v2_47_0;
+
+[TestClass]
+public class BIORAD2
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+ private static CreateSelfDescription.Staging.v2_47_0.BIORAD2 _BIORAD2;
+
+ [ClassInitialize]
+ public static void ClassInitialize(TestContext testContext)
+ {
+ CreateSelfDescription.Staging.v2_47_0.BIORAD2.ClassInitialize(testContext);
+ _BIORAD2 = CreateSelfDescription.Staging.v2_47_0.BIORAD2.EAFLoggingUnitTesting;
+ }
+
+#if DEBUG
+ [Ignore]
+#endif
+ [TestMethod]
+ public void Staging__v2_47_0__BIORAD2__QS408M() => _BIORAD2.Staging__v2_47_0__BIORAD2__QS408M();
+
+}
\ No newline at end of file
diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.1/BIORAD3.cs b/Adaptation/_Tests/Extract/Staging/v2.47.0/BIORAD3.cs
similarity index 71%
rename from Adaptation/_Tests/Extract/Staging/v2.47.1/BIORAD3.cs
rename to Adaptation/_Tests/Extract/Staging/v2.47.0/BIORAD3.cs
index fd3e219..b17ff9c 100644
--- a/Adaptation/_Tests/Extract/Staging/v2.47.1/BIORAD3.cs
+++ b/Adaptation/_Tests/Extract/Staging/v2.47.0/BIORAD3.cs
@@ -5,7 +5,7 @@ using System;
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 BIORAD3
@@ -14,30 +14,31 @@ public class BIORAD3
#pragma warning disable CA2254
#pragma warning disable IDE0060
- private static CreateSelfDescription.Staging.v2_47_1.BIORAD3 _BIORAD3;
+ private static CreateSelfDescription.Staging.v2_47_0.BIORAD3 _BIORAD3;
[ClassInitialize]
public static void ClassInitialize(TestContext testContext)
{
- CreateSelfDescription.Staging.v2_47_1.BIORAD3.ClassInitialize(testContext);
- _BIORAD3 = CreateSelfDescription.Staging.v2_47_1.BIORAD3.EAFLoggingUnitTesting;
+ CreateSelfDescription.Staging.v2_47_0.BIORAD3.ClassInitialize(testContext);
+ _BIORAD3 = CreateSelfDescription.Staging.v2_47_0.BIORAD3.EAFLoggingUnitTesting;
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
- public void Staging__v2_47_1__BIORAD3__QS408M() => _BIORAD3.Staging__v2_47_1__BIORAD3__QS408M();
+ public void Staging__v2_47_0__BIORAD3__QS408M() => _BIORAD3.Staging__v2_47_0__BIORAD3__QS408M();
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
- public void Staging__v2_47_1__BIORAD3__QS408M637406016892454000__ReactorAndRDS()
+ public void Staging__v2_47_0__BIORAD3__QS408M637406016892454000__ReactorAndRDS()
{
DateTime dateTime;
string check = "*.txt";
- _BIORAD3.Staging__v2_47_1__BIORAD3__QS408M();
+ bool validatePDSF = false;
+ _BIORAD3.Staging__v2_47_0__BIORAD3__QS408M();
MethodBase methodBase = new StackFrame().GetMethod();
string[] variables = _BIORAD3.AdaptationTesting.GetVariables(methodBase, check);
IFileRead fileRead = _BIORAD3.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
@@ -46,7 +47,7 @@ public class BIORAD3
Assert.IsTrue(dateTime == logistics.DateTimeFromSequence);
dateTime = FileHandlers.QS408M.ProcessData.GetDateTime(logistics, tickOffset: 0, dateTimeText: "Tue Nov 10 12:03:56 1970");
Assert.IsTrue(dateTime == logistics.DateTimeFromSequence);
- _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+ _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
}
}
\ No newline at end of file
diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.1/BIORAD2.cs b/Adaptation/_Tests/Extract/Staging/v2.47.1/BIORAD2.cs
deleted file mode 100644
index 089eeac..0000000
--- a/Adaptation/_Tests/Extract/Staging/v2.47.1/BIORAD2.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Adaptation._Tests.Extract.Staging.v2_47_1;
-
-[TestClass]
-public class BIORAD2
-{
-
-#pragma warning disable CA2254
-#pragma warning disable IDE0060
-
- private static CreateSelfDescription.Staging.v2_47_1.BIORAD2 _BIORAD2;
-
- [ClassInitialize]
- public static void ClassInitialize(TestContext testContext)
- {
- CreateSelfDescription.Staging.v2_47_1.BIORAD2.ClassInitialize(testContext);
- _BIORAD2 = CreateSelfDescription.Staging.v2_47_1.BIORAD2.EAFLoggingUnitTesting;
- }
-
-#if true
- [Ignore]
-#endif
- [TestMethod]
- public void Staging__v2_47_1__BIORAD2__QS408M() => _BIORAD2.Staging__v2_47_1__BIORAD2__QS408M();
-
-}
\ No newline at end of file
diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08THFTIRQS408M.cs b/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08THFTIRQS408M.cs
index 1af6c69..287e3bf 100644
--- a/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08THFTIRQS408M.cs
+++ b/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08THFTIRQS408M.cs
@@ -23,31 +23,31 @@ public class MET08THFTIRQS408M
_MET08THFTIRQS408M = CreateSelfDescription.Staging.v2_47_1.MET08THFTIRQS408M.EAFLoggingUnitTesting;
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
public void Staging__v2_47_1__MET08THFTIRQS408M__MoveMatchingFiles() => _MET08THFTIRQS408M.Staging__v2_47_1__MET08THFTIRQS408M__MoveMatchingFiles();
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
public void Staging__v2_47_1__MET08THFTIRQS408M__OpenInsightMetrologyViewer() => _MET08THFTIRQS408M.Staging__v2_47_1__MET08THFTIRQS408M__OpenInsightMetrologyViewer();
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
public void Staging__v2_47_1__MET08THFTIRQS408M__IQSSi() => _MET08THFTIRQS408M.Staging__v2_47_1__MET08THFTIRQS408M__IQSSi();
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
public void Staging__v2_47_1__MET08THFTIRQS408M__OpenInsight() => _MET08THFTIRQS408M.Staging__v2_47_1__MET08THFTIRQS408M__OpenInsight();
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
@@ -67,37 +67,37 @@ public class MET08THFTIRQS408M
_ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
}
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
public void Staging__v2_47_1__MET08THFTIRQS408M__OpenInsightMetrologyViewerAttachments() => _MET08THFTIRQS408M.Staging__v2_47_1__MET08THFTIRQS408M__OpenInsightMetrologyViewerAttachments();
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
public void Staging__v2_47_1__MET08THFTIRQS408M__APC() => _MET08THFTIRQS408M.Staging__v2_47_1__MET08THFTIRQS408M__APC();
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
public void Staging__v2_47_1__MET08THFTIRQS408M__SPaCe() => _MET08THFTIRQS408M.Staging__v2_47_1__MET08THFTIRQS408M__SPaCe();
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
public void Staging__v2_47_1__MET08THFTIRQS408M__Processed() => _MET08THFTIRQS408M.Staging__v2_47_1__MET08THFTIRQS408M__Processed();
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
public void Staging__v2_47_1__MET08THFTIRQS408M__Archive() => _MET08THFTIRQS408M.Staging__v2_47_1__MET08THFTIRQS408M__Archive();
-#if true
+#if DEBUG
[Ignore]
#endif
[TestMethod]
diff --git a/Adaptation/_Tests/Shared/AdaptationTesting.cs b/Adaptation/_Tests/Shared/AdaptationTesting.cs
index c011f8e..5741fc3 100644
--- a/Adaptation/_Tests/Shared/AdaptationTesting.cs
+++ b/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 GetKeyValuePairs(string cellInstanceName, string cellInstanceVersionName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, List> equipmentDictionaryIsAlwaysEnabledEvents)
+ protected Dictionary GetKeyValuePairs(string cellInstanceName, string cellInstanceVersionName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, List> equipmentDictionaryIsAlwaysEnabledEvents, int edaConnectionPortNumber)
{
Dictionary 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> modelObjectParametersTuple = GetModelObjectParameters(equipmentTypeVersionTuple);
Tuple equipmentDictionaryVersionTuple = GetEquipmentDictionaryVersionTuple(cellInstanceVersionTuple.Item2, mbn.CellInstanceConnectionName, equipmentTypeVersionTuple.Item4);
Tuple>> equipmentDictionaryIsAlwaysEnabledEventsTuple = GetEquipmentDictionaryIsAlwaysEnabledEventsTuple(equipmentDictionaryVersionTuple);
- Dictionary objects = GetKeyValuePairs(mbn.CellInstanceName, mbn.CellInstanceVersionName, mbn.CellInstanceConnectionName, fileConnectorConfigurationTuple.Item2, equipmentTypeVersionTuple.Item2, parameterizedModelObjectDefinitionTypeTuple.Item2, modelObjectParametersTuple.Item2, equipmentDictionaryVersionTuple.Item2, equipmentDictionaryIsAlwaysEnabledEventsTuple.Item2);
+ Dictionary 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;
diff --git a/Adaptation/_Tests/Static/MET08THFTIRQS408M.cs b/Adaptation/_Tests/Static/MET08THFTIRQS408M.cs
new file mode 100644
index 0000000..b4678c0
--- /dev/null
+++ b/Adaptation/_Tests/Static/MET08THFTIRQS408M.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 MET08THFTIRQS408M : LoggingUnitTesting, IDisposable
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+ internal static MET08THFTIRQS408M LoggingUnitTesting { get; private set; }
+
+ public MET08THFTIRQS408M() : base(testContext: null, declaringType: null)
+ {
+ if (LoggingUnitTesting is null)
+ throw new Exception();
+ }
+
+ public MET08THFTIRQS408M(TestContext testContext) : base(testContext, new StackFrame().GetMethod().DeclaringType)
+ {
+ }
+
+ [ClassInitialize]
+ public static void ClassInitialize(TestContext testContext) => LoggingUnitTesting ??= new MET08THFTIRQS408M(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("MET08THFTIRQS408M", "v2.47.1"),
+ };
+ 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"));
+ }
+
+}
\ No newline at end of file
diff --git a/Adaptation/_Tests/Static/QS408M.cs b/Adaptation/_Tests/Static/QS408M.cs
index d660542..bbb51c7 100644
--- a/Adaptation/_Tests/Static/QS408M.cs
+++ b/Adaptation/_Tests/Static/QS408M.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;
@@ -126,4 +128,29 @@ public class QS408M : 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("BIORAD2", "v2.47.0"),
+ new("BIORAD3", "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"));
+ }
+
}
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 26a5152..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -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 = 'MET08THFTIRQS408M'
-@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()
- }
- }
-}