From 5a94d2fadd3d7eed0cc935d08065d1b4cabcbf05 Mon Sep 17 00:00:00 2001 From: cocoa-dev006 <93573337+cocoa-dev006@users.noreply.github.com> Date: Mon, 18 Apr 2022 14:09:58 +0900 Subject: [PATCH 1/5] Update azure-pipelines.yml for Azure Pipelines Added dotnet publish task --- azure-pipelines/server/azure-pipelines.yml | 44 +++++++++++++++------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/azure-pipelines/server/azure-pipelines.yml b/azure-pipelines/server/azure-pipelines.yml index f240a67a8..703a83f06 100644 --- a/azure-pipelines/server/azure-pipelines.yml +++ b/azure-pipelines/server/azure-pipelines.yml @@ -13,7 +13,7 @@ parameters: - name: image displayName: Pool Image type: string - default: windows-2019 + default: windows-2022 values: - windows-latest - windows-2022 @@ -47,7 +47,7 @@ stages: displayName: 'Visual Studio Test Platform Installer' inputs: versionSelector: specificVersion - testPlatformVersion: 16.6.1 + testPlatformVersion: 17.1.0 - task: DotNetCoreCLI@2 displayName: 'dotnet restore' inputs: @@ -65,7 +65,7 @@ stages: inputs: command: test projects: '$(System.DefaultWorkingDirectory)/src/Covid19Radar.Api.Tests/*.Tests.csproj' - arguments: '--logger trx --settings $(System.DefaultWorkingDirectory)/Covid19Radar.Functions.runsettings --collect:"XPlat Code Coverage"' + arguments: '--configuration ${{ parameters.configuration }} --logger trx --no-build --settings $(System.DefaultWorkingDirectory)/Covid19Radar.Functions.runsettings --collect:"XPlat Code Coverage"' - task: PublishTestResults@2 inputs: testResultsFormat: 'VSTest' @@ -83,30 +83,48 @@ stages: filename: ./reportgenerator arguments: '-reports:$(Agent.TempDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/coverlet/reports -reporttypes:"Cobertura"' - task: PublishCodeCoverageResults@1 - displayName: 'Publish code coverage from $(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml ' + displayName: 'Publish code coverage from $(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml' inputs: codeCoverageTool: Cobertura - summaryFileLocation: '$(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml ' + summaryFileLocation: '$(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml' pathToSources: '$(System.DefaultWorkingDirectory)' reportDirectory: '$(Build.SourcesDirectory)/coverlet/reports/' + - task: DotNetCoreCLI@2 + displayName: 'publish Api' + inputs: + command: publish + projects: '$(System.DefaultWorkingDirectory)/src/Covid19Radar.Api/Covid19Radar.Api.csproj' + arguments: '--configuration ${{ parameters.configuration }} --no-build --output $(System.DefaultWorkingDirectory)/publish_output/Api' + publishWebProjects: false + zipAfterPublish: false + modifyOutputPath: false + - task: DotNetCoreCLI@2 + displayName: 'publish BackGround' + inputs: + command: publish + projects: '$(System.DefaultWorkingDirectory)/src/Covid19Radar.Background/Covid19Radar.Background.csproj' + arguments: '--configuration ${{ parameters.configuration }} --no-build --output $(System.DefaultWorkingDirectory)/publish_output/Background' + publishWebProjects: false + zipAfterPublish: false + modifyOutputPath: false - task: ArchiveFiles@2 displayName: 'Archive Api' inputs: - rootFolderOrFile: '$(System.DefaultWorkingDirectory)/src/Covid19Radar.Api/bin/Release/netcoreapp3.1/' + rootFolderOrFile: '$(System.DefaultWorkingDirectory)/publish_output/Api' includeRootFolder: false + archiveType: 'zip' archiveFile: '$(Build.ArtifactStagingDirectory)/Api.zip' + replaceExistingArchive: true - task: ArchiveFiles@2 displayName: 'Archive Background' inputs: - rootFolderOrFile: '$(System.DefaultWorkingDirectory)/src/Covid19Radar.Background/bin/Release/netcoreapp3.1/' + rootFolderOrFile: '$(System.DefaultWorkingDirectory)/publish_output/Background' includeRootFolder: false + archiveType: 'zip' archiveFile: '$(Build.ArtifactStagingDirectory)/Background.zip' - - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: drop' - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)' - ArtifactName: 'drop' + replaceExistingArchive: true + - publish: $(Build.ArtifactStagingDirectory) + artifact: drop - stage: deploy dependsOn: - build_and_unit_test From e380b70f89ae60d4bf0c0381b3956a49612d5bba Mon Sep 17 00:00:00 2001 From: cocoa-dev006 <93573337+cocoa-dev006@users.noreply.github.com> Date: Tue, 19 Apr 2022 11:25:10 +0900 Subject: [PATCH 2/5] Update azure-pipelines.yml for Azure Pipelines Fixed coverage related tasks --- azure-pipelines/server/azure-pipelines.yml | 25 ++++------------------ 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/azure-pipelines/server/azure-pipelines.yml b/azure-pipelines/server/azure-pipelines.yml index 703a83f06..4d903c694 100644 --- a/azure-pipelines/server/azure-pipelines.yml +++ b/azure-pipelines/server/azure-pipelines.yml @@ -43,11 +43,6 @@ stages: jobs: - job: steps: - - task: VisualStudioTestPlatformInstaller@1 - displayName: 'Visual Studio Test Platform Installer' - inputs: - versionSelector: specificVersion - testPlatformVersion: 17.1.0 - task: DotNetCoreCLI@2 displayName: 'dotnet restore' inputs: @@ -65,30 +60,18 @@ stages: inputs: command: test projects: '$(System.DefaultWorkingDirectory)/src/Covid19Radar.Api.Tests/*.Tests.csproj' - arguments: '--configuration ${{ parameters.configuration }} --logger trx --no-build --settings $(System.DefaultWorkingDirectory)/Covid19Radar.Functions.runsettings --collect:"XPlat Code Coverage"' + arguments: '--configuration ${{ parameters.configuration }} --logger trx --no-build --settings $(System.DefaultWorkingDirectory)/Covid19Radar.Functions.runsettings --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=json,cobertura,lcov,teamcity,opencover' - task: PublishTestResults@2 inputs: testResultsFormat: 'VSTest' testResultsFiles: '**/*.trx' mergeTestResults: true - - task: DotNetCoreCLI@2 - displayName: 'dotnet Install ReportGenerator tool' - inputs: - command: custom - custom: tool - arguments: 'install --tool-path . dotnet-reportgenerator-globaltool' - - task: BatchScript@1 - displayName: 'Create reports' - inputs: - filename: ./reportgenerator - arguments: '-reports:$(Agent.TempDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/coverlet/reports -reporttypes:"Cobertura"' - task: PublishCodeCoverageResults@1 - displayName: 'Publish code coverage from $(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml' + displayName: 'Publish code coverage from $(Agent.TempDirectory)\*\coverage.cobertura.xml' inputs: codeCoverageTool: Cobertura - summaryFileLocation: '$(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml' - pathToSources: '$(System.DefaultWorkingDirectory)' - reportDirectory: '$(Build.SourcesDirectory)/coverlet/reports/' + summaryFileLocation: '$(Agent.TempDirectory)\*\coverage.cobertura.xml' + reportDirectory: '$(Build.SourcesDirectory)\TestResults\Coverage\Reports' - task: DotNetCoreCLI@2 displayName: 'publish Api' inputs: From 1e0f3d1604face189d9ebff12aa6cc4313b685cc Mon Sep 17 00:00:00 2001 From: cocoa-dev006 <93573337+cocoa-dev006@users.noreply.github.com> Date: Tue, 19 Apr 2022 11:55:16 +0900 Subject: [PATCH 3/5] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines/server/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/server/azure-pipelines.yml b/azure-pipelines/server/azure-pipelines.yml index 4d903c694..86bbe42bb 100644 --- a/azure-pipelines/server/azure-pipelines.yml +++ b/azure-pipelines/server/azure-pipelines.yml @@ -60,7 +60,7 @@ stages: inputs: command: test projects: '$(System.DefaultWorkingDirectory)/src/Covid19Radar.Api.Tests/*.Tests.csproj' - arguments: '--configuration ${{ parameters.configuration }} --logger trx --no-build --settings $(System.DefaultWorkingDirectory)/Covid19Radar.Functions.runsettings --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=json,cobertura,lcov,teamcity,opencover' + arguments: '--configuration ${{ parameters.configuration }} --logger trx --no-build --settings $(System.DefaultWorkingDirectory)/Covid19Radar.Functions.runsettings --collect:"XPlat Code Coverage" --DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=json,cobertura,lcov,teamcity,opencover' - task: PublishTestResults@2 inputs: testResultsFormat: 'VSTest' From f11e33907152efe4c9f54cadad34b2dc305c2a9e Mon Sep 17 00:00:00 2001 From: cocoa-dev006 <93573337+cocoa-dev006@users.noreply.github.com> Date: Tue, 19 Apr 2022 12:02:37 +0900 Subject: [PATCH 4/5] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines/server/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/server/azure-pipelines.yml b/azure-pipelines/server/azure-pipelines.yml index 86bbe42bb..9d2b55370 100644 --- a/azure-pipelines/server/azure-pipelines.yml +++ b/azure-pipelines/server/azure-pipelines.yml @@ -60,7 +60,7 @@ stages: inputs: command: test projects: '$(System.DefaultWorkingDirectory)/src/Covid19Radar.Api.Tests/*.Tests.csproj' - arguments: '--configuration ${{ parameters.configuration }} --logger trx --no-build --settings $(System.DefaultWorkingDirectory)/Covid19Radar.Functions.runsettings --collect:"XPlat Code Coverage" --DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=json,cobertura,lcov,teamcity,opencover' + arguments: '--configuration ${{ parameters.configuration }} --logger trx --no-build --settings $(System.DefaultWorkingDirectory)/Covid19Radar.Functions.runsettings --collect:"XPlat Code Coverage"' - task: PublishTestResults@2 inputs: testResultsFormat: 'VSTest' From 90c0512384568f1e94fc189a1fcd6b080ecbd774 Mon Sep 17 00:00:00 2001 From: cocoa-dev006 <93573337+cocoa-dev006@users.noreply.github.com> Date: Wed, 20 Apr 2022 11:58:37 +0900 Subject: [PATCH 5/5] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines/server/azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines/server/azure-pipelines.yml b/azure-pipelines/server/azure-pipelines.yml index 9d2b55370..1a1994a95 100644 --- a/azure-pipelines/server/azure-pipelines.yml +++ b/azure-pipelines/server/azure-pipelines.yml @@ -67,11 +67,11 @@ stages: testResultsFiles: '**/*.trx' mergeTestResults: true - task: PublishCodeCoverageResults@1 - displayName: 'Publish code coverage from $(Agent.TempDirectory)\*\coverage.cobertura.xml' + displayName: 'Publish code coverage from $(Agent.TempDirectory)/*/coverage.cobertura.xml' inputs: codeCoverageTool: Cobertura - summaryFileLocation: '$(Agent.TempDirectory)\*\coverage.cobertura.xml' - reportDirectory: '$(Build.SourcesDirectory)\TestResults\Coverage\Reports' + summaryFileLocation: '$(Agent.TempDirectory)/*/coverage.cobertura.xml' + reportDirectory: '$(Build.SourcesDirectory)/TestResults/Coverage/Reports' - task: DotNetCoreCLI@2 displayName: 'publish Api' inputs: