diff --git a/.gitignore b/.gitignore
index c19d760..eab1f67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -331,11 +331,10 @@ ASALocalRun/
##
## Visual Studio Code
##
-*/!.vscode/extensions.json
-*/!.vscode/launch.json
-*/!.vscode/settings.json
-*/!.vscode/tasks.json
-*/.vscode/*
-*/.vscode/ReportGenerator/*
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
*.lnk
diff --git a/Adaptation/.config/dotnet-tools.json b/Adaptation/.config/dotnet-tools.json
deleted file mode 100644
index cd368e1..0000000
--- a/Adaptation/.config/dotnet-tools.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "version": 1,
- "isRoot": true,
- "tools": {
- "dotnet-reportgenerator-globaltool": {
- "version": "5.1.15",
- "commands": [
- "reportgenerator"
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/Adaptation/.vscode/574749__2023-10-02 05-01-16-B.txt b/Adaptation/.vscode/574749__2023-10-02 05-01-16-B.txt
new file mode 100644
index 0000000..12ac4b3
--- /dev/null
+++ b/Adaptation/.vscode/574749__2023-10-02 05-01-16-B.txt
@@ -0,0 +1 @@
+-1.000;0.736_Point-1
HGCV1
23
574749
4628
23-574749-4628
5PT MES
02/10/2023 05:00:24 AM
200.00
1.20
2.095E-002
N
PARALLEL
-5.00
-20.00
2500
2000.00 �
8IN4_10
8IN4_10
SSMDATA
4_108IN.PAT
ASTM: F723 - 82
6.067e+015
3.444e+000
3.829e+000
6.093e+015
3.568e+000
3.987e+000
4.702e-001
9.927e+000
1.210e+001
-1.000e+000
-1.000e+000
0.000e+000
8.204e-001
3.071e+000
3.489e+000
8.172e-001
3.179e+000
3.632e+000
9.000e+001
-1.000e+000
0.000e+000
1.650e+000
7.095e+001
9.181e+001
-1.000e+000
-1.000e+000
0.000e+000
1
5.927E+015
5.940E+015
0.434
-1.000
0.837
0.836
90.000
0.736
2
5.925E+015
5.953E+015
0.447
-1.000
0.838
0.834
90.000
0.129
3
6.311E+015
6.344E+015
0.509
-1.000
0.791
0.787
90.000
2.890
4
6.368E+015
6.402E+015
0.535
-1.000
0.784
0.780
90.000
2.321
5
5.924E+015
5.946E+015
0.439
-1.000
0.838
0.835
90.000
0.124
6
5.955E+015
5.983E+015
0.477
-1.000
0.834
0.830
90.000
2.910
7
6.353E+015
6.398E+015
0.540
-1.000
0.786
0.781
90.000
2.458
8
5.941E+015
5.964E+015
0.428
-1.000
0.835
0.833
90.000
0.847
9
5.898E+015
5.911E+015
0.423
-1.000
0.841
0.839
90.000
2.439
\ No newline at end of file
diff --git a/Adaptation/.vscode/574749__2023-10-02 05-01-16.txt b/Adaptation/.vscode/574749__2023-10-02 05-01-16.txt
new file mode 100644
index 0000000..06cbc2a
--- /dev/null
+++ b/Adaptation/.vscode/574749__2023-10-02 05-01-16.txt
@@ -0,0 +1 @@
+-1.000;0.736_Point-1 HGCV1 23 574749 4628 23-574749-4628 5PT MES 2/10/2023 5:00:24 AM 200.00 1.20 2.095E-002 N PARALLEL -5.00 -20.00 2500 2000.00 ? 8IN4_10 8IN4_10 SSMDATA 4_108IN.PAT ASTM: F723 - 82 6.067e+015 3.444e+000 3.829e+000 6.093e+015 3.568e+000 3.987e+000 4.702e-001 9.927e+000 1.210e+001 -1.000e+000 -1.000e+000 0.000e+000 8.204e-001 3.071e+000 3.489e+000 8.172e-001 3.179e+000 3.632e+000 9.000e+001 -1.000e+000 0.000e+000 1.650e+000 7.095e+001 9.181e+001 -1.000e+000 -1.000e+000 0.000e+000 1 5.927E+015 5.940E+015 0.434 -1.000 0.837 0.836 90.000 0.736 2 5.925E+015 5.953E+015 0.447 -1.000 0.838 0.834 90.000 0.129 3 6.311E+015 6.344E+015 0.509 -1.000 0.791 0.787 90.000 2.890 4 6.368E+015 6.402E+015 0.535 -1.000 0.784 0.780 90.000 2.321 5 5.924E+015 5.946E+015 0.439 -1.000 0.838 0.835 90.000 0.124 6 5.955E+015 5.983E+015 0.477 -1.000 0.834 0.830 90.000 2.910 7 6.353E+015 6.398E+015 0.540 -1.000 0.786 0.781 90.000 2.458 8 5.941E+015 5.964E+015 0.428 -1.000 0.835 0.833 90.000 0.847 9 5.898E+015 5.911E+015 0.423 -1.000 0.841 0.839 90.000 2.439
diff --git a/Adaptation/.vscode/RDS.js b/Adaptation/.vscode/RDS.js
new file mode 100644
index 0000000..1e310fa
--- /dev/null
+++ b/Adaptation/.vscode/RDS.js
@@ -0,0 +1,20 @@
+// (self.length != 0) ?
+// self :
+// (getContextData('2', 'cds.PROCESS_JOBID', '') == '-') ?
+// self :
+// getContextData('2', 'cds.PROCESS_JOBID', '')
+
+// (self.length != 0) ?
+// self :
+// getContextData('2', 'cds.MID', '')
+
+'-', 1, '-'
+
+getValue(self, self.length, getContextData('2', 'cds.MID', ''));
+
+function getValue(value, length, mid) {
+ if (length !== 0 || mid === '-')
+ return value;
+ else
+ return mid;
+}
\ No newline at end of file
diff --git a/Adaptation/.vscode/settings.json b/Adaptation/.vscode/settings.json
index 8853062..19967c4 100644
--- a/Adaptation/.vscode/settings.json
+++ b/Adaptation/.vscode/settings.json
@@ -21,7 +21,6 @@
"Rhosl",
"Villach"
],
- "coverage-gutters.coverageBaseDir": "../../../../MET08RESIHGCV/05_TestResults/TestResults/**",
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#79b2e4",
"activityBar.activeBorder": "#d42b85",
diff --git a/Adaptation/MET08RESIHGCV-Development.yml b/Adaptation/MET08RESIHGCV-Development.yml
index fa1a78e..880d1f1 100644
--- a/Adaptation/MET08RESIHGCV-Development.yml
+++ b/Adaptation/MET08RESIHGCV-Development.yml
@@ -66,7 +66,7 @@ steps:
displayName: "Safe storage of app secrets - Adaptation"
- task: CopyFiles@2
- displayName: "Copy Files to: - GhostPCL"
+ displayName: 'Copy Files to: - GhostPCL'
inputs:
SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64'
TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64'
@@ -74,7 +74,7 @@ steps:
enabled: false
- task: CopyFiles@2
- displayName: "Copy Files to: - LincPDFC"
+ 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'
@@ -82,7 +82,7 @@ steps:
enabled: false
- task: CopyFiles@2
- displayName: "Copy Files to: - PDF-Text-Stripper"
+ 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'
@@ -97,59 +97,34 @@ steps:
workingDirectory: Adaptation
displayName: "Core Test"
- - script: 'move /y "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)/05_TestResults/TestResults" $(System.DefaultWorkingDirectory)'
- displayName: "Move Results"
-
- 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:$(System.DefaultWorkingDirectory)/TestResults/**/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark'
+ - 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
- - task: PublishTestResults@2
- displayName: "Publish Test Results **/*.trx"
- inputs:
- testResultsFormat: VSTest
- testResultsFiles: "**/*.trx"
- searchFolder: "$(System.DefaultWorkingDirectory)"
-
- - task: DeleteFiles@1
- displayName: "Delete TestResults files"
- inputs:
- Contents: "TestResults/**/*"
-
- - task: mspremier.CreateWorkItem.CreateWorkItem-task.CreateWorkItem@1
- displayName: "Create work item"
- inputs:
- teamProject: "Mesa_FI"
- workItemType: Bug
- title: $(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)
- assignedTo: "$(Build.RequestedForId)"
- 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"
- enabled: false
- 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"
+ 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"
+ displayName: 'Commit Id'
- task: CopyFiles@2
displayName: 'Copy Files to: D:\Framework4.8'
inputs:
SourceFolder: 'bin\$(Configuration)'
- Contents: "*$(Build.Repository.Name)*"
+ Contents: '*$(Build.Repository.Name)*'
TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)'
OverWrite: true
enabled: false
@@ -158,7 +133,7 @@ steps:
displayName: 'Copy Files to: \\messv02ecc1.ec.local\EC_EAFRepository'
inputs:
SourceFolder: 'bin\$(Configuration)'
- Contents: "*$(Build.Repository.Name)*"
+ Contents: '*$(Build.Repository.Name)*'
TargetFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)'
OverWrite: true
enabled: false
@@ -174,5 +149,5 @@ steps:
displayName: "Core Clean - Adaptation"
- script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
- displayName: "Force Fail"
+ displayName: 'Force Fail'
enabled: false
diff --git a/Adaptation/MET08RESIHGCV.Tests.csproj b/Adaptation/MET08RESIHGCV.Tests.csproj
index 1bfa2e4..2aeb203 100644
--- a/Adaptation/MET08RESIHGCV.Tests.csproj
+++ b/Adaptation/MET08RESIHGCV.Tests.csproj
@@ -10,7 +10,7 @@
false
10.0
disable
- win-x64
+ win-x64
net6.0
@@ -61,7 +61,10 @@
-
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/Adaptation/MET08RESIHGCV.yml b/Adaptation/MET08RESIHGCV.yml
index 0842e4f..6b0a615 100644
--- a/Adaptation/MET08RESIHGCV.yml
+++ b/Adaptation/MET08RESIHGCV.yml
@@ -66,21 +66,21 @@ steps:
displayName: "Safe storage of app secrets - Adaptation"
- task: CopyFiles@2
- displayName: "Copy Files to: - GhostPCL"
+ 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"
+ 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"
+ 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'
@@ -94,59 +94,34 @@ steps:
workingDirectory: Adaptation
displayName: "Core Test"
- - script: 'move /y "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)/05_TestResults/TestResults" $(System.DefaultWorkingDirectory)'
- displayName: "Move Results"
-
- 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:$(System.DefaultWorkingDirectory)/TestResults/**/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark'
+ - 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
- - task: PublishTestResults@2
- displayName: "Publish Test Results **/*.trx"
- inputs:
- testResultsFormat: VSTest
- testResultsFiles: "**/*.trx"
- searchFolder: "$(System.DefaultWorkingDirectory)"
-
- - task: DeleteFiles@1
- displayName: "Delete TestResults files"
- inputs:
- Contents: "TestResults/**/*"
-
- - task: mspremier.CreateWorkItem.CreateWorkItem-task.CreateWorkItem@1
- displayName: "Create work item"
- inputs:
- teamProject: "Mesa_FI"
- workItemType: Bug
- title: $(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)
- assignedTo: "$(Build.RequestedForId)"
- 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"
- enabled: false
- 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"
+ 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"
+ displayName: 'Commit Id'
- task: CopyFiles@2
displayName: 'Copy Files to: D:\Framework4.8'
inputs:
SourceFolder: 'bin\$(Configuration)'
- Contents: "*$(Build.Repository.Name)*"
+ Contents: '*$(Build.Repository.Name)*'
TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)'
OverWrite: true
@@ -154,7 +129,7 @@ steps:
displayName: 'Copy Files to: \\messv02ecc1.ec.local\EC_EAFRepository'
inputs:
SourceFolder: 'bin\$(Configuration)'
- Contents: "*$(Build.Repository.Name)*"
+ Contents: '*$(Build.Repository.Name)*'
TargetFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)'
OverWrite: true
@@ -169,5 +144,5 @@ steps:
displayName: "Core Clean - Adaptation"
- script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
- displayName: "Force Fail"
+ displayName: 'Force Fail'
enabled: false
diff --git a/MET08RESIHGCV.csproj b/MET08RESIHGCV.csproj
index c4d3fb0..eedc936 100644
--- a/MET08RESIHGCV.csproj
+++ b/MET08RESIHGCV.csproj
@@ -11,7 +11,7 @@
MET08RESIHGCV
MET08RESIHGCV
v4.8
- win-x86
+ win-x86
512