From 008fa09ddda2ac37361b0f9b2d6377347856e96e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Mar 2026 19:07:50 +0000 Subject: [PATCH 1/9] adapt codeql.yml for release/7.0 branch Co-authored-by: mdaigle <4722049+mdaigle@users.noreply.github.com> Agent-Logs-Url: https://github.com/dotnet/SqlClient/sessions/7b4b00c6-634f-46f9-995a-09008508c2b1 --- .github/workflows/codeql.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 64584746df..864e09ec95 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -12,19 +12,10 @@ name: "CodeQL Advanced" on: - # Scan on pushes to main only. push: - branches: - - main - - # Scan on PRs that target matching branches. + branches: [ "release/7.0" ] pull_request: - branches: - - main - - feat/** - - dev/** - - # Scan weekly on Saturdays at 23:33 UTC + branches: [ "release/7.0" ] schedule: - cron: '33 23 * * 6' @@ -94,7 +85,9 @@ jobs: - name: Run manual build steps if: matrix.build-mode == 'manual' shell: bash - run: dotnet build src/Microsoft.Data.SqlClient.sln + run: | + mkdir packages + dotnet build src/ - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v4 From 85d1c4fe1910b4ecb7d4c81124b7c7b7162f8421 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Mar 2026 19:11:29 +0000 Subject: [PATCH 2/9] revert run step; set cron 1h after release/6.1 Co-authored-by: mdaigle <4722049+mdaigle@users.noreply.github.com> Agent-Logs-Url: https://github.com/dotnet/SqlClient/sessions/025591bc-7b29-46fe-ae24-43b4585edcb3 --- .github/workflows/codeql.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 864e09ec95..b7d328547e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -17,7 +17,7 @@ on: pull_request: branches: [ "release/7.0" ] schedule: - - cron: '33 23 * * 6' + - cron: '15 23 * * 6' jobs: analyze: @@ -85,9 +85,7 @@ jobs: - name: Run manual build steps if: matrix.build-mode == 'manual' shell: bash - run: | - mkdir packages - dotnet build src/ + run: dotnet build src/Microsoft.Data.SqlClient.sln - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v4 From 56f57b1e050e57eb5c3d2c6e22e697254dc80bdc Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Mar 2026 19:19:18 +0000 Subject: [PATCH 3/9] add release/7.0 triggers and schedules to PR and CI pipelines Co-authored-by: mdaigle <4722049+mdaigle@users.noreply.github.com> Agent-Logs-Url: https://github.com/dotnet/SqlClient/sessions/4d262759-7996-4d50-aaf8-73469d82b917 --- ...qlclient-ci-package-reference-pipeline.yml | 22 +++++++++++++++++++ ...qlclient-ci-project-reference-pipeline.yml | 22 +++++++++++++++++++ .../sqlclient-pr-package-ref-pipeline.yml | 1 + .../sqlclient-pr-project-ref-pipeline.yml | 1 + 4 files changed, 46 insertions(+) diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml index 262c2b909a..111461d935 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml @@ -61,6 +61,12 @@ trigger: # ADO internal/main branch. - internal/main + # GitHub release/7.0 branch. + - release/7.0 + + # ADO internal/release/7.0 branch. + - internal/release/7.0 + # Trigger this pipline on a schedule. schedules: @@ -80,6 +86,22 @@ schedules: - internal/main always: true + # GitHub release/7.0 on Sundays (1 hour after release/6.1's 04:30 UTC run). + - cron: '30 5 * * Sun' + displayName: Sunday Run (Release Config) + branches: + include: + - release/7.0 + always: true + + # ADO internal/release/7.0 on Sundays (1 hour after release/6.1's 05:30 UTC run). + - cron: '30 6 * * Sun' + displayName: Sunday Run (Release Config) + branches: + include: + - internal/release/7.0 + always: true + # Pipeline parameters, visible in the Azure DevOps UI. parameters: diff --git a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml index a5a78f0f8b..02e13e1f59 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml @@ -61,6 +61,12 @@ trigger: # ADO internal/main branch. - internal/main + # GitHub release/7.0 branch. + - release/7.0 + + # ADO internal/release/7.0 branch. + - internal/release/7.0 + # Trigger this pipline on a schedule. schedules: @@ -80,6 +86,22 @@ schedules: - internal/main always: true + # GitHub release/7.0 on Sundays (1 hour after release/6.1's 04:00 UTC run). + - cron: '0 5 * * Sun' + displayName: Sunday Run (Release Config) + branches: + include: + - release/7.0 + always: true + + # ADO internal/release/7.0 on Sundays (1 hour after release/6.1's 05:00 UTC run). + - cron: '0 6 * * Sun' + displayName: Sunday Run (Release Config) + branches: + include: + - internal/release/7.0 + always: true + # Pipeline parameters, visible in the Azure DevOps UI. parameters: diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml index 663532b905..ea766ddfbe 100644 --- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml +++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml @@ -33,6 +33,7 @@ pr: - dev/* - feat/* - main + - release/7.0 paths: include: diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml index 868b3010ff..6eec4788dc 100644 --- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml +++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml @@ -33,6 +33,7 @@ pr: - dev/* - feat/* - main + - release/7.0 paths: include: From cbe76877b4aeceda166821ad8ebb6305bf3236b3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Mar 2026 19:23:13 +0000 Subject: [PATCH 4/9] remove main and internal/main references from pipeline files Co-authored-by: mdaigle <4722049+mdaigle@users.noreply.github.com> Agent-Logs-Url: https://github.com/dotnet/SqlClient/sessions/3221bd78-8fcc-42fe-b331-69c2f1152332 --- ...qlclient-ci-package-reference-pipeline.yml | 38 ++----------------- ...qlclient-ci-project-reference-pipeline.yml | 38 ++----------------- .../sqlclient-pr-package-ref-pipeline.yml | 3 +- .../sqlclient-pr-project-ref-pipeline.yml | 3 +- 4 files changed, 10 insertions(+), 72 deletions(-) diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml index 111461d935..893abf40f2 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml @@ -14,18 +14,10 @@ # It runs via CI push triggers and schedules and uses the Release build # configuration: # -# - Commits to GitHub main -# - Commits to ADO internal/main -# - Weekdays at 03:00 UTC on GitHub main -# - Thursdays at 07:00 UTC on ADO internal/main -# -# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI. We are -# able to define different triggers and schedules using branch filters: -# -# - Only the GitHub repo has a 'main' branch, so its presence indicates that -# the pipeline run was triggered via GitHub. -# -# - Only the ADO repo has an 'internal/main' branch. +# - Commits to GitHub release/7.0 +# - Commits to ADO internal/release/7.0 +# - Sundays at 05:30 UTC on GitHub release/7.0 +# - Sundays at 06:30 UTC on ADO internal/release/7.0 # # Changes are batched together to ensure that the pipline never runs # concurrently. @@ -55,12 +47,6 @@ trigger: branches: include: - # GitHub main branch. - - main - - # ADO internal/main branch. - - internal/main - # GitHub release/7.0 branch. - release/7.0 @@ -70,22 +56,6 @@ trigger: # Trigger this pipline on a schedule. schedules: - # GitHub main on weekdays - - cron: '0 3 * * Mon-Fri' - displayName: Weekday Run (Release Config) - branches: - include: - - main - always: true - - # ADO internal/main on Thursdays. - - cron: '0 7 * * Thu' - displayName: Thursday Run (Release Config) - branches: - include: - - internal/main - always: true - # GitHub release/7.0 on Sundays (1 hour after release/6.1's 04:30 UTC run). - cron: '30 5 * * Sun' displayName: Sunday Run (Release Config) diff --git a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml index 02e13e1f59..83e360ce16 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml @@ -14,18 +14,10 @@ # It runs via CI push triggers and schedules and uses the Release build # configuration: # -# - Commits to GitHub main -# - Commits to ADO internal/main -# - Weekdays at 01:00 UTC on GitHub main -# - Thursdays at 05:00 UTC on ADO internal/main -# -# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI. We are -# able to define different triggers and schedules using branch filters: -# -# - Only the GitHub repo has a 'main' branch, so its presence indicates that -# the pipeline run was triggered via GitHub. -# -# - Only the ADO repo has an 'internal/main' branch. +# - Commits to GitHub release/7.0 +# - Commits to ADO internal/release/7.0 +# - Sundays at 05:00 UTC on GitHub release/7.0 +# - Sundays at 06:00 UTC on ADO internal/release/7.0 # # Changes are batched together to ensure that the pipline never runs # concurrently. @@ -55,12 +47,6 @@ trigger: branches: include: - # GitHub main branch. - - main - - # ADO internal/main branch. - - internal/main - # GitHub release/7.0 branch. - release/7.0 @@ -70,22 +56,6 @@ trigger: # Trigger this pipline on a schedule. schedules: - # GitHub main on weekdays - - cron: '0 1 * * Mon-Fri' - displayName: Weekday Run (Release Config) - branches: - include: - - main - always: true - - # ADO internal/main on Thursdays. - - cron: '0 5 * * Thu' - displayName: Thursday Run (Release Config) - branches: - include: - - internal/main - always: true - # GitHub release/7.0 on Sundays (1 hour after release/6.1's 04:00 UTC run). - cron: '0 5 * * Sun' displayName: Sunday Run (Release Config) diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml index ea766ddfbe..531b149830 100644 --- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml +++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml @@ -12,7 +12,7 @@ # - Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider # # It is triggered by pushes to PRs that target dev/ and feature/ branches, and -# the main branch in GitHub. +# the release/7.0 branch in GitHub. # # It maps to the "PR-SqlClient-Package" pipeline in the Public project: # @@ -32,7 +32,6 @@ pr: # GitHub repo branch targets that will trigger PR validation builds. - dev/* - feat/* - - main - release/7.0 paths: diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml index 6eec4788dc..713157a923 100644 --- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml +++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml @@ -12,7 +12,7 @@ # - Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider # # It is triggered by pushes to PRs that target dev/ and feature/ branches, and -# the main branch in GitHub. +# the release/7.0 branch in GitHub. # # It maps to the "PR-SqlClient-Project" pipeline in the Public project: # @@ -32,7 +32,6 @@ pr: # GitHub repo branch targets that will trigger PR validation builds. - dev/* - feat/* - - main - release/7.0 paths: From ee37b395bf014e75da92a8bc1e18525d9d3e38e0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Mar 2026 19:33:24 +0000 Subject: [PATCH 5/9] fix duplicate schedule displayNames; backport check-milestone workflow from #4055 Co-authored-by: mdaigle <4722049+mdaigle@users.noreply.github.com> Agent-Logs-Url: https://github.com/dotnet/SqlClient/sessions/bd8469d1-825d-4b26-8a0d-1b78ed90842f --- .github/workflows/check-milestone.yml | 24 +++++++++++++++++++ ...qlclient-ci-package-reference-pipeline.yml | 4 ++-- ...qlclient-ci-project-reference-pipeline.yml | 4 ++-- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/check-milestone.yml diff --git a/.github/workflows/check-milestone.yml b/.github/workflows/check-milestone.yml new file mode 100644 index 0000000000..da4681fd7b --- /dev/null +++ b/.github/workflows/check-milestone.yml @@ -0,0 +1,24 @@ +name: Check Milestone + +on: + pull_request: + types: [opened, edited, synchronize, milestoned, demilestoned] + +jobs: + check-milestone: + name: Validate milestone + runs-on: ubuntu-latest + permissions: + pull-requests: read + steps: + - name: Check milestone is set + if: github.event.pull_request.milestone == null + run: | + echo "::error::This PR does not have a milestone set. Please assign a milestone before merging." + exit 1 + + - name: Check milestone is open + if: github.event.pull_request.milestone != null && github.event.pull_request.milestone.state != 'open' + run: | + echo "::error::Milestone '${{ github.event.pull_request.milestone.title }}' is ${{ github.event.pull_request.milestone.state }}. Please assign an open milestone." + exit 1 diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml index 893abf40f2..0e721a95ee 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml @@ -58,7 +58,7 @@ schedules: # GitHub release/7.0 on Sundays (1 hour after release/6.1's 04:30 UTC run). - cron: '30 5 * * Sun' - displayName: Sunday Run (Release Config) + displayName: Sunday Run GitHub (Release Config) branches: include: - release/7.0 @@ -66,7 +66,7 @@ schedules: # ADO internal/release/7.0 on Sundays (1 hour after release/6.1's 05:30 UTC run). - cron: '30 6 * * Sun' - displayName: Sunday Run (Release Config) + displayName: Sunday Run ADO Internal (Release Config) branches: include: - internal/release/7.0 diff --git a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml index 83e360ce16..37849085f0 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml @@ -58,7 +58,7 @@ schedules: # GitHub release/7.0 on Sundays (1 hour after release/6.1's 04:00 UTC run). - cron: '0 5 * * Sun' - displayName: Sunday Run (Release Config) + displayName: Sunday Run GitHub (Release Config) branches: include: - release/7.0 @@ -66,7 +66,7 @@ schedules: # ADO internal/release/7.0 on Sundays (1 hour after release/6.1's 05:00 UTC run). - cron: '0 6 * * Sun' - displayName: Sunday Run (Release Config) + displayName: Sunday Run ADO Internal (Release Config) branches: include: - internal/release/7.0 From 54ef348085c6492aa8118cf2ceb8d6d7a2873d51 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Mar 2026 22:43:27 +0000 Subject: [PATCH 6/9] add GOTCHA comment; remove feat/* PR triggers; update dashboards for release/7.0 Co-authored-by: mdaigle <4722049+mdaigle@users.noreply.github.com> Agent-Logs-Url: https://github.com/dotnet/SqlClient/sessions/0427aaf1-39f9-4f5d-a0f4-e72432e47882 --- eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md | 2 ++ eng/dashboards/public-pipelines-ci-builds-by-branch.md | 2 ++ .../dotnet-sqlclient-ci-package-reference-pipeline.yml | 8 ++++++++ .../dotnet-sqlclient-ci-project-reference-pipeline.yml | 8 ++++++++ eng/pipelines/sqlclient-pr-package-ref-pipeline.yml | 1 - eng/pipelines/sqlclient-pr-project-ref-pipeline.yml | 1 - 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md b/eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md index 03a32d4e78..c6823c6bf3 100644 --- a/eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md +++ b/eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md @@ -15,6 +15,8 @@ The branches listed below indicate the repo branch used for the triggered runs. |MDS Main CI-Package|[internal/main](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient)|Release|No|Yes|Weekdays 01:00 UTC|YAML| |MDS Main CI|[internal/release/6.1](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.1&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML| |MDS Main CI-Package|[internal/release/6.1](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.1&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML| +|MDS Main CI|[internal/release/7.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F7.0&_a=contents)|Release|No|Yes|Sunday 06:00 UTC|YAML| +|MDS Main CI-Package|[internal/release/7.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F7.0&_a=contents)|Release|No|Yes|Sunday 06:30 UTC|YAML| |MDS Main CI|[internal/release/6.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.0&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML| |MDS Main CI-Package|[internal/release/6.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.0&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML| |Test-SqlClient-Kerberos-Azure|[main](https://github.com/dotnet/SqlClient)|Release|No|No|Mon-Fri 07:00 UTC|Classic UI| diff --git a/eng/dashboards/public-pipelines-ci-builds-by-branch.md b/eng/dashboards/public-pipelines-ci-builds-by-branch.md index ab6f3eb4e4..ce59ff25cf 100644 --- a/eng/dashboards/public-pipelines-ci-builds-by-branch.md +++ b/eng/dashboards/public-pipelines-ci-builds-by-branch.md @@ -18,5 +18,7 @@ PR pipelines run on the topic branch associated to the PR. |CI-SqlClient-Package|[main](https://github.com/dotnet/SqlClient)|Release|No|Yes|Weekdays 03:00 UTC|YAML| |CI-SqlClient|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|Yes|Sunday 04:00 UTC|YAML| |CI-SqlClient-Package|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|Yes|Sunday 04:30 UTC|YAML| +|CI-SqlClient|[release/7.0](https://github.com/dotnet/SqlClient/tree/release/7.0)|Release|No|Yes|Sunday 05:00 UTC|YAML| +|CI-SqlClient-Package|[release/7.0](https://github.com/dotnet/SqlClient/tree/release/7.0)|Release|No|Yes|Sunday 05:30 UTC|YAML| |CI-SqlClient|[release/6.0](https://github.com/dotnet/SqlClient/tree/release/6.0)|Release|No|Yes|Sunday 06:00 UTC|YAML| |CI-SqlClient-Package|[release/6.0](https://github.com/dotnet/SqlClient/tree/release/6.0)|Release|No|Yes|Sunday 06:30 UTC|YAML| diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml index 0e721a95ee..67c991f0ec 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml @@ -19,6 +19,14 @@ # - Sundays at 05:30 UTC on GitHub release/7.0 # - Sundays at 06:30 UTC on ADO internal/release/7.0 # +# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI. We are +# able to define different triggers and schedules using branch filters: +# +# - Only the GitHub repo has a 'release/7.0' branch, so its presence indicates +# that the pipeline run was triggered via GitHub. +# +# - Only the ADO repo has an 'internal/release/7.0' branch. +# # Changes are batched together to ensure that the pipline never runs # concurrently. # diff --git a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml index 37849085f0..f3974f541b 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml @@ -19,6 +19,14 @@ # - Sundays at 05:00 UTC on GitHub release/7.0 # - Sundays at 06:00 UTC on ADO internal/release/7.0 # +# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI. We are +# able to define different triggers and schedules using branch filters: +# +# - Only the GitHub repo has a 'release/7.0' branch, so its presence indicates +# that the pipeline run was triggered via GitHub. +# +# - Only the ADO repo has an 'internal/release/7.0' branch. +# # Changes are batched together to ensure that the pipline never runs # concurrently. # diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml index 531b149830..35ec3a15cd 100644 --- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml +++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml @@ -31,7 +31,6 @@ pr: include: # GitHub repo branch targets that will trigger PR validation builds. - dev/* - - feat/* - release/7.0 paths: diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml index 713157a923..c12fcee659 100644 --- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml +++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml @@ -31,7 +31,6 @@ pr: include: # GitHub repo branch targets that will trigger PR validation builds. - dev/* - - feat/* - release/7.0 paths: From 0d1e66521b12cfa22f30ea6ac60810237c4ad967 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Mar 2026 23:09:42 +0000 Subject: [PATCH 7/9] move release/7.0 dashboard entries to just below main entries Co-authored-by: mdaigle <4722049+mdaigle@users.noreply.github.com> Agent-Logs-Url: https://github.com/dotnet/SqlClient/sessions/21758ed2-c41e-42a2-96a2-d7b7624bf4bd --- eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md | 4 ++-- eng/dashboards/public-pipelines-ci-builds-by-branch.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md b/eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md index c6823c6bf3..ef6ed4a268 100644 --- a/eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md +++ b/eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md @@ -13,10 +13,10 @@ The branches listed below indicate the repo branch used for the triggered runs. |-|-|-|-|-|-|-| |MDS Main CI|[internal/main](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient)|Release|No|Yes|Weekdays 01:00 UTC|YAML| |MDS Main CI-Package|[internal/main](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient)|Release|No|Yes|Weekdays 01:00 UTC|YAML| -|MDS Main CI|[internal/release/6.1](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.1&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML| -|MDS Main CI-Package|[internal/release/6.1](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.1&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML| |MDS Main CI|[internal/release/7.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F7.0&_a=contents)|Release|No|Yes|Sunday 06:00 UTC|YAML| |MDS Main CI-Package|[internal/release/7.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F7.0&_a=contents)|Release|No|Yes|Sunday 06:30 UTC|YAML| +|MDS Main CI|[internal/release/6.1](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.1&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML| +|MDS Main CI-Package|[internal/release/6.1](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.1&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML| |MDS Main CI|[internal/release/6.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.0&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML| |MDS Main CI-Package|[internal/release/6.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.0&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML| |Test-SqlClient-Kerberos-Azure|[main](https://github.com/dotnet/SqlClient)|Release|No|No|Mon-Fri 07:00 UTC|Classic UI| diff --git a/eng/dashboards/public-pipelines-ci-builds-by-branch.md b/eng/dashboards/public-pipelines-ci-builds-by-branch.md index ce59ff25cf..8dfad35070 100644 --- a/eng/dashboards/public-pipelines-ci-builds-by-branch.md +++ b/eng/dashboards/public-pipelines-ci-builds-by-branch.md @@ -16,9 +16,9 @@ PR pipelines run on the topic branch associated to the PR. |PR-SqlClient-Package|N/A|Debug|Yes|No|None|YAML| |CI-SqlClient|[main](https://github.com/dotnet/SqlClient)|Release|No|Yes|Weekdays 01:00 UTC|YAML| |CI-SqlClient-Package|[main](https://github.com/dotnet/SqlClient)|Release|No|Yes|Weekdays 03:00 UTC|YAML| -|CI-SqlClient|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|Yes|Sunday 04:00 UTC|YAML| -|CI-SqlClient-Package|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|Yes|Sunday 04:30 UTC|YAML| |CI-SqlClient|[release/7.0](https://github.com/dotnet/SqlClient/tree/release/7.0)|Release|No|Yes|Sunday 05:00 UTC|YAML| |CI-SqlClient-Package|[release/7.0](https://github.com/dotnet/SqlClient/tree/release/7.0)|Release|No|Yes|Sunday 05:30 UTC|YAML| +|CI-SqlClient|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|Yes|Sunday 04:00 UTC|YAML| +|CI-SqlClient-Package|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|Yes|Sunday 04:30 UTC|YAML| |CI-SqlClient|[release/6.0](https://github.com/dotnet/SqlClient/tree/release/6.0)|Release|No|Yes|Sunday 06:00 UTC|YAML| |CI-SqlClient-Package|[release/6.0](https://github.com/dotnet/SqlClient/tree/release/6.0)|Release|No|Yes|Sunday 06:30 UTC|YAML| From 391eaac29b2b3e6250692cf8c985caf5b06ab1dd Mon Sep 17 00:00:00 2001 From: Malcolm Daigle Date: Tue, 24 Mar 2026 08:59:52 -0700 Subject: [PATCH 8/9] Add 'copilot/*' branch to PR validation triggers --- eng/pipelines/sqlclient-pr-package-ref-pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml index 35ec3a15cd..5f09ba2649 100644 --- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml +++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml @@ -31,6 +31,7 @@ pr: include: # GitHub repo branch targets that will trigger PR validation builds. - dev/* + - copilot/* - release/7.0 paths: From 022aebdf5e1acb6f75a35247073f01cce653f379 Mon Sep 17 00:00:00 2001 From: Malcolm Daigle Date: Tue, 24 Mar 2026 09:03:05 -0700 Subject: [PATCH 9/9] Update branch triggers for PR validation Removed 'copilot/*' branch from PR validation triggers. --- eng/pipelines/sqlclient-pr-package-ref-pipeline.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml index 5f09ba2649..35ec3a15cd 100644 --- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml +++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml @@ -31,7 +31,6 @@ pr: include: # GitHub repo branch targets that will trigger PR validation builds. - dev/* - - copilot/* - release/7.0 paths: