Skip to content

Improved ADO pipeline and branch configs #3437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .azuredevops/policies/approvercountpolicy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# This file configures the Approver Count Policy Validator status check. Some
# settings here are similar to branch policies specified via the Azure DevOps UI
# that govern how PRs are approved in general. The settings here dictate how
# the validator behaves, and it can also prevent PRs from completing.
#
# Suggested by Merlinbot (https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient/pullrequest/4982)

name: approver_count
description: Approver count policy for dotnet-sqlclient
resource: repository
where:
configuration:
approverCountPolicySettings:
isBlocking: true
requireMinimumApproverCount: 2
creatorVoteCounts: false
allowDownvotes: false
sourcePushOptions:
resetOnSourcePush: true
requireVoteOnLastIteration: true
requireVoteOnEachIteration: false
resetRejectionsOnSourcePush: false
blockLastPusherVote: true
branchNames:
- refs/heads/internal/main
- refs/heads/internal/release/6.0
- refs/heads/internal/release/5.2
- refs/heads/internal/release/5.1
displayName: dotnet-sqlclient Approver Count Policy
2 changes: 2 additions & 0 deletions eng/pipelines/dotnet-sqlclient-signing-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ extends:
template: v2/OneBranch.${{parameters.oneBranchType }}.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
parameters:
featureFlags:
# Suggested by MerlinBot (https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient/pullrequest/4882)
EnableCDPxPAT: false
WindowsHostVersion: 1ESWindows2022
globalSdl: # https://aka.ms/obpipelines/sdl
tsa:
Expand Down
Loading