Skip to content
This repository was archived by the owner on Apr 6, 2024. It is now read-only.

Commit a778685

Browse files
pascalbergerpascalberger
committed
Merge branch 'release/2.0.0'
2 parents c5b287b + ef8f1ff commit a778685

27 files changed

+273
-427
lines changed

‎.appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#---------------------------------#
22
# Build Image #
33
#---------------------------------#
4-
image: Visual Studio 2019
4+
image: Visual Studio 2022
55

66
#---------------------------------#
77
# Build Script #
@@ -11,7 +11,7 @@ install:
1111
- ps: nuget update -self
1212

1313
build_script:
14-
- ps: .\build.ps1 -Target AppVeyor
14+
- ps: .\build.ps1 --target=CI
1515

1616
# Tests
1717
test: off

‎.config/dotnet-tools.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"cake.tool": {
6+
"version": "1.3.0",
7+
"commands": [
8+
"dotnet-cake"
9+
]
10+
}
11+
}
12+
}

‎.github/dependabot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ updates:
99
ignore:
1010
- dependency-name: Cake.Core
1111
versions:
12-
- "> 1.0.0, < 2"
12+
- "(,3.0)"
1313
- dependency-name: Cake.Testing
1414
versions:
15-
- "> 1.0.0, < 2"
15+
- "(,3.0)"
1616
- dependency-name: Cake.Issues
1717
versions:
1818
- "> 1.0.0, < 2"

‎azure-pipelines.yml‎

