Skip to content

Commit 52ba336

Browse files
paulmedynskipaulmedynski
committed
Merge branch 'main' into dev/paul/duplicate-runs
2 parents bf994e0 + f14c06e commit 52ba336

7 files changed

Lines changed: 34 additions & 78 deletions

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

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,17 @@ parameters:
150150
type: object
151151
default: [net8.0, net9.0]
152152

153+
# The timeout, in minutes, for each test job.
154+
- name: testJobTimeout
155+
displayName: Test job timeout (in minutes)
156+
type: number
157+
default: 60
158+
153159
- name: testSets
154160
displayName: Test Sets
155161
type: object
156162
default: [1, 2, 3]
157163

158-
# The timeout, in minutes, for each test job.
159-
- name: testJobTimeout
160-
displayName: Test job timeout (in minutes)
161-
type: string
162-
default: Default
163-
164164
- name: useManagedSNI
165165
displayName: |
166166
Use Managed/Native SNI on Windows,
@@ -179,17 +179,6 @@ extends:
179179
enableStressTests: ${{ parameters.enableStressTests }}
180180
targetFrameworks: ${{ parameters.targetFrameworks }}
181181
targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
182+
testJobTimeout: ${{ parameters.testJobTimeout }}
182183
testSets: ${{ parameters.testSets }}
183-
# Populate the actual test job timeout numeric values if Default was
184-
# specified. We choose different values depending on the build
185-
# configuration.
186-
${{ if eq(parameters.testJobTimeout, 'Default') }}:
187-
# If the build configuration is Debug, we allow a bit of extra time since
188-
# some tests run more slowly, and some tests are Debug only.
189-
${{ if eq(parameters.buildConfiguration, 'Debug') }}:
190-
testJobTimeout: 110
191-
${{ else }}:
192-
testJobTimeout: 90
193-
${{ else }}:
194-
testJobTimeout: ${{ parameters.testJobTimeout }}
195184
useManagedSNI: ${{ parameters.useManagedSNI }}

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

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,17 @@ parameters:
150150
type: object
151151
default: [net8.0, net9.0]
152152

153+
# The timeout, in minutes, for each test job.
154+
- name: testJobTimeout
155+
displayName: Test job timeout (in minutes)
156+
type: number
157+
default: 60
158+
153159
- name: testSets
154160
displayName: Test Sets
155161
type: object
156162
default: [1, 2, 3]
157163

158-
# The timeout, in minutes, for each test job.
159-
- name: testJobTimeout
160-
displayName: Test job timeout (in minutes)
161-
type: string
162-
default: Default
163-
164164
- name: useManagedSNI
165165
displayName: |
166166
Use Managed/Native SNI on Windows,
@@ -179,17 +179,6 @@ extends:
179179
enableStressTests: ${{ parameters.enableStressTests }}
180180
targetFrameworks: ${{ parameters.targetFrameworks }}
181181
targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
182+
testJobTimeout: ${{ parameters.testJobTimeout }}
182183
testSets: ${{ parameters.testSets }}
183-
# Populate the actual test job timeout numeric values if Default was
184-
# specified. We choose different values depending on the build
185-
# configuration.
186-
${{ if eq(parameters.testJobTimeout, 'Default') }}:
187-
# If the build configuration is Debug, we allow a bit of extra time since
188-
# some tests run more slowly, and some tests are Debug only.
189-
${{ if eq(parameters.buildConfiguration, 'Debug') }}:
190-
testJobTimeout: 110
191-
${{ else }}:
192-
testJobTimeout: 90
193-
${{ else }}:
194-
testJobTimeout: ${{ parameters.testJobTimeout }}
195184
useManagedSNI: ${{ parameters.useManagedSNI }}

‎eng/pipelines/dotnet-sqlclient-signing-pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
6767
- name: testJobTimeout
6868
displayName: 'Test job timeout (in minutes)'
6969
type: number
70-
default: 90
70+
default: 60
7171

7272
variables:
7373
- template: /eng/pipelines/libraries/variables.yml@self

‎eng/pipelines/sqlclient-pr-package-ref-pipeline.yml‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,17 @@ parameters:
108108
type: object
109109
default: [net8.0, net9.0]
110110

111+
# The timeout, in minutes, for each test job.
112+
- name: testJobTimeout
113+
displayName: Test job timeout (in minutes)
114+
type: number
115+
default: 60
116+
111117
- name: testSets
112118
displayName: Test Sets
113119
type: object
114120
default: [1, 2, 3]
115121

