Skip to content

Commit a46482a

Browse files
david-driscolldavid-driscoll
authored
Updated pipeline (#222)
* Updated pipeline * removed release automation * removed release automation * removed release automation * codecov * Updated tools * Updated dependencies and fixed coverage report
1 parent b1baad4 commit a46482a

File tree

5 files changed

+159
-191
lines changed

5 files changed

+159
-191
lines changed

‎.azure-pipelines.yml

+98-37
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,106 @@
11
trigger:
2-
branches:
3-
include:
4-
- master
5-
- refs/tags/*
2+
batch: true
3+
branches:
4+
include:
5+
- master
6+
- refs/tags/*
7+
paths:
8+
exclude:
9+
- '**/*.md'
10+
- '.appveyor.yml'
11+
- '.codecov.yml'
12+
- 'GitVersion.yml'
13+
- 'GitReleaseManager.yaml'
14+
- .vscode/*
15+
- .git*
16+
- .editorconfig
17+
- .nuke
18+
- LICENSE
19+
620
pr:
7-
autoCancel: true
8-
branches:
9-
include:
10-
- master
21+
autoCancel: true
22+
branches:
23+
include:
24+
- master
1125

1226
resources:
13-
repositories:
14-
- repository: rsg
15-
type: github
16-
name: RocketSurgeonsGuild/AzureDevopsTemplates
17-
# ref: refs/tags/v0.12.0
18-
endpoint: github
27+
repositories:
28+
- repository: rsg
29+
type: github
30+
name: RocketSurgeonsGuild/AzureDevopsTemplates
31+
ref: refs/tags/v0.12.0
32+
endpoint: github
1933

2034
variables:
21-
Configuration: Release
22-
Verbosity: Normal
23-
Coverage: "$(Agent.BuildDirectory)/c"
24-
VstsCoverage: "$(Coverage)"
25-
Artifacts: $(Build.ArtifactStagingDirectory)
26-
VstsArtifacts: "$(Artifacts)"
27-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
35+
- name: CONFIGURATION
36+
value: Release
37+
- name: VERBOSITY
38+
value: Normal
39+
- name: COVERAGE
40+
value: '$(Agent.BuildDirectory)/c'
41+
- name: ARTIFACTS
42+
value: $(Build.ArtifactStagingDirectory)
43+
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
44+
value: 'true'
45+
- name: CodeCovToken
46+
value: 'd122bf99-4ca6-4a7c-a7ff-90468bcc7703'
47+
# Fixes the github package repo warnings on restore
48+
- name: EmitAssetsLogMessages
49+
value: false
50+
- name: HideWarningsAndErrors
51+
value: true
2852

2953
jobs:
30-
- template: pipeline/cake.yml@rsg
31-
parameters:
32-
dependsOn: GitVersion
33-
Configuration: $(Configuration)
34-
Verbosity: $(Verbosity)
35-
Script: build.cake
36-
EnableReleaseNotes: false
37-
Matrix:
38-
Windows:
39-
BuildName: "Windows"
40-
ImageName: "windows-latest"
41-
ScriptName: build.ps1
42-
Linux:
43-
BuildName: "Linux"
44-
ImageName: "ubuntu-latest"
45-
ScriptName: build.sh
54+
- template: jobs/gitversion.yml@rsg
55+
56+
- job: Build
57+
strategy:
58+
matrix:
59+
Windows:
60+
BuildName: 'Windows'
61+
ImageName: 'windows-latest'
62+
Linux:
63+
BuildName: 'Linux'
64+
ImageName: 'ubuntu-latest'
65+
macOS:
66+
BuildName: 'macOS'
67+
ImageName: 'macOS-latest'
68+
pool:
69+
vmImage: $(ImageName)
70+
steps:
71+
- template: support/mono.yml@rsg
72+
- template: support/install-dotnet.yml@rsg
73+
parameters:
74+
DotNetSdk:
75+
- '2.x'
76+
- '3.x'
77+
- template: support/gitversion-hack.yml@rsg
78+
79+
- task: DotNetCoreCLI@2
80+
displayName: 'dotnet tool restore'
81+
inputs:
82+
command: custom
83+
custom: tool
84+
arguments: 'restore'
85+
86+
- task: DotNetCoreCLI@2
87+
displayName: 'dotnet restore'
88+
inputs:
89+
command: restore
90+
feedsToUse: config
91+
nugetConfigPath: NuGet.config
92+
verbosityRestore: Minimal
93+
94+
- template: ./azure-pipelines.nuke.yml
95+
parameters:
96+
Artifacts: $(Artifacts)
97+
Configuration: $(Configuration)
98+
Coverage: $(Coverage)
99+
100+
- template: support/publish-artifacts.yml@rsg
101+
parameters:
102+
Artifacts: $(Artifacts)
103+
Configuration: $(Configuration)
104+
Coverage: $(Coverage)
105+
Postfix: ' - $(BuildName)'
106+
PublishVSTest: true

‎.config/dotnet-tools.json

+25-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
]
1010
},
1111
"gitversion.tool": {
12-
"version": "5.0.1",
12+
"version": "5.2.4",
1313
"commands": [
1414
"dotnet-gitversion"
1515
]
@@ -19,6 +19,30 @@
1919
"commands": [
2020
"reportgenerator"
2121
]
22+
},
23+
"codecov.tool": {
24+
"version": "1.10.0",
25+
"commands": [
26+
"codecov"
27+
]
28+
},
29+
"gitreleasemanager.tool": {
30+
"version": "0.11.0",
31+
"commands": [
32+
"dotnet-gitreleasemanager"
33+
]
34+
},
35+
"nuke.globaltool": {
36+
"version": "0.24.4",
37+
"commands": [
38+
"nuke"
39+
]
40+
},
41+
"nukeeper": {
42+
"version": "0.26.1",
43+
"commands": [
44+
"nukeeper"
45+
]
2246
}
2347
}
2448
}

‎Directory.Build.targets

+35-32
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project>
2-
<ItemGroup>
3-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
4-
</ItemGroup>
5-
<ItemGroup>
6-
<PackageReference Update="GitVersion.Tool" Version="5.1.3" />
7-
<PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2019.3.4" />
8-
<PackageReference Update="Nuke.Common" Version="0.24.4" />
9-
<PackageReference Update="ReportGenerator" Version="4.5.0" />
10-
<PackageReference Update="Rocket.Surgery.Nuke.DotNetCore" Version="0.13.4" />
11-
</ItemGroup>
12-
<ItemGroup>
13-
<PackageReference Update="Microsoft.Extensions.Logging" Version="2.0.0" />
14-
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
15-
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
16-
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
17-
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
18-
<PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
19-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.9.0" />
20-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
21-
<PackageReference Update="xunit" Version="2.4.1" />
22-
<PackageReference Update="FluentAssertions" Version="5.6.0" />
23-
<PackageReference Update="NSubstitute" Version="3.1.0" />
24-
<PackageReference Update="Autofac" Version="4.8.1" />
25-
<PackageReference Update="Autofac.Extensions.DependencyInjection" Version="4.3.1" />
26-
<PackageReference Update="Serilog.Extensions.Logging" Version="2.0.2" />
27-
<PackageReference Update="Serilog.Sinks.XUnit" Version="1.0.7" />
28-
<PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
29-
<PackageReference Update="coverlet.msbuild" Version="2.5.1" />
30-
<PackageReference Update="System.Reactive" Version="4.1.2" />
31-
<PackageReference Update="MediatR" Version="7.0.0" />
32-
<PackageReference Update="MediatR.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
33-
</ItemGroup>
3+
<ItemGroup>
4+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
5+
<PackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="0.3.1" PrivateAssets="All" />
6+
</ItemGroup>
7+
<ItemGroup>
8+
<PackageReference Update="GitVersion.Tool" Version="5.2.4" />
9+
<PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2019.3.4" />
10+
<PackageReference Update="Nuke.Common" Version="0.24.4" />
11+
<PackageReference Update="ReportGenerator" Version="4.5.2" />
12+
<PackageReference Update="Rocket.Surgery.Nuke.DotNetCore" Version="0.13.4" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<PackageReference Update="Microsoft.Extensions.Logging" Version="2.0.0" />
16+
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
17+
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
18+
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
19+
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
20+
<PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
21+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
22+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
23+
<PackageReference Update="xunit" Version="2.4.1" />
24+
<PackageReference Update="FluentAssertions" Version="5.10.2" />
25+
<PackageReference Update="NSubstitute" Version="4.2.1" />
26+
<PackageReference Update="Autofac" Version="4.8.1" />
27+
<PackageReference Update="Autofac.Extensions.DependencyInjection" Version="4.3.1" />
28+
<PackageReference Update="Serilog.Extensions.Logging" Version="2.0.2" />
29+
<PackageReference Update="Serilog.Sinks.XUnit" Version="1.0.21" />
30+
<PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
31+
<PackageReference Update="coverlet.collector" Version="1.2.0" />
32+
<PackageReference Update="coverlet.msbuild" Version="2.8.0" />
33+
<PackageReference Update="System.Reactive" Version="4.3.2" />
34+
<PackageReference Update="MediatR" Version="8.0.1" />
35+
<PackageReference Update="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.0" />
36+
</ItemGroup>
3437
</Project>

‎azure-pipelines.yml

-121
This file was deleted.

‎test/Directory.Build.targets

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<PackageReference Include="Serilog.Extensions.Logging" />
1313
<PackageReference Include="Serilog.Sinks.XUnit" />
1414
<PackageReference Include="XunitXml.TestLogger" />
15+
<PackageReference Include="coverlet.collector" />
1516
<PackageReference Include="coverlet.msbuild" />
1617
</ItemGroup>
1718
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />

0 commit comments

Comments
 (0)