Skip to content

Commit a5f1a40

Browse files
AndriySvyrydAndriySvyryd
authored
Merge branch 'main' into merge/release/9.0-to-main
2 parents 448d0b2 + 08b0689 commit a5f1a40

File tree

317 files changed

+10629
-7527
lines changed

Some content is hidden

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

317 files changed

+10629
-7527
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*.cs diff=csharp
33
*.sh eol=lf
44
*.sln eol=crlf
5+
*.sql diff

‎.github/CODEOWNERS‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
/azure-pipelines.yml @AndriySvyryd @maumar
55
/azure-pipelines-public.yml @AndriySvyryd @maumar
6+
/github-merge-flow.jsonc @AndriySvyryd @maumar
7+
/global.json @AndriySvyryd @maumar
8+
/NuGet.config @AndriySvyryd @maumar
9+
/.config/ @AndriySvyryd
10+
/.github/ @dotnet/efteam
611
/eng/ @AndriySvyryd @maumar
7-
/eng/common/ @dotnet-maestro-bot @AndriySvyryd @maumar
8-
/eng/Versions.props @dotnet-maestro-bot @AndriySvyryd @maumar
9-
/eng/Version.Details.xml @dotnet-maestro-bot @AndriySvyryd @maumar
12+
/src/ @dotnet/efteam

‎.github/SUPPORT.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ If you have a specific question about using the product, we encourage you to [as
2424
Official Support
2525
----------------
2626

27-
Entity Framework Core is covered by Microsoft's [.NET Core Support Policy](https://dotnet.microsoft.com/platform/support/policy/dotnet-core). If you've tried all the optoins above and are still looking for help, you may wish to [contact a Microsoft Support professional](http://support.microsoft.com/supportforbusiness/productselection?sapId=bec2bc54-b200-6962-301f-f098532f27b2). Please note that personal help may incur a fee.
27+
Entity Framework Core is covered by Microsoft's [.NET Core Support Policy](https://dotnet.microsoft.com/platform/support/policy/dotnet-core). If you've tried all the options above and are still looking for help, you may wish to [contact a Microsoft Support professional](http://support.microsoft.com/supportforbusiness/productselection?sapId=bec2bc54-b200-6962-301f-f098532f27b2). Please note that personal help may incur a fee.

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PackageTags>Entity Framework Core;entity-framework-core;EF;Data;O/RM;EntityFramework;EntityFrameworkCore;EFCore</PackageTags>
4040
<Product>Microsoft Entity Framework Core</Product>
4141
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
42-
<LangVersion>12.0</LangVersion>
42+
<LangVersion>preview</LangVersion>
4343
<Nullable>enable</Nullable>
4444
<DebugType>portable</DebugType>
4545
<PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>

‎Directory.Build.targets‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@
1111

1212
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
1313
<Import Project="eng\testing\linker\trimmingTests.targets" Condition="'$(IsPublishedAppTestProject)' == 'true'" />
14-
15-
<ItemGroup>
16-
<FrameworkReference Update="Microsoft.NETCore.App"
17-
Condition="'$(TargetFramework)' == 'net9.0' and '$(StabilizePackageVersion)' != 'true'"
18-
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
19-
TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
20-
</ItemGroup>
2114

2215
<Target Name="GetCustomAssemblyAttributes"
2316
BeforeTargets="GetAssemblyAttributes"

‎Directory.Packages.props‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" />
3737

3838
<!-- Azure SDK for .NET dependencies -->
39-
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.43.0" />
39+
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.45.0" />
4040

4141
<!-- SQL Server dependencies -->
42-
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.6" />
42+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
4343
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
4444

4545
<!-- external dependencies -->
@@ -57,8 +57,9 @@
5757

5858
<!-- Pinned versions for Component Governance/NuGetAudit - Remove when root dependencies are updated -->
5959
<!--Workaround for Microsoft.CodeAnalysis.Workspaces.MSBuild 4.8.0, see https://github.com/dotnet/efcore/issues/34637-->
60-
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
61-
<!--Workaround for Microsoft.Data.SqlClient v5.1.6 and Microsoft.CodeAnalysis.Analyzer.Testing v1.1.2-->
62-
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
60+
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
61+
<!--Workaround for Microsoft.Data.SqlClient v5.1.6 and Microsoft.CodeAnalysis.Analyzer.Testing v1.1.2-->
62+
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
63+
<PackageVersion Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />
6364
</ItemGroup>
6465
</Project>

‎EFCore.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "EFCore.VisualBasic.Function
141141
EndProject
142142
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Tasks", "src\EFCore.Tasks\EFCore.Tasks.csproj", "{711EE8F3-F92D-4470-8B0B-25D8B13EF282}"
143143
EndProject
144+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "EFCore.FSharp.FunctionalTests", "test\EFCore.FSharp.FunctionalTests\EFCore.FSharp.FunctionalTests.fsproj", "{89180105-1D98-4844-9C24-3A5DA2C53329}"
145+
EndProject
144146
Global
145147
GlobalSection(SolutionConfigurationPlatforms) = preSolution
146148
Debug|Any CPU = Debug|Any CPU
@@ -371,6 +373,10 @@ Global
371373
{711EE8F3-F92D-4470-8B0B-25D8B13EF282}.Debug|Any CPU.Build.0 = Debug|Any CPU
372374
{711EE8F3-F92D-4470-8B0B-25D8B13EF282}.Release|Any CPU.ActiveCfg = Release|Any CPU
373375
{711EE8F3-F92D-4470-8B0B-25D8B13EF282}.Release|Any CPU.Build.0 = Release|Any CPU
376+
{89180105-1D98-4844-9C24-3A5DA2C53329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
377+
{89180105-1D98-4844-9C24-3A5DA2C53329}.Debug|Any CPU.Build.0 = Debug|Any CPU
378+
{89180105-1D98-4844-9C24-3A5DA2C53329}.Release|Any CPU.ActiveCfg = Release|Any CPU
379+
{89180105-1D98-4844-9C24-3A5DA2C53329}.Release|Any CPU.Build.0 = Release|Any CPU
374380
EndGlobalSection
375381
GlobalSection(SolutionProperties) = preSolution
376382
HideSolutionNode = FALSE
@@ -433,6 +439,7 @@ Global
433439
{3D935B7D-80BD-49AD-BDC9-E1B0C9D9494F} = {CE6B50B2-34AE-44C9-940A-4E48C3E1B3BC}
434440
{2AC6A8AC-5C0A-422A-B21A-CDC8D75F20A3} = {258D5057-81B9-40EC-A872-D21E27452749}
435441
{711EE8F3-F92D-4470-8B0B-25D8B13EF282} = {CE6B50B2-34AE-44C9-940A-4E48C3E1B3BC}
442+
{89180105-1D98-4844-9C24-3A5DA2C53329} = {258D5057-81B9-40EC-A872-D21E27452749}
436443
EndGlobalSection
437444
GlobalSection(ExtensibilityGlobals) = postSolution
438445
SolutionGuid = {285A5EB4-BCF4-40EB-B9E1-DF6DBCB5E705}

‎NuGet.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,16 @@
1212
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
1313
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
1414
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
15+
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
16+
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
1517
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1618
<!-- Used for the Rich Navigation indexing task -->
1719
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
1820
</packageSources>
21+
<auditSources>
22+
<clear />
23+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
24+
</auditSources>
1925
<disabledPackageSources>
2026
<clear />
2127
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This repository is home to the following [.NET Foundation](https://dotnetfoundat
1111

1212
[![latest version](https://img.shields.io/nuget/v/Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore) [![preview version](https://img.shields.io/nuget/vpre/Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore/absoluteLatest) [![downloads](https://img.shields.io/nuget/dt/Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore)
1313

14-
EF Core is a modern object-database mapper for .NET. It supports LINQ queries, change tracking, updates, and schema migrations. EF Core works with SQL Server, Azure SQL Database, SQLite, Azure Cosmos DB, MySQL, PostgreSQL, and other databases through a provider plugin API.
14+
EF Core is a modern object-database mapper for .NET. It supports LINQ queries, change tracking, updates, and schema migrations. EF Core works with SQL Server, Azure SQL Database, SQLite, Azure Cosmos DB, MariaDB, MySQL, PostgreSQL, and other databases through a provider plugin API.
1515

1616
### Installation
1717

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,4 +263,4 @@ extends:
263263
enableSourceLinkValidation: false
264264
publishAssetsImmediately: true
265265
SDLValidationParameters:
266-
enable: false
266+
enable: false

0 commit comments

Comments
 (0)