Lines changed: 130 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,139 @@ pr:
1010
- hotfix/*
1111

1212
jobs:
13-
- job: Windows
13+
# Build
14+
- job: Build
1415
pool:
15-
vmImage: 'vs2017-win2016'
16+
vmImage: 'windows-2022'
1617
steps:
17-
- powershell: |
18-
$ENV:CAKE_SKIP_GITVERSION=([string]::IsNullOrEmpty($ENV:SYSTEM_PULLREQUEST_PULLREQUESTID) -eq $False).ToString()
19-
.\build.ps1 -target Buildserver
20-
exit $LASTEXITCODE
21-
displayName: 'Cake Build'
22-
- job: macOS
18+
- powershell: ./build.ps1
19+
displayName: 'Build'
20+
- publish: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
21+
artifact: NuGet Package
22+
displayName: 'Publish NuGet package as build artifact'
23+
# Integration Tests Windows Server 2019 (.NET Core tool)
24+
- job: Test_Windows_2019_DotNetCoreTool
25+
displayName: Integration Tests Windows Server 2019 (.NET Core tool)
26+
dependsOn: Build
2327
pool:
24-
vmImage: 'macOS-10.14'
28+
vmImage: 'windows-2019'
2529
steps:
26-
# To manually select a Xamarin SDK version on the Hosted macOS agent, enable this script with the SDK version you want to target
27-
# https://go.microsoft.com/fwlink/?linkid=871629
28-
- bash: |
29-
sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh 5_18_1
30-
displayName: 'Select Mono 5.18.1'
31-
- bash: |
32-
./build.sh --target Buildserver
33-
displayName: 'Cake Build'
34-
- job: Ubuntu
30+
- download: current
31+
artifact: NuGet Package
32+
displayName: 'Download build artifact'
33+
- task: CopyFiles@2
34+
inputs:
35+
sourceFolder: $(Pipeline.Workspace)/NuGet Package
36+
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
37+
displayName: 'Copy build artifact for test run'
38+
- powershell: ./build.ps1
39+
workingDirectory: ./tests/script-runner/
40+
displayName: 'Run integration tests'
41+
- publish: $(Build.SourcesDirectory)/BuildArtifacts/TestResults/Integration
42+
artifact: Integration Tests Windows Server 2019 (.NET Core tool)
43+
displayName: 'Publish generated reports as build artifact'
44+
# Integration Tests Windows Server 2022 (.NET Core tool)
45+
- job: Test_Windows_2022_DotNetCoreTool
46+
displayName: Integration Tests Windows Server 2022 (.NET Core tool)
47+
dependsOn: Build
3548
pool:
36-
vmImage: 'ubuntu-16.04'
49+
vmImage: 'windows-2022'
3750
steps:
38-
# Use Mono 6.6.0 until Cake.Recipe is compatible with Cake 0.37.0 which fixes this issue
39-
- bash: |
40-
sudo apt-get remove mono-complete mono-devel mono-gac mono-runtime-common monodoc-manual \
41-
&& sudo apt-get autoremove \
42-
&& echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial/snapshots/6.6.0.161 main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list \
43-
&& sudo apt-get update \
44-
&& sudo apt-get install -y --no-install-recommends mono-complete \
45-
&& mono --version
46-
displayName: 'Downgrade Mono to 6.6.0'
47-
- bash: |
48-
./build.sh --verbosity diagnostic
49-
displayName: 'Cake Build'
51+
- download: current
52+
artifact: NuGet Package
53+
displayName: 'Download build artifact'
54+
- task: CopyFiles@2
55+
inputs:
56+
sourceFolder: $(Pipeline.Workspace)/NuGet Package
57+
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
58+
displayName: 'Copy build artifact for test run'
59+
- powershell: ./build.ps1
60+
workingDirectory: ./tests/script-runner/
61+
displayName: 'Run integration tests'
62+
- publish: $(Build.SourcesDirectory)/BuildArtifacts/TestResults/Integration
63+
artifact: Integration Tests Windows Server 2022 (.NET Core tool)
64+
displayName: 'Publish generated reports as build artifact'
65+
# Integration Tests macOS 11 (.NET Core tool)
66+
- job: Test_macOS_11_DotNetCoreTool
67+
displayName: Integration Tests macOS 11 (.NET Core tool)
68+
dependsOn: Build
69+
pool:
70+
vmImage: 'macOS-11'
71+
steps:
72+
- download: current
73+
artifact: NuGet Package
74+
displayName: 'Download build artifact'
75+
- task: CopyFiles@2
76+
inputs:
77+
sourceFolder: $(Pipeline.Workspace)/NuGet Package
78+
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
79+
displayName: 'Copy build artifact for test run'
80+
- bash: ./build.sh
81+
workingDirectory: ./tests/script-runner/
82+
displayName: 'Run integration tests'
83+
- publish: $(Build.SourcesDirectory)/BuildArtifacts/TestResults/Integration
84+
artifact: Integration Tests macOS 11 (.NET Core tool)
85+
displayName: 'Publish generated reports as build artifact'
86+
# Integration Tests macOS 12 (.NET Core tool)
87+
- job: Test_macOS_12_DotNetCoreTool
88+
displayName: Integration Tests macOS 12 (.NET Core tool)
89+
dependsOn: Build
90+
pool:
91+
vmImage: 'macOS-12'
92+
steps:
93+
- download: current
94+
artifact: NuGet Package
95+
displayName: 'Download build artifact'
96+
- task: CopyFiles@2
97+
inputs:
98+
sourceFolder: $(Pipeline.Workspace)/NuGet Package
99+
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
100+
displayName: 'Copy build artifact for test run'
101+
- bash: ./build.sh
102+
workingDirectory: ./tests/script-runner/
103+
displayName: 'Run integration tests'
104+
- publish: $(Build.SourcesDirectory)/BuildArtifacts/TestResults/Integration
105+
artifact: Integration Tests macOS 12 (.NET Core tool)
106+
displayName: 'Publish generated reports as build artifact'
107+
# Integration Tests Ubuntu 18.04 (.NET Core tool)
108+
- job: Test_Ubuntu_18_04_DotNetCoreTool
109+
displayName: Integration Tests Ubuntu 18.04 (.NET Core tool)
110+
dependsOn: Build
111+
pool:
112+
vmImage: 'ubuntu-18.04'
113+
steps:
114+
- download: current
115+
artifact: NuGet Package
116+
displayName: 'Download build artifact'
117+
- task: CopyFiles@2
118+
inputs:
119+
sourceFolder: $(Pipeline.Workspace)/NuGet Package
120+
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
121+
displayName: 'Copy build artifact for test run'
122+
- bash: ./build.sh
123+
workingDirectory: ./tests/script-runner/
124+
displayName: 'Run integration tests'
125+
- publish: $(Build.SourcesDirectory)/BuildArtifacts/TestResults/Integration
126+
artifact: Integration Tests Ubuntu 18.04 (.NET Core tool)
127+
displayName: 'Publish generated reports as build artifact'
128+
# Integration Tests Ubuntu 20.04 (.NET Core tool)
129+
- job: Test_Ubuntu_20_04_DotNetCoreTool
130+
displayName: Integration Tests Ubuntu 20.04 (.NET Core tool)
131+
dependsOn: Build
132+
pool:
133+
vmImage: 'ubuntu-20.04'
134+
steps:
135+
- download: current
136+
artifact: NuGet Package
137+
displayName: 'Download build artifact'
138+
- task: CopyFiles@2
139+
inputs:
140+
sourceFolder: $(Pipeline.Workspace)/NuGet Package
141+
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
142+
displayName: 'Copy build artifact for test run'
143+
- bash: ./build.sh
144+
workingDirectory: ./tests/script-runner/
145+
displayName: 'Run integration tests'
146+
- publish: $(Build.SourcesDirectory)/BuildArtifacts/TestResults/Integration
147+
artifact: Integration Tests Ubuntu 20.04 (.NET Core tool)
148+
displayName: 'Publish generated reports as build artifact'

0 commit comments

Comments
 (0)