Merge branch 'main' into merge/release/10.0-to-main

Author: AndriySvyryd

.azuredevops/dependabot.yml

@@ -0,0 +1,5 @@
+version: 2
+
+# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
+enable-campaigned-updates: false
+enable-security-updates: false

.github/CODEOWNERS

@@ -1,12 +1,14 @@
 # Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
 # See https://help.github.com/articles/about-code-owners/
 
-/azure-pipelines.yml                    @AndriySvyryd @cincuranet
-/azure-pipelines-public.yml             @AndriySvyryd @cincuranet
-/github-merge-flow.jsonc                @AndriySvyryd @cincuranet
-/global.json                            @AndriySvyryd @cincuranet
-/NuGet.config                           @AndriySvyryd @cincuranet
+/azure-pipelines.yml                    @AndriySvyryd
+/azure-pipelines-public.yml             @AndriySvyryd
+/azure-pipelines-internal-tests.yml     @AndriySvyryd
+/github-merge-flow.jsonc                @AndriySvyryd
+/global.json                            @AndriySvyryd
+/NuGet.config                           @AndriySvyryd
 /.config/                               @AndriySvyryd
 /.github/                               @dotnet/efteam
-/eng/                                   @AndriySvyryd @cincuranet
+/eng/                                   @AndriySvyryd
 /src/                                   @dotnet/efteam
+/test/                                  @dotnet/efteam

.github/ISSUE_TEMPLATE/04_feature_request.yml

@@ -1,6 +1,7 @@
 name: 💡 Feature request
 description: Suggest an idea for this project.
 labels: ["customer-reported"]
+type: feature
 body:
   - type: textarea
     id: problem

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 Please check whether the PR fulfills these requirements
 -->
 
-- [ ] I've read the guidelines for [contributing](CONTRIBUTING.md) and seen the [walkthrough](https://youtu.be/9OMxy1wal1s?t=1869)
+- [ ] I've read the guidelines for [contributing](https://github.com/dotnet/efcore/blob/main/.github/CONTRIBUTING.md) and seen the [walkthrough](https://youtu.be/9OMxy1wal1s?t=1869)
 - [ ] I've posted a comment on an issue with a detailed description of how I am planning to contribute and got approval from a member of the team
 - [ ] The code builds and tests pass locally (also verified by our automated build checks)
 - [ ] Commit messages follow this format:

.github/copilot-instructions.md

@@ -12,7 +12,7 @@ If you are not sure, do not guess, just tell that you don't know or ask clarifyi
 - Use the rules defined in the .editorconfig file in the root of the repository for any ambiguous cases
 - Write code that is clean, maintainable, and easy to understand
 - Favor readability over brevity, but keep methods focused and concise
-- Only add comments rarely to explain why a non-intuitive solution was used. The code should be self-explanatory otherwise
+- **Prefer minimal comments** - The code should be self-explanatory. Add comments sparingly and only to explain *why* a non-intuitive solution was necessary, not *what* the code does. Comments are appropriate for complex logic, public APIs, or domain-specific implementations where context would otherwise be unclear
 - Add license header to all files:
 ```
     // Licensed to the .NET Foundation under one or more agreements.
@@ -48,8 +48,9 @@ If you are not sure, do not guess, just tell that you don't know or ask clarifyi
 - Use `var` for local variables
 - Use expression-bodied members where appropriate
 - Prefer using collection expressions when possible
-- Use `is` pattern matching instead of `as` and null checks
+- Use `is` pattern matching instead of `as` followed by null checks (e.g., `if (obj is SomeType typed)` instead of `var typed = obj as SomeType; if (typed != null)`)
 - Prefer `switch` expressions over `switch` statements when appropriate
+- Prefer pattern matching with `when` clauses in switch expressions for conditional logic
 - Prefer field-backed property declarations using field contextual keyword instead of an explicit field.
 - Prefer range and index from end operators for indexer access
 - The projects use implicit namespaces, so do not add `using` directives for namespaces that are already imported by the project
@@ -75,6 +76,7 @@ If you are not sure, do not guess, just tell that you don't know or ask clarifyi
 - Use nullable reference types
 - Use proper null-checking patterns
 - Use the null-conditional operator (`?.`) and null-coalescing operator (`??`) when appropriate
+- Don't disable nullability with a preprocessor directive (`#nullable disable`)
 
 ## Architecture and Design Patterns
 
