Skip to content

Commit 794341b

Browse files
committed
Fixed merge conflict with parameter names.
1 parent 36ca447 commit 794341b

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stages.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ stages:
5353
operatingSystem: Windows
5454
runtime: ${{ runtime }}
5555
useManagedSNI: false
56-
vmImage: ADO-Win25
56+
poolImage: ADO-Win25
5757

5858
# .NET runs with both native and managed SNI.
5959
- ${{ each runtime in parameters.netTestRuntimes }}:
@@ -67,7 +67,7 @@ stages:
6767
operatingSystem: Windows
6868
runtime: ${{ runtime }}
6969
useManagedSNI: false
70-
vmImage: ADO-Win25
70+
poolImage: ADO-Win25
7171

7272
- template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
7373
parameters:
@@ -79,7 +79,7 @@ stages:
7979
operatingSystem: Windows
8080
runtime: ${{ runtime }}
8181
useManagedSNI: true
82-
vmImage: ADO-Win25
82+
poolImage: ADO-Win25
8383

8484
- stage: linux
8585
displayName: Linux
@@ -97,4 +97,4 @@ stages:
9797
dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
9898
operatingSystem: Linux
9999
runtime: ${{ runtime }}
100-
vmImage: ADO-UB24
100+
poolImage: ADO-UB24

0 commit comments

Comments
 (0)