Skip to content

Commit ad54383

Browse files
committed
Fixed debug DLL output and Windows WMI call.
1 parent 20d7103 commit ad54383

3 files changed

Lines changed: 23 additions & 22 deletions

File tree

eng/pipelines/common/templates/jobs/ci-run-tests-job.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ jobs:
241241
- ${{ elseif eq(parameters.configSqlFor, 'local') }}:
242242
- template: /eng/pipelines/common/templates/steps/configure-sql-server-step.yml@self # configure SQL Server
243243
parameters:
244+
debug: ${{ parameters.debug }}
244245
operatingSystem: ${{ parameters.operatingSystem }}
245246
netcoreVersionTestUtils: ${{ parameters.netcoreVersionTestUtils }}
246247
saPassword: ${{ parameters.saPassword }}

eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,29 +77,29 @@ steps:
7777
- pwsh: |
7878
try
7979
{
80-
# enable TCP
81-
Import-Module "sqlps"
82-
$smo = 'Microsoft.SqlServer.Management.Smo.'
83-
$wmi = new-object ($smo + 'Wmi.ManagedComputer').
84-
# List the object properties, including the instance names.
85-
$Wmi
86-
87-
# Enable the TCP protocol on the default instance.
88-
$Tcp = $wmi.GetSmoObject("ManagedComputer[@Name='$env:COMPUTERNAME']/ ServerInstance[@Name='${{parameters.instanceName }}']/ServerProtocol[@Name='Tcp']")
89-
$Tcp.IsEnabled = $true
90-
$Tcp.Alter()
91-
92-
# Enable the NP protocol on the default instance.
93-
$Np = $wmi.GetSmoObject("ManagedComputer[@Name='$env:COMPUTERNAME']/ ServerInstance[@Name='${{parameters.instanceName }}']/ServerProtocol[@Name='Np']")
94-
$Np.IsEnabled = $true
95-
$Np.Alter()
96-
97-
$Tcp
80+
# enable TCP
81+
Import-Module "sqlps"
82+
$smo = 'Microsoft.SqlServer.Management.Smo.'
83+
$wmi = new-object ($smo + 'Wmi.ManagedComputer')
84+
# List the object properties, including the instance names.
85+
$Wmi
86+
87+
# Enable the TCP protocol on the default instance.
88+
$Tcp = $wmi.GetSmoObject("ManagedComputer[@Name='$env:COMPUTERNAME']/ ServerInstance[@Name='${{parameters.instanceName }}']/ServerProtocol[@Name='Tcp']")
89+
$Tcp.IsEnabled = $true
90+
$Tcp.Alter()
91+
92+
# Enable the NP protocol on the default instance.
93+
$Np = $wmi.GetSmoObject("ManagedComputer[@Name='$env:COMPUTERNAME']/ ServerInstance[@Name='${{parameters.instanceName }}']/ServerProtocol[@Name='Np']")
94+
$Np.IsEnabled = $true
95+
$Np.Alter()
96+
97+
$Tcp
9898
}
9999
catch
100100
{
101-
$error[0] | format-list -force
102-
throw
101+
$error[0] | format-list -force
102+
throw
103103
}
104104
105105
New-NetFirewallRule -DisplayName "SQL TCP Ports" -Direction Inbound -Protocol TCP -LocalPort 1433 -Action allow

eng/pipelines/jobs/test-azure-package-ci-job.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ jobs:
276276
- ${{ if eq(parameters.debug, true) }}:
277277
- pwsh: >-
278278
Get-ChildItem
279-
-Path "src/Microsoft.Data.SqlClient.Extensions/Azure/test/bin/${{ parameters.buildConfiguration }}"
280-
-Recurse
279+
-Path "src/Microsoft.Data.SqlClient.Extensions/Azure/test/bin/${{ parameters.buildConfiguration }}"
280+
-Recurse
281281
displayName: '[Debug] List Output DLLs'
282282
283283
# Run the tests for each .NET runtime.

0 commit comments

Comments
 (0)