From 0bd7b510437b2a69e1aac39d46420d287b6996c6 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Mon, 13 Feb 2023 06:14:35 -0700 Subject: [PATCH] IQS --- .gitignore | 11 +++-- Adaptation/.config/dotnet-tools.json | 12 +++++ Adaptation/.vscode/settings.json | 1 + .../FileHandlers/OpenInsight/FromIQS.cs | 2 +- Adaptation/MET08THFTIRQS408M-Development.yml | 48 ++++++++++++++----- Adaptation/MET08THFTIRQS408M.Tests.csproj | 43 +++++++---------- Adaptation/MET08THFTIRQS408M.yml | 48 ++++++++++++++----- MET08THFTIRQS408M.csproj | 3 +- 8 files changed, 112 insertions(+), 56 deletions(-) create mode 100644 Adaptation/.config/dotnet-tools.json diff --git a/.gitignore b/.gitignore index eab1f67..c19d760 100644 --- a/.gitignore +++ b/.gitignore @@ -331,10 +331,11 @@ ASALocalRun/ ## ## Visual Studio Code ## -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json +*/!.vscode/extensions.json +*/!.vscode/launch.json +*/!.vscode/settings.json +*/!.vscode/tasks.json +*/.vscode/* +*/.vscode/ReportGenerator/* *.lnk diff --git a/Adaptation/.config/dotnet-tools.json b/Adaptation/.config/dotnet-tools.json new file mode 100644 index 0000000..cd368e1 --- /dev/null +++ b/Adaptation/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "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/settings.json b/Adaptation/.vscode/settings.json index bfc6959..584bf04 100644 --- a/Adaptation/.vscode/settings.json +++ b/Adaptation/.vscode/settings.json @@ -14,6 +14,7 @@ "THFTIRQS", "uctor" ], + "coverage-gutters.coverageBaseDir": "../../../../MET08THFTIRQS408M/05_TestResults/TestResults/**", "workbench.colorCustomizations": { "activityBar.activeBackground": "#eaf2d1", "activityBar.activeBorder": "#51b0ce", diff --git a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs index f7ae7f8..5f90f94 100644 --- a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs +++ b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs @@ -49,7 +49,7 @@ public class FromIQS .Append(" and pd.f_name = '").Append(description.PSN).AppendLine("' ") .AppendLine(" and jd.f_name in ('BIORAD2', 'BIORAD3', 'BIORAD4', 'BIORAD5') ") .Append(" and jd.f_name = '").Append(logistics.MesEntity).AppendLine("' ") - .Append(" and pl.f_name = '").Append(description.RDS).AppendLine("' ") + .Append(" and pl.f_name = '").Append(string.IsNullOrEmpty(description.RDS) ? "" : description.RDS).AppendLine("' ") .Append(" and dateadd(HH, -7, (dateadd(SS, convert(bigint, se.f_sgtm), '19700101'))) = '").Append(dateTime).AppendLine("' ") .AppendLine(" for json path "); return result.ToString(); diff --git a/Adaptation/MET08THFTIRQS408M-Development.yml b/Adaptation/MET08THFTIRQS408M-Development.yml index 14b26c9..b564c0f 100644 --- a/Adaptation/MET08THFTIRQS408M-Development.yml +++ b/Adaptation/MET08THFTIRQS408M-Development.yml @@ -66,15 +66,15 @@ 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 ' + 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' + 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: Tests + 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,14 +157,14 @@ 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 - script: | "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration) - workingDirectory: Tests + workingDirectory: Adaptation displayName: "Core Clean - Tests" - script: | @@ -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 diff --git a/Adaptation/MET08THFTIRQS408M.Tests.csproj b/Adaptation/MET08THFTIRQS408M.Tests.csproj index 65b2204..86a29cf 100644 --- a/Adaptation/MET08THFTIRQS408M.Tests.csproj +++ b/Adaptation/MET08THFTIRQS408M.Tests.csproj @@ -33,6 +33,16 @@ Linux + + + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + @@ -45,46 +55,29 @@ - - - - - - + + + NU1701 + - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + NU1701 NU1701 NU1701 NU1701 - - NU1701 - NU1701 - NU1701 - NU1701 - NU1701 - NU1701 - NU1701 - NU1701 - Always diff --git a/Adaptation/MET08THFTIRQS408M.yml b/Adaptation/MET08THFTIRQS408M.yml index c326828..8c67cef 100644 --- a/Adaptation/MET08THFTIRQS408M.yml +++ b/Adaptation/MET08THFTIRQS408M.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 ' + 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: Tests + 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,13 +153,13 @@ 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 - script: | "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration) - workingDirectory: Tests + workingDirectory: Adaptation displayName: "Core Clean - Tests" - script: | @@ -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 diff --git a/MET08THFTIRQS408M.csproj b/MET08THFTIRQS408M.csproj index c35bf50..6b67943 100644 --- a/MET08THFTIRQS408M.csproj +++ b/MET08THFTIRQS408M.csproj @@ -11,7 +11,8 @@ MET08THFTIRQS408M MET08THFTIRQS408M v4.8 - win-x86 + win-x64 + win 512