Merge main

Author: edwardneal

.azuredevops/policies/approvercountpolicy.yml

@@ -3,10 +3,10 @@
 # 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)
+#  https://eng.ms/docs/coreai/devdiv/one-engineering-system-1es/1es-docs/policy-service/policy-as-code/approver-count-policy-overview
 
 name: approver_count
-description: Approver count policy for dotnet-sqlclient
+description: Approver count policy for dotnet-sqlclient [internal/main]
 resource: repository
 where: 
 configuration:
@@ -22,8 +22,5 @@ configuration:
       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
+    - internal/main
+    displayName: dotnet-sqlclient Approver Count Policy [internal/main]

.config/CredScanSuppressions.json

@@ -12,6 +12,14 @@
     {
       "file": "doc/samples/SqlConnectionStringBuilder.cs",
       "justification": "Documentation could include sample data and can be ignored"
+    },
+    {
+      "file": "src/Microsoft.Data.SqlClient/tests/UnitTests/Fixtures/AlwaysEncrypted/NativeColumnEncryptionKeyCertificateBaselineFixture.cs",
+      "justification": "Test projects should be skipped"
+    },
+    {
+      "file": "src/Microsoft.Data.SqlClient/tests/UnitTests/Resources/AlwaysEncrypted/NativeColumnEncryptionKeyBaseline/Certificate.pfx",
+      "justification": "Test projects should be skipped"
     }
   ]
 }

.github/workflows/codeql.yml

@@ -0,0 +1,98 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '33 23 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: csharp
+          build-mode: manual
+        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Setup .NET Core SDK
+      uses: actions/[email protected]
+      with:
+        # TODO: Update this to .NET 10 once PR #3686 is complete.
+        # TODO: Replace this with global-json-file once PR #3797 is complete.
+        dotnet-version: 9.x
+        dotnet-quality: ga
+        #global-json-file: global.json
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v4
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - name: Run manual build steps
+      if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        mkdir packages
+        dotnet build src/
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v4
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/stale.yml

@@ -0,0 +1,86 @@
+name: Close Stale Issues and PRs
+
+on:
+  schedule:
+    # Run daily at 2:00 AM UTC
+    - cron: "0 2 * * *"
+  workflow_dispatch: # Allow manual triggering
+
+permissions:
+  issues: write
+  pull-requests: write
+  contents: read
+
+jobs:
+  close-stale:
+    runs-on: ubuntu-latest
+    name: Close stale Issues and PRs
+
+    steps:
+      - name: Close stale Issues and PRs
+        # Uses action https://github.com/actions/stale
+        uses: actions/stale@v10
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+          # Labels to identify stale issues
+          stale-issue-label: "stale"
+          stale-pr-label: "stale"
+
+          # Marks issues and PRs as stale after 30 days of inactivity
+          days-before-stale: 30
+
+          # Close issues after 7 days of inactivity once marked as stale
+          days-before-close: 7
+
+          # Issues
+
+          # Labels that indicate an issue needs more info or is waiting for customer
+          only-issue-labels: "Needs More Info :information_source:,Waiting for Customer :hourglass_flowing_sand:"
+
+          stale-issue-message: |
+            This issue has been marked as requiring more information or is waiting for a customer response. It has not been updated for more than 30 days.
+
+            If you have additional information or would like to provide an update, please respond to this issue. Otherwise, it will be closed automatically in 7 days.
+
+          # Message to post when closing the issue
+          close-issue-message: |
+            This issue has been automatically closed due to inactivity. It was labeled as stale, and has not been updated since then.
+
+            If you believe this issue is still relevant and needs attention, please feel free to reopen it with the additional information requested, or create a new issue with updated details.
+
+            Thank you for your contribution to the Microsoft.Data.SqlClient project!
+
+          # Don't close issues that have these labels (exemptions)
+          exempt-issue-labels: "P0,P1,P2"
+
+          # Pull Requests
+
+          # Message to post when marking the PR as stale
+          stale-pr-message: |
+            This pull request has been marked as stale due to inactivity for more than 30 days.
+
+            If you would like to keep this pull request open, please provide an update or respond to any comments. Otherwise, it will be closed automatically in 7 days.
+
+          # Message to post when closing the PR
+          close-pr-message: |
+            This pull request has been automatically closed due to inactivity. It was labeled as stale, and has not been updated since then.
+
+            If you believe this pull request is still relevant and needs attention, please feel free to reopen it or create a new pull request with updated changes.
+
+            Thank you for your contribution to the Microsoft.Data.SqlClient project!
+
+          # Don't mark draft PRs as stale
+          exempt-draft-pr: true
+
+          # Enable debug logging
+          debug-only: false
+
+          # Remove stale label when closing (cleanup)
+          remove-stale-when-updated: true
+
+          # Limit the number of operations per run to avoid API rate limits
+          operations-per-run: 50
+
+          # Enable ascending order (oldest first)
+          ascending: true