Skip to content

Commit

Permalink
Also update build-and-test.yml and test.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
bjornhellander committed Jun 26, 2024
1 parent bb5aa9f commit 0187fb3
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 1 deletion.
2 changes: 2 additions & 0 deletions StyleCopAnalyzers.sln
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{A0840AD0-B615-487C-AEFF-9DCB691D037B}"
ProjectSection(SolutionItems) = preProject
build\build-and-test.yml = build\build-and-test.yml
build\build.ps1 = build\build.ps1
StyleCop.Analyzers\Directory.Build.props = StyleCop.Analyzers\Directory.Build.props
StyleCop.Analyzers\Directory.Build.targets = StyleCop.Analyzers\Directory.Build.targets
build\opencover-report.ps1 = build\opencover-report.ps1
build\test.yml = build\test.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "documentation", "documentation", "{19DD9E9D-877A-4492-9B7F-2E681DD58308}"
Expand Down
23 changes: 23 additions & 0 deletions build/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ stages:
targetPath: $(Build.SourcesDirectory)/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp12/bin
artifact: buildTest-cs12-${{ parameters.BuildConfiguration }}

- task: PublishPipelineArtifact@1
displayName: Publish build output (Test C# 13)
inputs:
targetPath: $(Build.SourcesDirectory)/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp13/bin
artifact: buildTest-cs13-${{ parameters.BuildConfiguration }}

- stage: Test_CSharp_6_${{ parameters.BuildConfiguration }}
displayName: Test C# 6 ${{ parameters.BuildConfiguration }}
dependsOn: [ 'Build_${{ parameters.BuildConfiguration }}' ]
Expand Down Expand Up @@ -195,6 +201,18 @@ stages:
LangVersion: '12'
FrameworkVersion: 'net472'

- stage: Test_CSharp_13_${{ parameters.BuildConfiguration }}
displayName: Test C# 13 ${{ parameters.BuildConfiguration }}
dependsOn: [ 'Build_${{ parameters.BuildConfiguration }}' ]
jobs:
- template: test.yml
parameters:
BuildConfiguration: ${{ parameters.BuildConfiguration }}
BuildSolution: ${{ parameters.BuildSolution }}
BuildPlatform: ${{ parameters.BuildPlatform }}
LangVersion: '13'
FrameworkVersion: 'net472'

- stage: Publish_Code_Coverage_${{ parameters.BuildConfiguration }}
displayName: Publish Code Coverage
condition: eq('${{ parameters.BuildConfiguration }}', 'Debug')
Expand All @@ -206,6 +224,7 @@ stages:
- Test_CSharp_10_${{ parameters.BuildConfiguration }}
- Test_CSharp_11_${{ parameters.BuildConfiguration }}
- Test_CSharp_12_${{ parameters.BuildConfiguration }}
- Test_CSharp_13_${{ parameters.BuildConfiguration }}
jobs:
- job: WrapUp
steps:
Expand Down Expand Up @@ -247,6 +266,10 @@ stages:
artifact: coverageResults-cs12
displayName: 🔻 Download C# 12 code coverage results
continueOnError: true
- download: current
artifact: coverageResults-cs13
displayName: 🔻 Download C# 13 code coverage results
continueOnError: true
- task: PowerShell@2
displayName: ⚙ Merge coverage
timeoutInMinutes: 20
Expand Down
2 changes: 1 addition & 1 deletion build/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
displayName: C# Language Version
type: string
default: '6'
values: [ '6', '7', '8', '9', '10', '11', '12' ]
values: [ '6', '7', '8', '9', '10', '11', '12', '13' ]
- name: FrameworkVersion
displayName: .NET Framework Version
type: string
Expand Down

0 comments on commit 0187fb3

Please sign in to comment.