diff --git a/Adaptation/MET08RESIHGCV-Development.yml b/Adaptation/MET08RESIHGCV-Development.yml index 880d1f1..ac0aaa0 100644 --- a/Adaptation/MET08RESIHGCV-Development.yml +++ b/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 diff --git a/Adaptation/MET08RESIHGCV.Tests.csproj b/Adaptation/MET08RESIHGCV.Tests.csproj index 2aeb203..9ffcb31 100644 --- a/Adaptation/MET08RESIHGCV.Tests.csproj +++ b/Adaptation/MET08RESIHGCV.Tests.csproj @@ -33,9 +33,16 @@ Linux - NU1701 - - + + + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + @@ -48,46 +55,29 @@ - - - - - - + + + NU1701 + - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + NU1701 NU1701 NU1701 NU1701 - - NU1701 - NU1701 - NU1701 - NU1701 - NU1701 - NU1701 - NU1701 - NU1701 - Always @@ -103,17 +93,11 @@ PreserveNewest - - PreserveNewest - PreserveNewest PreserveNewest - - PreserveNewest - \ No newline at end of file diff --git a/Adaptation/MET08RESIHGCV.yml b/Adaptation/MET08RESIHGCV.yml index 6b0a615..784d05e 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' @@ -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 diff --git a/MET08RESIHGCV.csproj b/MET08RESIHGCV.csproj index eedc936..b0eef28 100644 --- a/MET08RESIHGCV.csproj +++ b/MET08RESIHGCV.csproj @@ -11,7 +11,8 @@ MET08RESIHGCV MET08RESIHGCV v4.8 - win-x86 + win-x64 + win 512