Skip to content

Commit 2b6e260

Browse files
committed
- Fixed target frameworks for Unix parameters.
1 parent 29049f1 commit 2b6e260

File tree

4 files changed

+44
-20
lines changed

4 files changed

+44
-20
lines changed

eng/pipelines/dotnet-sqlclient-ci-core.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ parameters:
1111

1212
# The target frameworks to build and run tests for on Windows.
1313
#
14-
# This is _not_ the target frameworks to build the driver packages for.
14+
# These are _not_ the target frameworks to build the driver packages for.
1515
#
1616
- name: targetFrameworks
1717
displayName: 'Target Frameworks on Windows'
@@ -20,7 +20,7 @@ parameters:
2020

2121
# The target frameworks to build and run tests for on Unix.
2222
#
23-
# This is _not_ the target frameworks to build the driver packages for.
23+
# These are _not_ the target frameworks to build the driver packages for.
2424
#
2525
- name: targetFrameworksUnix
2626
displayName: 'Target Frameworks on Unix'

eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,23 @@ parameters:
124124
type: boolean
125125
default: false
126126

127+
# The target frameworks to build and run tests for on Windows.
128+
#
129+
# These are _not_ the target frameworks to build the driver packages for.
130+
#
127131
- name: targetFrameworks
128132
displayName: Target Frameworks on Windows
129133
type: object
130-
default: [net462, net8.0, net9.0]
131-
132-
- name: targetFrameworksLinux
133-
displayName: Target Frameworks on Non-Windows
134+
default: [net462, net8.0, net9.0, net10.0]
135+
136+
# The target frameworks to build and run tests for on Unix.
137+
#
138+
# These are _not_ the target frameworks to build the driver packages for.
139+
#
140+
- name: targetFrameworksUnix
141+
displayName: Target Frameworks on Unix
134142
type: object
135-
default: [net8.0, net9.0]
143+
default: [net8.0, net9.0, net10.0]
136144

137145
- name: testSets
138146
displayName: Test Sets
@@ -162,7 +170,7 @@ extends:
162170
debug: ${{ parameters.debug }}
163171
enableStressTests: ${{ parameters.enableStressTests }}
164172
targetFrameworks: ${{ parameters.targetFrameworks }}
165-
targetFrameworksLinux: ${{ parameters.targetFrameworksLinux }}
173+
targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
166174
testSets: ${{ parameters.testSets }}
167175
# Populate the actual test job timeout numeric values if Default was
168176
# specified. We choose different values depending on the build

eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,23 @@ parameters:
124124
type: boolean
125125
default: false
126126

127+
# The target frameworks to build and run tests for on Windows.
128+
#
129+
# These are _not_ the target frameworks to build the driver packages for.
130+
#
127131
- name: targetFrameworks
128132
displayName: Target Frameworks on Windows
129133
type: object
130-
default: [net462, net8.0, net9.0]
131-
132-
- name: targetFrameworksLinux
133-
displayName: Target Frameworks on Non-Windows
134+
default: [net462, net8.0, net9.0, net10.0]
135+
136+
# The target frameworks to build and run tests for on Unix.
137+
#
138+
# These are _not_ the target frameworks to build the driver packages for.
139+
#
140+
- name: targetFrameworksUnix
141+
displayName: Target Frameworks on Unix
134142
type: object
135-
default: [net8.0, net9.0]
143+
default: [net8.0, net9.0, net10.0]
136144

137145
- name: testSets
138146
displayName: Test Sets
@@ -162,7 +170,7 @@ extends:
162170
debug: ${{ parameters.debug }}
163171
enableStressTests: ${{ parameters.enableStressTests }}
164172
targetFrameworks: ${{ parameters.targetFrameworks }}
165-
targetFrameworksLinux: ${{ parameters.targetFrameworksLinux }}
173+
targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
166174
testSets: ${{ parameters.testSets }}
167175
# Populate the actual test job timeout numeric values if Default was
168176
# specified. We choose different values depending on the build

eng/pipelines/sqlclient-pr-project-ref-pipeline.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,23 @@ parameters:
8181
type: boolean
8282
default: false
8383

84+
# The target frameworks to build and run tests for on Windows.
85+
#
86+
# These are _not_ the target frameworks to build the driver packages for.
87+
#
8488
- name: targetFrameworks
8589
displayName: Target Frameworks on Windows
8690
type: object
87-
default: [net462, net8.0, net9.0]
88-
89-
- name: targetFrameworksLinux
90-
displayName: Target Frameworks on Non-Windows
91+
default: [net462, net8.0, net9.0, net10.0]
92+
93+
# The target frameworks to build and run tests for on Unix.
94+
#
95+
# These are _not_ the target frameworks to build the driver packages for.
96+
#
97+
- name: targetFrameworksUnix
98+
displayName: Target Frameworks on Unix
9199
type: object
92-
default: [net8.0, net9.0]
100+
default: [net8.0, net9.0, net10.0]
93101

94102
- name: testSets
95103
displayName: Test Sets
@@ -119,7 +127,7 @@ extends:
119127
debug: ${{ parameters.debug }}
120128
enableStressTests: ${{ parameters.enableStressTests }}
121129
targetFrameworks: ${{ parameters.targetFrameworks }}
122-
targetFrameworksLinux: ${{ parameters.targetFrameworksLinux }}
130+
targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
123131
testSets: ${{ parameters.testSets }}
124132
# Populate the actual test job timeout numeric values if Default was
125133
# specified. We choose different values depending on the build

0 commit comments

Comments
 (0)