Skip to content

Commit 158b3cb

Browse files
pascalbergerpascalberger
committed
Merge branch 'release/3.0.0'
2 parents 1371b5e + 9020226 commit 158b3cb

File tree

112 files changed

+1309
-1562
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1309
-1562
lines changed

‎README.md‎

Lines changed: 6 additions & 12 deletions
Large diffs are not rendered by default.

‎azure-pipelines.yml‎

Lines changed: 62 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ jobs:
1616
pool:
1717
vmImage: 'windows-2022'
1818
steps:
19+
- task: UseDotNet@2
20+
inputs:
21+
version: '7.x'
22+
- task: UseDotNet@2
23+
inputs:
24+
version: '6.x'
25+
# .NET 5 required for GitVersion
26+
- task: UseDotNet@2
27+
inputs:
28+
version: '5.x'
1929
- powershell: |
2030
$ENV:CAKE_SKIP_GITVERSION=([string]::IsNullOrEmpty($ENV:SYSTEM_PULLREQUEST_PULLREQUESTID) -eq $False).ToString()
2131
.\build.ps1
@@ -33,13 +43,14 @@ jobs:
3343
steps:
3444
- task: UseDotNet@2
3545
inputs:
36-
version: '6.x'
46+
version: '7.x'
3747
- task: UseDotNet@2
3848
inputs:
39-
version: '5.x'
49+
version: '6.x'
50+
# .NET 5 required for GitVersion
4051
- task: UseDotNet@2
4152
inputs:
42-
version: '3.x'
53+
version: '5.x'
4354
- bash: |
4455
./build.sh
4556
displayName: 'Cake Build'
@@ -55,68 +66,27 @@ jobs:
5566
steps:
5667
- task: UseDotNet@2
5768
inputs:
58-
version: '6.x'
69+
version: '7.x'
5970
- task: UseDotNet@2
6071
inputs:
61-
version: '5.x'
72+
version: '6.x'
73+
# .NET 5 required for GitVersion
6274
- task: UseDotNet@2
6375
inputs:
64-
version: '3.x'
76+
version: '5.x'
6577
- bash: |
6678
./build.sh --verbosity=diagnostic
6779
displayName: 'Cake Build'
6880
- publish: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
6981
artifact: NuGet Package Ubuntu
7082
displayName: 'Publish NuGet package as build artifact'
7183

72-
# Integration Tests Frosting Windows (.NET Core 3.1)
73-
- job: Test_Frosting_Windows_NetCoreApp31
74-
displayName: Integration Tests Frosting Windows (.NET Core 3.1)
75-
dependsOn: Build_Windows
76-
pool:
77-
vmImage: 'windows-2019'
78-
steps:
79-
- download: current
80-
artifact: NuGet Package Windows
81-
displayName: 'Download build artifact'
82-
- task: CopyFiles@2
83-
inputs:
84-
sourceFolder: $(Pipeline.Workspace)/NuGet Package Windows
85-
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
86-
displayName: 'Copy build artifact for test run'
87-
- powershell: ./build.ps1 --verbosity=diagnostic
88-
workingDirectory: ./tests/frosting/netcoreapp3.1
89-
displayName: 'Run integration tests'
90-
env:
91-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
92-
93-
# Integration Tests Frosting Windows (.NET 5)
94-
- job: Test_Frosting_Windows_Net5
95-
displayName: Integration Tests Frosting Windows (.NET 5)
96-
dependsOn: Build_Windows
97-
pool:
98-
vmImage: 'windows-2019'
99-
steps:
100-
- download: current
101-
artifact: NuGet Package Windows
102-
displayName: 'Download build artifact'
103-
- task: CopyFiles@2
104-
inputs:
105-
sourceFolder: $(Pipeline.Workspace)/NuGet Package Windows
106-
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
107-
displayName: 'Copy build artifact for test run'
108-
- powershell: ./build.ps1 --verbosity=diagnostic
109-
workingDirectory: ./tests/frosting/net5.0
110-
displayName: 'Run integration tests'
111-
env:
112-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
113-
11484
# Integration Tests Frosting Windows (.NET 6)
115-
- job: Test_Frosting_Windows_Net6
85+
- job: Test_Frosting_Windows_Net5
11686
displayName: Integration Tests Frosting Windows (.NET 6)
11787
dependsOn: Build_Windows
11888
pool:
119-
vmImage: 'windows-2022'
89+
vmImage: 'windows-2019'
12090
steps:
12191
- download: current
12292
artifact: NuGet Package Windows
@@ -132,12 +102,12 @@ jobs:
132102
env:
133103
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
134104

135-
# Integration Tests Script Runner Windows (.NET Core 3.1)
136-
- job: Test_Script_Runner_Windows_NetCoreApp31
137-
displayName: Integration Tests Script Runner Windows (.NET Core 3.1)
105+
# Integration Tests Frosting Windows (.NET 7)
106+
- job: Test_Frosting_Windows_Net7
107+
displayName: Integration Tests Frosting Windows (.NET 7)
138108
dependsOn: Build_Windows
139109
pool:
140-
vmImage: 'windows-2019'
110+
vmImage: 'windows-2022'
141111
steps:
142112
- download: current
143113
artifact: NuGet Package Windows
@@ -148,14 +118,14 @@ jobs:
148118
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
149119
displayName: 'Copy build artifact for test run'
150120
- powershell: ./build.ps1 --verbosity=diagnostic
151-
workingDirectory: ./tests/script-runner/netcoreapp3.1
121+
workingDirectory: ./tests/frosting/net7.0
152122
displayName: 'Run integration tests'
153123
env:
154124
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
155125

156-
# Integration Tests Script Runner Windows (.NET 5)
157-
- job: Test_Script_Runner_Windows_Net5
158-
displayName: Integration Tests Script Runner Windows (.NET 5)
126+
# Integration Tests Script Runner Windows (.NET 6)
127+
- job: Test_Script_Runner_Windows_Net6
128+
displayName: Integration Tests Script Runner Windows (.NET 6)
159129
dependsOn: Build_Windows
160130
pool:
161131
vmImage: 'windows-2019'
@@ -169,14 +139,14 @@ jobs:
169139
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
170140
displayName: 'Copy build artifact for test run'
171141
- powershell: ./build.ps1 --verbosity=diagnostic
172-
workingDirectory: ./tests/script-runner/net5.0
142+
workingDirectory: ./tests/script-runner/net6.0
173143
displayName: 'Run integration tests'
174144
env:
175145
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
176146

177-
# Integration Tests Script Runner Windows (.NET 6)
178-
- job: Test_Script_Runner_Windows_Net6
179-
displayName: Integration Tests Script Runner Windows (.NET 6)
147+
# Integration Tests Script Runner Windows (.NET 7)
148+
- job: Test_Script_Runner_Windows_Net7
149+
displayName: Integration Tests Script Runner Windows (.NET 7)
180150
dependsOn: Build_Windows
181151
pool:
182152
vmImage: 'windows-2022'
@@ -190,55 +160,7 @@ jobs:
190160
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
191161
displayName: 'Copy build artifact for test run'
192162
- powershell: ./build.ps1 --verbosity=diagnostic
193-
workingDirectory: ./tests/script-runner/net6.0
194-
displayName: 'Run integration tests'
195-
env:
196-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
197-
198-
# Integration Tests Frosting macOS (.NET Core 3.1)
199-
- job: Test_Frosting_macOS_NetCoreApp31
200-
displayName: Integration Tests Frosting macOS (.NET Core 3.1)
201-
dependsOn: Build_macOS
202-
pool:
203-
vmImage: 'macOS-11'
204-
steps:
205-
- download: current
206-
artifact: NuGet Package macOS
207-
displayName: 'Download build artifact'
208-
- task: CopyFiles@2
209-
inputs:
210-
sourceFolder: $(Pipeline.Workspace)/NuGet Package macOS
211-
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
212-
displayName: 'Copy build artifact for test run'
213-
- task: UseDotNet@2
214-
inputs:
215-
version: '3.x'
216-
- bash: ./build.sh --verbosity=diagnostic
217-
workingDirectory: ./tests/frosting/netcoreapp3.1
218-
displayName: 'Run integration tests'
219-
env:
220-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
221-
222-
# Integration Tests Frosting macOS (.NET 5)
223-
- job: Test_Frosting_macOS_Net5
224-
displayName: Integration Tests Frosting macOS (.NET 5)
225-
dependsOn: Build_macOS
226-
pool:
227-
vmImage: 'macOS-11'
228-
steps:
229-
- download: current
230-
artifact: NuGet Package macOS
231-
displayName: 'Download build artifact'
232-
- task: CopyFiles@2
233-
inputs:
234-
sourceFolder: $(Pipeline.Workspace)/NuGet Package macOS
235-
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
236-
displayName: 'Copy build artifact for test run'
237-
- task: UseDotNet@2
238-
inputs:
239-
version: '5.x'
240-
- bash: ./build.sh --verbosity=diagnostic
241-
workingDirectory: ./tests/frosting/net5.0
163+
workingDirectory: ./tests/script-runner/net7.0
242164
displayName: 'Run integration tests'
243165
env:
244166
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
@@ -267,9 +189,9 @@ jobs:
267189
env:
268190
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
269191

270-
# Integration Tests Script Runner macOS (.NET Core 3.1)
271-
- job: Test_Script_Runner_macOS_NetCoreApp31
272-
displayName: Integration Tests Script Runner macOS (.NET Core 3.1)
192+
# Integration Tests Frosting macOS (.NET 7)
193+
- job: Test_Frosting_macOS_Net7
194+
displayName: Integration Tests Frosting macOS (.NET 7)
273195
dependsOn: Build_macOS
274196
pool:
275197
vmImage: 'macOS-11'
@@ -284,33 +206,9 @@ jobs:
284206
displayName: 'Copy build artifact for test run'
285207
- task: UseDotNet@2
286208
inputs:
287-
version: '3.x'
209+
version: '7.x'
288210
- bash: ./build.sh --verbosity=diagnostic
289-
workingDirectory: ./tests/script-runner/netcoreapp3.1
290-
displayName: 'Run integration tests'
291-
env:
292-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
293-
294-
# Integration Tests Script Runner macOS (.NET 5)
295-
- job: Test_Script_Runner_macOS_Net5
296-
displayName: Integration Tests Script Runner macOS (.NET 5)
297-
dependsOn: Build_macOS
298-
pool:
299-
vmImage: 'macOS-11'
300-
steps:
301-
- download: current
302-
artifact: NuGet Package macOS
303-
displayName: 'Download build artifact'
304-
- task: CopyFiles@2
305-
inputs:
306-
sourceFolder: $(Pipeline.Workspace)/NuGet Package macOS
307-
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
308-
displayName: 'Copy build artifact for test run'
309-
- task: UseDotNet@2
310-
inputs:
311-
version: '5.x'
312-
- bash: ./build.sh --verbosity=diagnostic
313-
workingDirectory: ./tests/script-runner/net5.0
211+
workingDirectory: ./tests/frosting/net7.0
314212
displayName: 'Run integration tests'
315213
env:
316214
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
@@ -339,50 +237,26 @@ jobs:
339237
env:
340238
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
341239

342-
# Integration Tests Frosting Ubuntu (.NET Core 3.1)
343-
- job: Test_Frosting_Ubuntu_NetCoreApp31
344-
displayName: Integration Tests Frosting Ubuntu (.NET Core 3.1)
345-
dependsOn: Build_Ubuntu
346-
pool:
347-
vmImage: 'ubuntu-20.04'
348-
steps:
349-
- download: current
350-
artifact: NuGet Package Ubuntu
351-
displayName: 'Download build artifact'
352-
- task: CopyFiles@2
353-
inputs:
354-
sourceFolder: $(Pipeline.Workspace)/NuGet Package Ubuntu
355-
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
356-
displayName: 'Copy build artifact for test run'
357-
- task: UseDotNet@2
358-
inputs:
359-
version: '3.x'
360-
- bash: ./build.sh --verbosity=diagnostic
361-
workingDirectory: ./tests/frosting/netcoreapp3.1
362-
displayName: 'Run integration tests'
363-
env:
364-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
365-
366-
# Integration Tests Frosting Ubuntu (.NET 5)
367-
- job: Test_Frosting_Ubuntu_Net5
368-
displayName: Integration Tests Frosting Ubuntu (.NET 5)
369-
dependsOn: Build_Ubuntu
240+
# Integration Tests Script Runner macOS (.NET 7)
241+
- job: Test_Script_Runner_macOS_Net7
242+
displayName: Integration Tests Script Runner macOS (.NET 7)
243+
dependsOn: Build_macOS
370244
pool:
371-
vmImage: 'ubuntu-20.04'
245+
vmImage: 'macOS-11'
372246
steps:
373247
- download: current
374-
artifact: NuGet Package Ubuntu
248+
artifact: NuGet Package macOS
375249
displayName: 'Download build artifact'
376250
- task: CopyFiles@2
377251
inputs:
378-
sourceFolder: $(Pipeline.Workspace)/NuGet Package Ubuntu
252+
sourceFolder: $(Pipeline.Workspace)/NuGet Package macOS
379253
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
380254
displayName: 'Copy build artifact for test run'
381255
- task: UseDotNet@2
382256
inputs:
383-
version: '5.x'
257+
version: '7.x'
384258
- bash: ./build.sh --verbosity=diagnostic
385-
workingDirectory: ./tests/frosting/net5.0
259+
workingDirectory: ./tests/script-runner/net7.0
386260
displayName: 'Run integration tests'
387261
env:
388262
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
@@ -411,9 +285,9 @@ jobs:
411285
env:
412286
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
413287