116-
# The timeout, in minutes, for each test job.
117-
- name: testJobTimeout
118-
displayName: Test job timeout (in minutes)
119-
type: string
120-
default: Default
121-
122122
- name: useManagedSNI
123123
displayName: |
124124
Use Managed/Native SNI on Windows,
@@ -137,19 +137,8 @@ extends:
137137
enableStressTests: ${{ parameters.enableStressTests }}
138138
targetFrameworks: ${{ parameters.targetFrameworks }}
139139
targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
140+
testJobTimeout: ${{ parameters.testJobTimeout }}
140141
testSets: ${{ parameters.testSets }}
141-
# Populate the actual test job timeout numeric values if Default was
142-
# specified. We choose different values depending on the build
143-
# configuration.
144-
${{ if eq(parameters.testJobTimeout, 'Default') }}:
145-
# If the build configuration is Debug, we allow a bit of extra time since
146-
# some tests run more slowly, and some tests are Debug only.
147-
${{ if eq(parameters.buildConfiguration, 'Debug') }}:
148-
testJobTimeout: 110
149-
${{ else }}:
150-
testJobTimeout: 90
151-
${{ else }}:
152-
testJobTimeout: ${{ parameters.testJobTimeout }}
153142
# We will only run integration tests during Package reference builds. This
154143
# avoids duplicating test runs from the Project build pipelines.
155144
testType: Integration

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

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,17 @@ parameters:
108108
type: object
109109
default: [net8.0, net9.0]
110110

111+
# The timeout, in minutes, for each test job.
112+
- name: testJobTimeout
113+
displayName: Test job timeout (in minutes)
114+
type: number
115+
default: 60
116+
111117
- name: testSets
112118
displayName: Test Sets
113119
type: object
114120
default: [1, 2, 3]
115121

116-
# The timeout, in minutes, for each test job.
117-
- name: testJobTimeout
118-
displayName: Test job timeout (in minutes)
119-
type: string
120-
default: Default
121-
122122
- name: useManagedSNI
123123
displayName: |
124124
Use Managed/Native SNI on Windows,
@@ -137,22 +137,11 @@ extends:
137137
enableStressTests: ${{ parameters.enableStressTests }}
138138
targetFrameworks: ${{ parameters.targetFrameworks }}
139139
targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
140+
testJobTimeout: ${{ parameters.testJobTimeout }}
140141
testSets: ${{ parameters.testSets }}
141-
# Populate the actual test job timeout numeric values if Default was
142-
# specified. We choose different values depending on the build
143-
# configuration.
144-
${{ if eq(parameters.testJobTimeout, 'Default') }}:
145-
# If the build configuration is Debug, we allow a bit of extra time since
146-
# some tests run more slowly, and some tests are Debug only.
147-
${{ if eq(parameters.buildConfiguration, 'Debug') }}:
148-
testJobTimeout: 110
149-
${{ else }}:
150-
testJobTimeout: 90
151-
${{ else }}:
152-
testJobTimeout: ${{ parameters.testJobTimeout }}
153-
# We will only run unit tests during Project reference builds. This
154-
# avoids duplicating test runs from the Package build pipelines.
155-
testType: Unit
142+
# We will only run integration tests during Package reference builds. This
143+
# avoids duplicating test runs from the Project build pipelines.
144+
testType: Integration
156145
useManagedSNI: ${{ parameters.useManagedSNI }}
157146
# Don't run the AE tests in Debug mode; they rarely succeed.
158147
${{ if eq(parameters.buildConfiguration, 'Debug') }}:

‎src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlCodeAccess.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Interop.Windows.Kernel32
1313
/// Indicates the type of access that a caller must request when opening the file object that represents the device (see IRP_MJ_CREATE).
1414
/// </summary>
1515
[Flags]
16-
public enum IoControlCodeAccess
16+
internal enum IoControlCodeAccess
1717
{
1818
/// <summary>
1919
/// The I/O manager sends the IRP for any caller that has a handle to the file object that represents the target device object.

‎src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlTransferType.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Interop.Windows.Kernel32
1010
/// <a href="https://docs.microsoft.com/en-us/windows-hardware/drivers/kernel/buffer-descriptions-for-i-o-control-codes">TransferType</a>.
1111
/// Indicates how the system will pass data between the caller of DeviceIoControl (or IoBuildDeviceIoControlRequest) and the driver that handles the IRP.
1212
/// </summary>
13-
public enum IoControlTransferType
13+
internal enum IoControlTransferType
1414
{
1515
/// <summary>
1616
/// Specifies the buffered I/O method, which is typically used for transferring small amounts of data per request.

0 commit comments

Comments
 (0)