IQS <blank> II

Adaptation/MET08RESIHGCV-Development.yml

@@ -55,7 +55,7 @@ steps:
 
   - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
     displayName: "Nuget Clear"
-    enabled: false
+    # enabled: false
 
   - script: |
       "C:\program files\dotnet\dotnet.exe" user-secrets init
@@ -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'
@@ -92,39 +92,63 @@ steps:
   - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
     workingDirectory: Adaptation
     displayName: "Core Build - Adaptation"
+  
+  - powershell: Get-ChildItem .\ -include TestResults -Recurse | foreach ($_) { remove-item $_.fullname -Force -Recurse }
+    workingDirectory: "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)"
+    displayName: 'PowerShell Script'
 
   - script: "dotnet test --configuration $(Configuration)"
     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:.vscode/TestResults/*/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark'
+  - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:$(System.DefaultWorkingDirectory)/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: 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
@@ -133,7 +157,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
@@ -149,5 +173,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

Adaptation/MET08RESIHGCV.Tests.csproj

@@ -33,9 +33,16 @@
         <DefineConstants>Linux</DefineConstants>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Infineon.Mesa.PDF.Text.Stripper" Version="4.8.0.1"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="coverlet.collector" Version="3.2.0" />
-    </ItemGroup>
+        <PackageReference Include="FFMpegCore" Version="5.0.0" />
-    <ItemGroup>
+        <PackageReference Include="IKVM.AWT.WinForms" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="IKVM.OpenJDK.Core" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="IKVM.OpenJDK.Media" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="IKVM.OpenJDK.Text" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="IKVM.OpenJDK.Util" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="IKVM.OpenJDK.XML.API" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="IKVM.Runtime" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="Instances" Version="3.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.2" />
         <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
@@ -48,46 +55,29 @@
         <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
         <PackageReference Include="Microsoft.Win32.SystemEvents" Version="7.0.0" />
-    </ItemGroup>
+        <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-    <ItemGroup>
+        <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
-        <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+        <PackageReference Include="Pdfbox" Version="1.1.1"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+        <PackageReference Include="RoboSharp" Version="1.2.8" />
-    </ItemGroup>
-    <ItemGroup>
         <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
         <PackageReference Include="System.Data.OleDb" Version="7.0.0" />
         <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
         <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
         <PackageReference Include="System.Text.Json" Version="7.0.1" />
-    </ItemGroup>
-    <ItemGroup>
-        <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="Instances" Version="2.0.0" />
-        <PackageReference Include="RoboSharp" Version="1.2.8" />
         <PackageReference Include="Tesseract" Version="5.2.0" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Tibco.Rendezvous" Version="8.5.0" />
+        <PackageReference Include="Infineon.Yoda" Version="5.4.1" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Infineon.Mesa.PDF.Text.Stripper" Version="4.8.0.1"><NoWarn>NU1701</NoWarn></PackageReference>
     </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>
         <PackageReference Include="External.log4net" Version="2.0.8"><NoWarn>NU1701</NoWarn></PackageReference>
     </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Pdfbox" Version="1.1.1"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.AWT.WinForms" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.OpenJDK.Core" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.OpenJDK.Media" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.OpenJDK.Text" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.OpenJDK.Util" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.OpenJDK.XML.API" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.Runtime" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-    </ItemGroup>
     <ItemGroup>
         <None Include="appsettings.json">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -103,17 +93,11 @@
         <None Condition="'$(Configuration)' == 'Debug'" Include="\\mestsa003.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64\gpcl6win64.exe">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Condition="'$(Configuration)' == 'Debug'" Include="\\mestsa003.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC\v2.6.6.21\LincPDFC.exe">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
         <None Condition="'$(Configuration)' == 'Release'" Include="\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64\gpcl6dll64.dll">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
         <None Condition="'$(Configuration)' == 'Release'" Include="\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64\gpcl6win64.exe">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Condition="'$(Configuration)' == 'Release'" Include="\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC\v2.6.6.21\LincPDFC.exe">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
     </ItemGroup>
 </Project>

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'
@@ -89,39 +89,63 @@ steps:
   - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
     workingDirectory: Adaptation
     displayName: "Core Build - Adaptation"
+  
+  - powershell: Get-ChildItem .\ -include TestResults -Recurse | foreach ($_) { remove-item $_.fullname -Force -Recurse }
+    workingDirectory: "$(System.DefaultWorkingDirectory)/../../../$(Build.Repository.Name)"
+    displayName: 'PowerShell Script'
 
   - script: "dotnet test --configuration $(Configuration)"
     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:.vscode/TestResults/*/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark'
+  - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:$(System.DefaultWorkingDirectory)/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: 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
 
@@ -129,7 +153,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
 
@@ -144,5 +168,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

MET08RESIHGCV.csproj

@@ -11,7 +11,8 @@
     <RootNamespace>MET08RESIHGCV</RootNamespace>
     <AssemblyName>MET08RESIHGCV</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(Configuration)' == 'Debug'">win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(Configuration)' == 'Release'">win</RuntimeIdentifier>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup>