Skip to content

Commit f5d536d

Browse files
AndriySvyrydAndriySvyryd
authored
Merge branch 'main' into merge/release/10.0-to-main
2 parents 5e28bfb + a9895a5 commit f5d536d

594 files changed

Lines changed: 26048 additions & 16379 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.azuredevops/dependabot.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: 2
2+
3+
# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
4+
enable-campaigned-updates: false
5+
enable-security-updates: false

‎.github/ISSUE_TEMPLATE/04_feature_request.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: 💡 Feature request
22
description: Suggest an idea for this project.
33
labels: ["customer-reported"]
4+
type: feature
45
body:
56
- type: textarea
67
id: problem

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Please check whether the PR fulfills these requirements
33
-->
44

5-
- [ ] I've read the guidelines for [contributing](CONTRIBUTING.md) and seen the [walkthrough](https://youtu.be/9OMxy1wal1s?t=1869)
5+
- [ ] 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)
66
- [ ] 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
77
- [ ] The code builds and tests pass locally (also verified by our automated build checks)
88
- [ ] Commit messages follow this format:

‎.github/dependabot.yml‎

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,16 @@
11
version: 2
2-
registries:
3-
nuget.org:
4-
type: nuget-feed
5-
url: https://api.nuget.org/v3/index.json
62
updates:
7-
- package-ecosystem: nuget
8-
directory: /
3+
- package-ecosystem: "nuget"
4+
directory: "/eng/dependabot"
5+
open-pull-requests-limit: 5
96
schedule:
10-
interval: weekly
11-
allow:
12-
- dependency-name: Azure.Identity
13-
- dependency-name: Castle.Core
14-
- dependency-name: Grpc.AspNetCore
15-
- dependency-name: Humanizer.Core
16-
- dependency-name: IdentityServer4.EntityFramework
17-
- dependency-name: Microsoft.AspNetCore.Identity.EntityFrameworkCore
18-
- dependency-name: Microsoft.AspNetCore.OData
19-
- dependency-name: Microsoft.Azure.Cosmos
20-
- dependency-name: Microsoft.CSharp
21-
- dependency-name: Microsoft.Data.SqlClient
22-
- dependency-name: Microsoft.DotNet.PlatformAbstractions
23-
- dependency-name: Microsoft.SqlServer.Types
24-
- dependency-name: mod_spatialite
25-
- dependency-name: Mono.TextTemplating
26-
- dependency-name: NetTopologySuite*
27-
- dependency-name: Newtonsoft.Json
28-
- dependency-name: SQLitePCLRaw*
29-
ignore:
30-
# Affects minimum required Visual Studio version
31-
- dependency-name: Microsoft.CodeAnalysis.CSharp*
32-
# New analyzer rules would need to be disabled
33-
- dependency-name: DotNetAnalyzers.DocumentationAnalyzers
34-
- dependency-name: StyleCop.Analyzers
35-
# Testing infrastructure should be intentionally updated
36-
- dependency-name: BenchmarkDotNet
7+
interval: "weekly"
378
labels:
38-
- area-infrastructure
39-
- 'type-dependency update :arrow_up_small:'
40-
registries: '*'
9+
- "area-infrastructure"
10+
11+
- package-ecosystem: "github-actions"
12+
directory: "/"
13+
schedule:
14+
interval: "weekly"
15+
labels:
16+
- "area-infrastructure"

‎.github/workflows/TestCosmos.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: Test Cosmos
22

33
on:
4+
push:
5+
branches:
6+
- main
7+
- feature/*
8+
- release/*
49
pull_request:
510
branches:
611
- main
@@ -20,7 +25,7 @@ jobs:
2025
Start-CosmosDbEmulator -Timeout 540 -NoUI -NoTelemetry -NoFirewall -EnablePreview
2126
2227
- name: Checkout
23-
uses: actions/checkout@v4
28+
uses: actions/checkout@v6
2429

2530
- name: Restore
2631
run: restore.cmd
@@ -35,7 +40,7 @@ jobs:
3540
shell: cmd
3641

3742
- name: Publish Test Results
38-
uses: actions/upload-artifact@v4
43+
uses: actions/upload-artifact@v6
3944
if: always()
4045
with:
4146
name: test-results

‎.github/workflows/TestSqlServer.yaml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Test SQL Server
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- feature/*
8+
- release/*
9+
pull_request:
10+
branches:
11+
- main
12+
- feature/*
13+
- release/*
14+
15+
permissions: {}
16+
17+
jobs:
18+
test:
19+
runs-on: ubuntu-24.04
20+
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
sqlserver_version: [2025, 2022, 2019]
25+
26+
env:
27+
MSSQL_SA_PASSWORD: 'PLACEHOLDERPass$$w0rd'
28+
29+
services:
30+
mssql:
31+
image: mcr.microsoft.com/mssql/server:${{ matrix.sqlserver_version }}-latest
32+
env:
33+
ACCEPT_EULA: Y
34+
SA_PASSWORD: ${{ env.MSSQL_SA_PASSWORD }}
35+
ports:
36+
- 1433:1433
37+
options: >-
38+
--health-cmd="/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'SELECT 1' -C"
39+
--health-start-period=20s
40+
--health-interval=2s
41+
--health-retries=30
42+
--health-timeout=5s
43+
44+
steps:
45+
- name: Checkout
46+
uses: actions/checkout@v6
47+
48+
- name: Restore
49+
run: ./restore.sh
50+
51+
- name: Test on SQL Server
52+
env:
53+
Test__SqlServer__DefaultConnection: 'Server=localhost;Database=master;User=SA;Password=${{ env.MSSQL_SA_PASSWORD }};Connect Timeout=60;ConnectRetryCount=0;Trust Server Certificate=true'
54+
run: dotnet test test/EFCore.SqlServer.FunctionalTests
55+
56+
- name: Publish Test Results
57+
uses: actions/upload-artifact@v6
58+
if: always()
59+
with:
60+
name: test-results-sqlserver-${{ matrix.sqlserver_version }}
61+
path: artifacts/log/Debug/*

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "Copilot Setup Steps"
2+
3+
# See https://docs.github.com/en/copilot/how-tos/use-copilot-agents/coding-agent/customize-the-agent-environment
4+
5+
# Automatically run the setup steps when they are changed to allow for easy validation, and
6+
# allow manual testing through the repository's "Actions" tab
7+
on:
8+
workflow_dispatch:
9+
push:
10+
paths:
11+
- .github/workflows/copilot-setup-steps.yml
12+
pull_request:
13+
paths:
14+
- .github/workflows/copilot-setup-steps.yml
15+
16+
permissions: {}
17+
18+
jobs:
19+
# The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
20+
copilot-setup-steps:
21+
runs-on: ubuntu-24.04
22+
23+
# Install SQL Server via a docker container.
24+
# It's better to do this rather than e.g. use a testcontainer, because then the agent can reuse the same container
25+
# and instance of SQL Server rather than have to start it up each time it needs to iterate and run a test.
26+
services:
27+
mssql:
28+
image: mcr.microsoft.com/mssql/server:2025-latest
29+
env:
30+
ACCEPT_EULA: Y
31+
SA_PASSWORD: 'PLACEHOLDERPass$$w0rd'
32+
ports:
33+
- 1433:1433
34+
options: >-
35+
--health-cmd="/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'SELECT 1' -C"
36+
--health-start-period=20s
37+
--health-interval=2s
38+
--health-retries=30
39+
--health-timeout=5s
40+
41+
steps:
42+
- name: Export connection string for the agent's session
43+
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"

‎Directory.Packages.props‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
2-
<!-- Workaround https://github.com/dependabot/dependabot-core/issues/8490 -->
32
<!-- This file gets imported for out-of-tree test runs also where eng/Versions.props isn't
43
available -->
54
<Import Project="eng/Versions.props" Condition="'$(VersionPrefix)' == '' and Exists('eng/Versions.props')" />
5+
<Import Project="eng/dependabot/Directory.Packages.props" Condition="Exists('eng/dependabot/Directory.Packages.props')" />
66
<PropertyGroup>
77
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
88
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
@@ -27,34 +27,13 @@
2727
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisWorkspacesMSBuildVersion)" />
2828

2929
<!-- analyzer dependencies-->
30-
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
31-
<PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
30+
<GlobalPackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersVersion)" />
31+
<PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="$(DotNetAnalyzersDocumentationAnalyzersVersion)" />
3232

3333
<!-- build dependencies-->
34-
<PackageVersion Include="Microsoft.Build.Locator" Version="1.10.2" />
3534
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
3635
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
3736
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
3837
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" />
39-
40-
<!-- Azure SDK for .NET dependencies -->
41-
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.51.0" />
42-
43-
<!-- SQL Server dependencies -->
44-
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.1" />
45-
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
46-
47-
<!-- external dependencies -->
48-
<PackageVersion Include="Castle.Core" Version="5.2.1" />
49-
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
50-
<PackageVersion Include="Mono.TextTemplating" Version="3.0.0" />
51-
<PackageVersion Include="NetTopologySuite" Version="2.6.0" />
52-
<PackageVersion Include="NetTopologySuite.IO.SpatiaLite" Version="2.0.0" />
53-
<PackageVersion Include="NetTopologySuite.IO.SqlServerBytes" Version="2.1.0" />
54-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
55-
<PackageVersion Include="mod_spatialite" Version="4.3.0.1" />
56-
<PackageVersion Include="SQLitePCLRaw.core" Version="$(SQLitePCLRawVersion)" />
57-
<PackageVersion Include="SQLitePCLRaw.bundle_sqlite3" Version="$(SQLitePCLRawVersion)" />
58-
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="$(SQLitePCLRawVersion)" />
5938
</ItemGroup>
6039
</Project>

‎EFCore.Cosmos.slnf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"solution": {
3-
"path": "EFCore.sln",
3+
"path": "EFCore.slnx",
44
"projects": [
55
"src\\EFCore.Abstractions\\EFCore.Abstractions.csproj",
66
"src\\EFCore.Analyzers\\EFCore.Analyzers.csproj",

‎EFCore.Relational.slnf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"solution": {
3-
"path": "EFCore.sln",
3+
"path": "EFCore.slnx",
44
"projects": [
55
"src\\EFCore.Abstractions\\EFCore.Abstractions.csproj",
66
"src\\EFCore.Analyzers\\EFCore.Analyzers.csproj",

0 commit comments

Comments
 (0)