From 865d3e8a8dd3e1bfc53f8ebfd44956d6ccb95b41 Mon Sep 17 00:00:00 2001 From: manandre <2341261+manandre@users.noreply.github.com> Date: Fri, 23 Aug 2019 15:38:38 +0200 Subject: [PATCH 1/5] Use version variable --- FollowingFileStream/FollowingFileStream.csproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/FollowingFileStream/FollowingFileStream.csproj b/FollowingFileStream/FollowingFileStream.csproj index 9e9eaae..57ba108 100644 --- a/FollowingFileStream/FollowingFileStream.csproj +++ b/FollowingFileStream/FollowingFileStream.csproj @@ -6,12 +6,10 @@ FollowingFileStream Emmanuel André + $(Version) LICENSE - - - \ No newline at end of file From dcea887d71e3f779889d7f7020239ddfd86d6b74 Mon Sep 17 00:00:00 2001 From: manandre <2341261+manandre@users.noreply.github.com> Date: Fri, 23 Aug 2019 15:53:34 +0200 Subject: [PATCH 2/5] Update azure-pipelines.yml for GitVersion tasks --- azure-pipelines.yml | 57 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3b46e6c..05cf96f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,6 +21,7 @@ steps: inputs: runtime: 'core' - task: SonarCloudPrepare@1 + displayName: Restore inputs: SonarCloud: 'SonarCloud' organization: 'manandre' @@ -29,14 +30,44 @@ steps: projectVersion: '$(Build.BuildId)' extraProperties: 'sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/coverage/coverage.opencover.xml' -- script: dotnet restore ./All.sln /p:Version=$(GitVersion.NuGetVersion) - displayName: Restore +# - script: dotnet restore ./All.sln /p:Version=$(GitVersion.NuGetVersion) +# displayName: Restore + +- task: DotNetCoreCLI@2 + inputs: + command: 'restore' + projects: 'All.sln' + feedsToUse: 'select' + versioningScheme: byBuildNumber + +# - script: dotnet build ./All.sln --no-restore --configuration $(buildConfiguration) /p:Version=$(GitVersion.NuGetVersion) +# displayName: Build -- script: dotnet build ./All.sln --no-restore --configuration $(buildConfiguration) /p:Version=$(GitVersion.NuGetVersion) +- task: DotNetCoreCLI@2 displayName: Build + inputs: + command: 'build' + projects: 'All.sln' + arguments: '--configuration $(BuildConfiguration) /p:Version=$(GitVersion.NuGetVersion)' + versioningScheme: byBuildNumber -- script: dotnet test ./Tests.sln --no-build --configuration $(buildConfiguration) --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=$(Build.SourcesDirectory)/coverage/ +# - script: dotnet test ./Tests.sln --no-build --configuration $(buildConfiguration) --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=$(Build.SourcesDirectory)/coverage/ +# displayName: Test + +- task: DotNetCoreCLI@2 displayName: Test + inputs: + command: 'test' + projects: 'Test.sln' + arguments: '--configuration $(buildConfiguration) --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=$(Build.SourcesDirectory)/coverage/' + publishTestResults: false + +- task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + inputs: + testRunner: VSTest + testResultsFiles: '**/*.trx' - script: | dotnet tool install dotnet-reportgenerator-globaltool --tool-path . @@ -50,13 +81,6 @@ steps: condition: eq( variables['Agent.OS'], 'Windows_NT' ) displayName: Run Reportgenerator on Windows -- task: PublishTestResults@2 - displayName: Publish Test Results - condition: succeededOrFailed() - inputs: - testRunner: VSTest - testResultsFiles: '**/*.trx' - - task: PublishCodeCoverageResults@1 inputs: codeCoverageTool: 'Cobertura' @@ -68,8 +92,17 @@ steps: inputs: pollingTimeoutSec: '300' -- script: dotnet pack ./All.sln --configuration $(buildConfiguration) --no-build -o $(Build.ArtifactStagingDirectory) +# - script: dotnet pack ./All.sln --configuration $(buildConfiguration) --no-build -o $(Build.ArtifactStagingDirectory) +# displayName: Pack + +- task: DotNetCoreCLI@2 displayName: Pack + inputs: + command: 'pack' + packagesToPack: 'All.sln' + nobuild: true + versioningScheme: 'byEnvVar' + versionEnvVar: 'GitVersion.NuGetVersion' - task: PublishBuildArtifacts@1 inputs: From 05cba0b1ed8b0fa61f0f1044c541944f362c2479 Mon Sep 17 00:00:00 2001 From: manandre <2341261+manandre@users.noreply.github.com> Date: Fri, 23 Aug 2019 16:00:00 +0200 Subject: [PATCH 3/5] Update azure-pipelines.yml for csproj paths --- azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 05cf96f..8b1248f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,7 +21,6 @@ steps: inputs: runtime: 'core' - task: SonarCloudPrepare@1 - displayName: Restore inputs: SonarCloud: 'SonarCloud' organization: 'manandre' @@ -34,9 +33,10 @@ steps: # displayName: Restore - task: DotNetCoreCLI@2 + displayName: Restore inputs: command: 'restore' - projects: 'All.sln' + projects: '**/*.csproj' feedsToUse: 'select' versioningScheme: byBuildNumber @@ -47,7 +47,7 @@ steps: displayName: Build inputs: command: 'build' - projects: 'All.sln' + projects: '**/*.csproj' arguments: '--configuration $(BuildConfiguration) /p:Version=$(GitVersion.NuGetVersion)' versioningScheme: byBuildNumber @@ -58,7 +58,7 @@ steps: displayName: Test inputs: command: 'test' - projects: 'Test.sln' + projects: '**/*.Tests.csproj' arguments: '--configuration $(buildConfiguration) --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=$(Build.SourcesDirectory)/coverage/' publishTestResults: false @@ -99,7 +99,7 @@ steps: displayName: Pack inputs: command: 'pack' - packagesToPack: 'All.sln' + packagesToPack: '**/*.csproj' nobuild: true versioningScheme: 'byEnvVar' versionEnvVar: 'GitVersion.NuGetVersion' From d131d461998ef05f7c9b689b59f26d3a6258cb28 Mon Sep 17 00:00:00 2001 From: manandre <2341261+manandre@users.noreply.github.com> Date: Fri, 23 Aug 2019 16:04:49 +0200 Subject: [PATCH 4/5] Update azure-pipelines.yml for All.sln --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8b1248f..59e627a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -47,7 +47,7 @@ steps: displayName: Build inputs: command: 'build' - projects: '**/*.csproj' + projects: 'All.sln' arguments: '--configuration $(BuildConfiguration) /p:Version=$(GitVersion.NuGetVersion)' versioningScheme: byBuildNumber From da8533369cc1929d64e3090d364ac318fef0358f Mon Sep 17 00:00:00 2001 From: manandre <2341261+manandre@users.noreply.github.com> Date: Fri, 23 Aug 2019 16:42:58 +0200 Subject: [PATCH 5/5] Update azure-pipelines.yml for cleanup --- azure-pipelines.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 59e627a..df6a64e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,10 +12,6 @@ pool: variables: buildConfiguration: 'Release' -# steps: -# - script: dotnet build --configuration $(buildConfiguration) -# displayName: 'dotnet build $(buildConfiguration)' - steps: - task: GitVersion@5 inputs: @@ -29,9 +25,6 @@ steps: projectVersion: '$(Build.BuildId)' extraProperties: 'sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/coverage/coverage.opencover.xml' -# - script: dotnet restore ./All.sln /p:Version=$(GitVersion.NuGetVersion) -# displayName: Restore - - task: DotNetCoreCLI@2 displayName: Restore inputs: @@ -40,20 +33,14 @@ steps: feedsToUse: 'select' versioningScheme: byBuildNumber -# - script: dotnet build ./All.sln --no-restore --configuration $(buildConfiguration) /p:Version=$(GitVersion.NuGetVersion) -# displayName: Build - - task: DotNetCoreCLI@2 displayName: Build inputs: command: 'build' - projects: 'All.sln' + projects: 'All.sln' # Mandatory for SonarQube !?! arguments: '--configuration $(BuildConfiguration) /p:Version=$(GitVersion.NuGetVersion)' versioningScheme: byBuildNumber -# - script: dotnet test ./Tests.sln --no-build --configuration $(buildConfiguration) --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=$(Build.SourcesDirectory)/coverage/ -# displayName: Test - - task: DotNetCoreCLI@2 displayName: Test inputs: @@ -92,9 +79,6 @@ steps: inputs: pollingTimeoutSec: '300' -# - script: dotnet pack ./All.sln --configuration $(buildConfiguration) --no-build -o $(Build.ArtifactStagingDirectory) -# displayName: Pack - - task: DotNetCoreCLI@2 displayName: Pack inputs: