Skip to content

Commit fae08bb

Browse files
pascalbergerpascalberger
authored
Target .NET 6 and .NET 7 (#384)
1 parent d48b974 commit fae08bb

File tree

28 files changed

+58
-582
lines changed

28 files changed

+58
-582
lines changed

‎azure-pipelines.yml

Lines changed: 52 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ jobs:
3333
steps:
3434
- task: UseDotNet@2
3535
inputs:
36-
version: '6.x'
36+
version: '7.x'
3737
- task: UseDotNet@2
3838
inputs:
39-
version: '5.x'
39+
version: '6.x'
40+
# .NET 5 required for GitVersion
4041
- task: UseDotNet@2
4142
inputs:
42-
version: '3.x'
43+
version: '5.x'
4344
- bash: |
4445
./build.sh
4546
displayName: 'Cake Build'
@@ -55,68 +56,27 @@ jobs:
5556
steps:
5657
- task: UseDotNet@2
5758
inputs:
58-
version: '6.x'
59+
version: '7.x'
5960
- task: UseDotNet@2
6061
inputs:
61-
version: '5.x'
62+
version: '6.x'
63+
# .NET 5 required for GitVersion
6264
- task: UseDotNet@2
6365
inputs:
64-
version: '3.x'
66+
version: '5.x'
6567
- bash: |
6668
./build.sh --verbosity=diagnostic
6769
displayName: 'Cake Build'
6870
- publish: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
6971
artifact: NuGet Package Ubuntu
7072
displayName: 'Publish NuGet package as build artifact'
7173

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-
11474
# Integration Tests Frosting Windows (.NET 6)
115-
- job: Test_Frosting_Windows_Net6
75+
- job: Test_Frosting_Windows_Net5
11676
displayName: Integration Tests Frosting Windows (.NET 6)
11777
dependsOn: Build_Windows
11878
pool:
119-
vmImage: 'windows-2022'
79+
vmImage: 'windows-2019'
12080
steps:
12181
- download: current
12282
artifact: NuGet Package Windows
@@ -132,12 +92,12 @@ jobs:
13292
env:
13393
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
13494

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)
95+
# Integration Tests Frosting Windows (.NET 7)
96+
- job: Test_Frosting_Windows_Net7
97+
displayName: Integration Tests Frosting Windows (.NET 7)
13898
dependsOn: Build_Windows
13999
pool:
140-
vmImage: 'windows-2019'
100+
vmImage: 'windows-2022'
141101
steps:
142102
- download: current
143103
artifact: NuGet Package Windows
@@ -148,14 +108,14 @@ jobs:
148108
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
149109
displayName: 'Copy build artifact for test run'
150110
- powershell: ./build.ps1 --verbosity=diagnostic
151-
workingDirectory: ./tests/script-runner/netcoreapp3.1
111+
workingDirectory: ./tests/frosting/net7.0
152112
displayName: 'Run integration tests'
153113
env:
154114
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
155115

156-
# Integration Tests Script Runner Windows (.NET 5)
157-
- job: Test_Script_Runner_Windows_Net5
158-
displayName: Integration Tests Script Runner Windows (.NET 5)
116+
# Integration Tests Script Runner Windows (.NET 6)
117+
- job: Test_Script_Runner_Windows_Net6
118+
displayName: Integration Tests Script Runner Windows (.NET 6)
159119
dependsOn: Build_Windows
160120
pool:
161121
vmImage: 'windows-2019'
@@ -169,14 +129,14 @@ jobs:
169129
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
170130
displayName: 'Copy build artifact for test run'
171131
- powershell: ./build.ps1 --verbosity=diagnostic
172-
workingDirectory: ./tests/script-runner/net5.0
132+
workingDirectory: ./tests/script-runner/net6.0
173133
displayName: 'Run integration tests'
174134
env:
175135
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
176136

177-
# Integration Tests Script Runner Windows (.NET 6)
178-
- job: Test_Script_Runner_Windows_Net6
179-
displayName: Integration Tests Script Runner Windows (.NET 6)
137+
# Integration Tests Script Runner Windows (.NET 7)
138+
- job: Test_Script_Runner_Windows_Net7
139+
displayName: Integration Tests Script Runner Windows (.NET 7)
180140
dependsOn: Build_Windows
181141
pool:
182142
vmImage: 'windows-2022'
@@ -190,55 +150,7 @@ jobs:
190150
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
191151
displayName: 'Copy build artifact for test run'
192152
- 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
153+
workingDirectory: ./tests/script-runner/net7.0
242154
displayName: 'Run integration tests'
243155
env:
244156
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
@@ -267,9 +179,9 @@ jobs:
267179
env:
268180
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
269181

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)
182+
# Integration Tests Frosting macOS (.NET 7)
183+
- job: Test_Frosting_macOS_Net7
184+
displayName: Integration Tests Frosting macOS (.NET 7)
273185
dependsOn: Build_macOS
274186
pool:
275187
vmImage: 'macOS-11'
@@ -284,33 +196,9 @@ jobs:
284196
displayName: 'Copy build artifact for test run'
285197
- task: UseDotNet@2
286198
inputs:
287-
version: '3.x'
199+
version: '7.x'
288200
- 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
201+
workingDirectory: ./tests/frosting/net7.0
314202
displayName: 'Run integration tests'
315203
env:
316204
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
@@ -339,50 +227,26 @@ jobs:
339227
env:
340228
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
341229

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
230+
# Integration Tests Script Runner macOS (.NET 7)
231+
- job: Test_Script_Runner_macOS_Net7
232+
displayName: Integration Tests Script Runner macOS (.NET 7)
233+
dependsOn: Build_macOS
370234
pool:
371-
vmImage: 'ubuntu-20.04'
235+
vmImage: 'macOS-11'
372236
steps:
373237
- download: current
374-
artifact: NuGet Package Ubuntu
238+
artifact: NuGet Package macOS
375239
displayName: 'Download build artifact'
376240
- task: CopyFiles@2
377241
inputs:
378-
sourceFolder: $(Pipeline.Workspace)/NuGet Package Ubuntu
242+
sourceFolder: $(Pipeline.Workspace)/NuGet Package macOS
379243
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
380244
displayName: 'Copy build artifact for test run'
381245
- task: UseDotNet@2
382246
inputs:
383-
version: '5.x'
247+
version: '7.x'
384248
- bash: ./build.sh --verbosity=diagnostic
385-
workingDirectory: ./tests/frosting/net5.0
249+
workingDirectory: ./tests/script-runner/net7.0
386250
displayName: 'Run integration tests'
387251
env:
388252
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
@@ -411,9 +275,9 @@ jobs:
411275
env:
412276
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
413277

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)
278+
# Integration Tests Frosting Ubuntu (.NET 7)
279+
- job: Test_Frosting_Ubuntu_Net7
280+
displayName: Integration Tests Frosting Ubuntu (.NET 7)
417281
dependsOn: Build_Ubuntu
418282
pool:
419283
vmImage: 'ubuntu-20.04'
@@ -428,16 +292,16 @@ jobs:
428292
displayName: 'Copy build artifact for test run'
429293
- task: UseDotNet@2
430294
inputs:
431-
version: '3.x'
295+
version: '7.x'
432296
- bash: ./build.sh --verbosity=diagnostic
433-
workingDirectory: ./tests/script-runner/netcoreapp3.1
297+
workingDirectory: ./tests/frosting/net7.0
434298
displayName: 'Run integration tests'
435299
env:
436300
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
437301

438-
# Integration Tests Script Runner Ubuntu (.NET 5)
439-
- job: Test_Script_Runner_Ubuntu_Net5
440-
displayName: Integration Tests Script Runner Ubuntu (.NET 5)
302+
# Integration Tests Script Runner Ubuntu (.NET 6)
303+
- job: Test_Script_Runner_Ubuntu_Net6
304+
displayName: Integration Tests Script Runner Ubuntu (.NET 6)
441305
dependsOn: Build_Ubuntu
442306
pool:
443307
vmImage: 'ubuntu-20.04'
@@ -452,16 +316,16 @@ jobs:
452316
displayName: 'Copy build artifact for test run'
453317
- task: UseDotNet@2
454318
inputs:
455-
version: '5.x'
319+
version: '6.x'
456320
- bash: ./build.sh --verbosity=diagnostic
457-
workingDirectory: ./tests/script-runner/net5.0
321+
workingDirectory: ./tests/script-runner/net6.0
458322
displayName: 'Run integration tests'
459323
env:
460324
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
461325

462-
# Integration Tests Script Runner Ubuntu (.NET 6)
463-
- job: Test_Script_Runner_Ubuntu_Net6
464-
displayName: Integration Tests Script Runner Ubuntu (.NET 6)
326+
# Integration Tests Script Runner Ubuntu (.NET 7)
327+
- job: Test_Script_Runner_Ubuntu_Net7
328+
displayName: Integration Tests Script Runner Ubuntu (.NET 7)
465329
dependsOn: Build_Ubuntu
466330
pool:
467331
vmImage: 'ubuntu-20.04'
@@ -476,9 +340,9 @@ jobs:
476340
displayName: 'Copy build artifact for test run'
477341
- task: UseDotNet@2
478342
inputs:
479-
version: '6.x'
343+
version: '7.x'
480344
- bash: ./build.sh --verbosity=diagnostic
481-
workingDirectory: ./tests/script-runner/net6.0
345+
workingDirectory: ./tests/script-runner/net7.0
482346
displayName: 'Run integration tests'
483347
env:
484348
SYSTEM_ACCESSTOKEN: $(System.AccessToken)

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"allowPrerelease": true,
4-
"version": "6.0.100",
4+
"version": "7.0.100",
55
"rollForward": "latestFeature"
66
}
77
}

0 commit comments

Comments
 (0)