@@ -89,6 +91,8 @@ If you are not sure, do not guess, just tell that you don't know or ask clarifyi
 - Create both unit tests and functional tests where appropriate
 - Fix `SQL` and `C#` baselines for tests when necessary by setting the `EF_TEST_REWRITE_BASELINES` env var to `1`
 - Run tests with project rebuilding enabled (don't use `--no-build`) to ensure code changes are picked up
+- When testing cross-platform code (e.g., file paths, path separators), verify the fix works on both Windows and Linux/macOS
+- When testing `dotnet-ef` tool changes, create a test project and manually run the affected commands to verify behavior
 
 #### Environment Setup
 - **ALWAYS** run `restore.cmd` (Windows) or `. ./restore.sh` (Linux/Mac) first to restore dependencies
@@ -110,6 +114,13 @@ If you are not sure, do not guess, just tell that you don't know or ask clarifyi
 - **ALL** user-facing error messages must use string resources from the `.resx` (and the generated `.Designer.cs`) file corresponding to the project
 - Avoid catching exceptions without rethrowing them
 
+## Dependency and Version Management
+
+- **NEVER** hardcode package versions in `.csproj` files
+- Check `eng/Versions.props` for existing version properties (e.g., `$(SQLitePCLRawVersion)`) before adding or updating package references
+- Use `Directory.Packages.props` for NuGet package version management with Central Package Management (CPM)
+- Packages listed in `eng/Version.Details.xml` are managed by Maestro dependency flow and should not be updated manually or by Dependabot
+
 ## Asynchronous Programming
 
 - Provide both synchronous and asynchronous versions of methods where appropriate
@@ -129,6 +140,7 @@ If you are not sure, do not guess, just tell that you don't know or ask clarifyi
 
 - Write code that is secure by default. Avoid exposing potentially private or sensitive data
 - Make code NativeAOT compatible when possible. This means avoiding dynamic code generation, reflection, and other features that are not compatible with NativeAOT. If not possible, mark the code with an appropriate annotation or throw an exception
+- After implementing a fix, review the surrounding code for similar patterns that might need the same change
 
 ### Entity Framework Core Specific guidelines
 
@@ -153,6 +165,10 @@ If you are not sure, do not guess, just tell that you don't know or ask clarifyi
 - .github/: GitHub-specific files, workflows, and Copilot instructions
 - .config/: AzDo pipelines configuration files
 
+## Pull Request Guidelines
+
+- **ALWAYS** target the `main` branch for new PRs unless explicitly instructed otherwise
+
 ## Overview of Entity Framework Core
 
 Entity Framework Core (EF Core) is an object-database mapper for .NET. Below is a concise summary of its core architecture and concepts:

.github/dependabot.yml

@@ -1,40 +1,36 @@
 version: 2
-registries:
-  nuget.org:
-    type: nuget-feed
-    url: https://api.nuget.org/v3/index.json
 updates:
-  - package-ecosystem: nuget
-    directory: /
+  - package-ecosystem: "nuget"
+    directory: "/"
+    open-pull-requests-limit: 5
     schedule:
-      interval: weekly
-    allow:
-      - dependency-name: Azure.Identity
-      - dependency-name: Castle.Core
-      - dependency-name: Grpc.AspNetCore
-      - dependency-name: Humanizer.Core
-      - dependency-name: IdentityServer4.EntityFramework
-      - dependency-name: Microsoft.AspNetCore.Identity.EntityFrameworkCore
-      - dependency-name: Microsoft.AspNetCore.OData
-      - dependency-name: Microsoft.Azure.Cosmos
-      - dependency-name: Microsoft.CSharp
-      - dependency-name: Microsoft.Data.SqlClient
-      - dependency-name: Microsoft.DotNet.PlatformAbstractions
-      - dependency-name: Microsoft.SqlServer.Types
-      - dependency-name: mod_spatialite
-      - dependency-name: Mono.TextTemplating
-      - dependency-name: NetTopologySuite*
-      - dependency-name: Newtonsoft.Json
-      - dependency-name: SQLitePCLRaw*
+      interval: "weekly"
+    labels:
+      - "area-infrastructure"
     ignore:
-      # Affects minimum required Visual Studio version
-      - dependency-name: Microsoft.CodeAnalysis.CSharp*
-      # New analyzer rules would need to be disabled
-      - dependency-name: DotNetAnalyzers.DocumentationAnalyzers
-      - dependency-name: StyleCop.Analyzers
-      # Testing infrastructure should be intentionally updated
-      - dependency-name: BenchmarkDotNet
+      # Packages managed by Maestro dependency flow (eng/Version.Details.props)
+      - dependency-name: "Microsoft.DotNet.Arcade.Sdk"
+      - dependency-name: "Microsoft.DotNet.Build.Tasks.Templating"
+      - dependency-name: "Microsoft.DotNet.Helix.Sdk"
+      - dependency-name: "Microsoft.Extensions.Caching.Memory"
+      - dependency-name: "Microsoft.Extensions.Configuration"
+      - dependency-name: "Microsoft.Extensions.Configuration.Abstractions"
+      - dependency-name: "Microsoft.Extensions.Configuration.EnvironmentVariables"
+      - dependency-name: "Microsoft.Extensions.Configuration.Json"
+      - dependency-name: "Microsoft.Extensions.DependencyInjection"
+      - dependency-name: "Microsoft.Extensions.DependencyModel"
+      - dependency-name: "Microsoft.Extensions.HostFactoryResolver.Sources"
+      - dependency-name: "Microsoft.Extensions.Logging"
+      - dependency-name: "Microsoft.NETCore.App.Ref"
+      - dependency-name: "Microsoft.NETCore.Platforms"
+      - dependency-name: "System.Formats.Asn1"
+      - dependency-name: "System.Runtime.Caching"
+      - dependency-name: "System.Text.Encodings.Web"
+      - dependency-name: "System.Text.Json"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
     labels:
-      - area-infrastructure
-      - 'type-dependency update :arrow_up_small:'
-    registries: '*'
+      - "area-infrastructure"

.github/workflows/TestCosmos.yaml

@@ -1,6 +1,11 @@
 name: Test Cosmos
 
 on:
+  push:
+    branches:
+      - main
+      - feature/*
+      - release/*
   pull_request:
     branches:
       - main
@@ -20,22 +25,18 @@ jobs:
           Start-CosmosDbEmulator -Timeout 540 -NoUI -NoTelemetry -NoFirewall -EnablePreview
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Restore
         run: restore.cmd
         shell: cmd
 
-      - name: Build
-        run: build.cmd /p:Projects=${{ github.workspace }}\test\EFCore.Cosmos.FunctionalTests\EFCore.Cosmos.FunctionalTests.csproj
-        shell: cmd
-
       - name: Test on Cosmos
-        run: test.cmd /p:Projects=${{ github.workspace }}\test\EFCore.Cosmos.FunctionalTests\EFCore.Cosmos.FunctionalTests.csproj
+        run: dotnet test test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj
         shell: cmd
 
       - name: Publish Test Results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: always()
         with:
           name: test-results

.github/workflows/TestSqlServer.yaml

@@ -0,0 +1,61 @@
+name: Test SQL Server
+
+on:
+  push:
+    branches:
+      - main
+      - feature/*
+      - release/*
+  pull_request:
+    branches:
+      - main
+      - feature/*
+      - release/*
+
+permissions: {}
+
+jobs:
+  test:
+    runs-on: ubuntu-24.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        sqlserver_version: [2025, 2022, 2019]
+
+    env:
+      MSSQL_SA_PASSWORD: 'PLACEHOLDERPass$$w0rd'
+
+    services:
+      mssql:
+        image: mcr.microsoft.com/mssql/server:${{ matrix.sqlserver_version }}-latest
+        env:
+          ACCEPT_EULA: Y
+          SA_PASSWORD: ${{ env.MSSQL_SA_PASSWORD }}
+        ports:
+          - 1433:1433
+        options: >-
+          --health-cmd="/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'SELECT 1' -C"
+          --health-start-period=20s
+          --health-interval=2s
+          --health-retries=30
+          --health-timeout=5s
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Restore
+        run: ./restore.sh
+
+      - name: Test on SQL Server
+        env:
+          Test__SqlServer__DefaultConnection: 'Server=localhost;Database=master;User=SA;Password=${{ env.MSSQL_SA_PASSWORD }};Connect Timeout=60;ConnectRetryCount=0;Trust Server Certificate=true'
+        run: dotnet test test/EFCore.SqlServer.FunctionalTests
+
+      - name: Publish Test Results
+        uses: actions/upload-artifact@v6
+        if: always()
+        with:
+          name: test-results-sqlserver-${{ matrix.sqlserver_version }}
+          path: artifacts/log/Debug/*

.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1,43 @@
+name: "Copilot Setup Steps"
+
+# See https://docs.github.com/en/copilot/how-tos/use-copilot-agents/coding-agent/customize-the-agent-environment
+
+# Automatically run the setup steps when they are changed to allow for easy validation, and
+# allow manual testing through the repository's "Actions" tab
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+
+permissions: {}
+
+jobs:
+  # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
+  copilot-setup-steps:
+    runs-on: ubuntu-24.04
+
+    # Install SQL Server via a docker container.
+    # It's better to do this rather than e.g. use a testcontainer, because then the agent can reuse the same container
+    # and instance of SQL Server rather than have to start it up each time it needs to iterate and run a test.
+    services:
+      mssql:
+        image: mcr.microsoft.com/mssql/server:2025-latest
+        env:
+          ACCEPT_EULA: Y
+          SA_PASSWORD: 'PLACEHOLDERPass$$w0rd'
+        ports:
+          - 1433:1433
+        options: >-
+          --health-cmd="/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'SELECT 1' -C"
+          --health-start-period=20s
+          --health-interval=2s
+          --health-retries=30
+          --health-timeout=5s
+
+    steps:
+      - name: Export connection string for the agent's session
+        run: echo "Test__SqlServer__DefaultConnection=Server=localhost;Database=master;User=SA;Password=PLACEHOLDERPass$$w0rd;Connect Timeout=60;ConnectRetryCount=0;Trust Server Certificate=true" >> "$GITHUB_ENV"