414-
# Integration Tests Script Runner Ubuntu (.NET Core 3.1)
415-
- job: Test_Script_Runner_Ubuntu_NetCoreApp31
416-
displayName: Integration Tests Script Runner Ubuntu (.NET Core 3.1)
288+
# Integration Tests Frosting Ubuntu (.NET 7)
289+
- job: Test_Frosting_Ubuntu_Net7
290+
displayName: Integration Tests Frosting Ubuntu (.NET 7)
417291
dependsOn: Build_Ubuntu
418292
pool:
419293
vmImage: 'ubuntu-20.04'
@@ -428,16 +302,16 @@ jobs:
428302
displayName: 'Copy build artifact for test run'
429303
- task: UseDotNet@2
430304
inputs:
431-
version: '3.x'
305+
version: '7.x'
432306
- bash: ./build.sh --verbosity=diagnostic
433-
workingDirectory: ./tests/script-runner/netcoreapp3.1
307+
workingDirectory: ./tests/frosting/net7.0
434308
displayName: 'Run integration tests'
435309
env:
436310
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
437311

438-
# Integration Tests Script Runner Ubuntu (.NET 5)
439-
- job: Test_Script_Runner_Ubuntu_Net5
440-
displayName: Integration Tests Script Runner Ubuntu (.NET 5)
312+
# Integration Tests Script Runner Ubuntu (.NET 6)
313+
- job: Test_Script_Runner_Ubuntu_Net6
314+
displayName: Integration Tests Script Runner Ubuntu (.NET 6)
441315
dependsOn: Build_Ubuntu
442316
pool:
443317
vmImage: 'ubuntu-20.04'
@@ -452,16 +326,16 @@ jobs:
452326
displayName: 'Copy build artifact for test run'
453327
- task: UseDotNet@2
454328
inputs:
455-
version: '5.x'
329+
version: '6.x'
456330
- bash: ./build.sh --verbosity=diagnostic
457-
workingDirectory: ./tests/script-runner/net5.0
331+
workingDirectory: ./tests/script-runner/net6.0
458332
displayName: 'Run integration tests'
459333
env:
460334
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
461335

462-
# Integration Tests Script Runner Ubuntu (.NET 6)
463-
- job: Test_Script_Runner_Ubuntu_Net6
464-
displayName: Integration Tests Script Runner Ubuntu (.NET 6)
336+
# Integration Tests Script Runner Ubuntu (.NET 7)
337+
- job: Test_Script_Runner_Ubuntu_Net7
338+
displayName: Integration Tests Script Runner Ubuntu (.NET 7)
465339
dependsOn: Build_Ubuntu
466340
pool:
467341
vmImage: 'ubuntu-20.04'
@@ -476,9 +350,9 @@ jobs:
476350
displayName: 'Copy build artifact for test run'
477351
- task: UseDotNet@2
478352
inputs:
479-
version: '6.x'
353+
version: '7.x'
480354
- bash: ./build.sh --verbosity=diagnostic
481-
workingDirectory: ./tests/script-runner/net6.0
355+
workingDirectory: ./tests/script-runner/net7.0
482356
displayName: 'Run integration tests'
483357
env:
484358
SYSTEM_ACCESSTOKEN: $(System.AccessToken)

0 commit comments

Comments
 (0)