Skip to content

Commit 4fc1524

Browse files
authored
Merge pull request #6 from manandre:gitversion
More efficient way to handle versionning Thanks!
2 parents 628f3a9 + da85333 commit 4fc1524

File tree

2 files changed

+33
-18
lines changed

2 files changed

+33
-18
lines changed

FollowingFileStream/FollowingFileStream.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
<PropertyGroup>
77
<PackageId>FollowingFileStream</PackageId>
88
<Authors>Emmanuel André</Authors>
9+
<Version>$(Version)</Version>
910
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1011
</PropertyGroup>
1112
<ItemGroup>
1213
<None Include="../LICENSE" Pack="true" PackagePath="."/>
1314
</ItemGroup>
14-
<ItemGroup>
15-
<PackageReference Include="GitVersionTask" Version="5.0.1"/>
16-
</ItemGroup>
1715
</Project>

azure-pipelines.yml

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ pool:
1212
variables:
1313
buildConfiguration: 'Release'
1414

15-
# steps:
16-
# - script: dotnet build --configuration $(buildConfiguration)
17-
# displayName: 'dotnet build $(buildConfiguration)'
18-
1915
steps:
2016
- task: GitVersion@5
2117
inputs:
@@ -29,14 +25,36 @@ steps:
2925
projectVersion: '$(Build.BuildId)'
3026
extraProperties: 'sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/coverage/coverage.opencover.xml'
3127

32-
- script: dotnet restore ./All.sln /p:Version=$(GitVersion.NuGetVersion)
28+
- task: DotNetCoreCLI@2
3329
displayName: Restore
30+
inputs:
31+
command: 'restore'
32+
projects: '**/*.csproj'
33+
feedsToUse: 'select'
34+
versioningScheme: byBuildNumber
3435

35-
- script: dotnet build ./All.sln --no-restore --configuration $(buildConfiguration) /p:Version=$(GitVersion.NuGetVersion)
36+
- task: DotNetCoreCLI@2
3637
displayName: Build
38+
inputs:
39+
command: 'build'
40+
projects: 'All.sln' # Mandatory for SonarQube !?!
41+
arguments: '--configuration $(BuildConfiguration) /p:Version=$(GitVersion.NuGetVersion)'
42+
versioningScheme: byBuildNumber
3743

38-
- script: dotnet test ./Tests.sln --no-build --configuration $(buildConfiguration) --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=$(Build.SourcesDirectory)/coverage/
44+
- task: DotNetCoreCLI@2
3945
displayName: Test
46+
inputs:
47+
command: 'test'
48+
projects: '**/*.Tests.csproj'
49+
arguments: '--configuration $(buildConfiguration) --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=$(Build.SourcesDirectory)/coverage/'
50+
publishTestResults: false
51+
52+
- task: PublishTestResults@2
53+
displayName: Publish Test Results
54+
condition: succeededOrFailed()
55+
inputs:
56+
testRunner: VSTest
57+
testResultsFiles: '**/*.trx'
4058

4159
- script: |
4260
dotnet tool install dotnet-reportgenerator-globaltool --tool-path .
@@ -50,13 +68,6 @@ steps:
5068
condition: eq( variables['Agent.OS'], 'Windows_NT' )
5169
displayName: Run Reportgenerator on Windows
5270

53-
- task: PublishTestResults@2
54-
displayName: Publish Test Results
55-
condition: succeededOrFailed()
56-
inputs:
57-
testRunner: VSTest
58-
testResultsFiles: '**/*.trx'
59-
6071
- task: PublishCodeCoverageResults@1
6172
inputs:
6273
codeCoverageTool: 'Cobertura'
@@ -68,8 +79,14 @@ steps:
6879
inputs:
6980
pollingTimeoutSec: '300'
7081

71-
- script: dotnet pack ./All.sln --configuration $(buildConfiguration) --no-build -o $(Build.ArtifactStagingDirectory)
82+
- task: DotNetCoreCLI@2
7283
displayName: Pack
84+
inputs:
85+
command: 'pack'
86+
packagesToPack: '**/*.csproj'
87+
nobuild: true
88+
versioningScheme: 'byEnvVar'
89+
versionEnvVar: 'GitVersion.NuGetVersion'
7390

7491
- task: PublishBuildArtifacts@1
7592
inputs:

0 commit comments

Comments
 (0)