From 7807d013a5696f99be33e44191c9531ea7e62a36 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Wed, 27 May 2026 14:56:02 -0700 Subject: [PATCH 1/2] Eng | Fix official and kerberos pipelines --- eng/pipelines/kerberos/sqlclient-kerberos.yml | 8 ++++++++ eng/pipelines/onebranch/jobs/build-buildproj-job.yml | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/eng/pipelines/kerberos/sqlclient-kerberos.yml b/eng/pipelines/kerberos/sqlclient-kerberos.yml index eb0016f9fc..e4079e3619 100644 --- a/eng/pipelines/kerberos/sqlclient-kerberos.yml +++ b/eng/pipelines/kerberos/sqlclient-kerberos.yml @@ -131,6 +131,10 @@ stages: parameters: runtimes: [8.x, 9.x] + # Restore dotnet local tools (pwsh, apicompat, etc.). Required by build.proj targets + # such as _CheckPwshToolRestored that run during the SqlClient ref project build. + - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self + # --- Update test configuration --- # Uses runtime variables from the matrix ($(managedSNI)) so we use # inline PowerShell instead of the shared config template which @@ -224,6 +228,10 @@ stages: parameters: runtimes: [8.x, 9.x] + # Restore dotnet local tools (pwsh, apicompat, etc.). Required by build.proj targets + # such as _CheckPwshToolRestored that run during the SqlClient ref project build. + - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self + # --- Update test configuration (with Kerberos credentials) --- - pwsh: | $jdata = Get-Content -Raw "config.default.json" | ConvertFrom-Json diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml index 3fa44c3ce6..34c775ad5c 100644 --- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml +++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml @@ -130,6 +130,10 @@ jobs: # Install the .NET SDK. - template: /eng/pipelines/steps/install-dotnet.yml@self + # Restore dotnet local tools (pwsh, apicompat, etc.). Required by build.proj targets + # such as _CheckPwshToolRestored that run during RoslynAnalyzers and Build. + - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self + # Perform Roslyn analysis before building, since this step will clobber build output. - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml@self parameters: From 3c79a35b7554d06bbd51ef4925bdd219ed820bcc Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Wed, 27 May 2026 20:03:07 -0700 Subject: [PATCH 2/2] Do not publish code coverage when previous stages failed --- eng/pipelines/kerberos/sqlclient-kerberos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/kerberos/sqlclient-kerberos.yml b/eng/pipelines/kerberos/sqlclient-kerberos.yml index e4079e3619..af1b04266f 100644 --- a/eng/pipelines/kerberos/sqlclient-kerberos.yml +++ b/eng/pipelines/kerberos/sqlclient-kerberos.yml @@ -291,7 +291,7 @@ stages: dependsOn: - windows - linux - condition: succeededOrFailed() + condition: succeeded() jobs: - template: /eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml@self parameters: