Skip to content

[automated] Merge branch 'release/9.0' => 'release/10.0' #37102

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.

Sign up for GitHub

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
cincuranet merged 6 commits into from
Nov 7, 2025
Merged

[automated] Merge branch 'release/9.0' => 'release/10.0' #37102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2568567
Merge pull request #36948 from dotnet/release/8.0
cincuranet Oct 10, 2025
a5aec92
Update dependencies (#37048)
AndriySvyryd Nov 4, 2025
a5220c3
Merge branch 'release/8.0-staging' => 'release/8.0' (#37079)
AndriySvyryd Nov 5, 2025
05e8861
Merge branch 'release/9.0' into merge/release/8.0-to-release/9.0
cincuranet Nov 6, 2025
9f385a5
Merge pull request #37088 from dotnet/merge/release/8.0-to-release/9.0
cincuranet Nov 6, 2025
6ec3ff5
Merge branch 'release/10.0' into merge/release/9.0-to-release/10.0
cincuranet Nov 7, 2025
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
4 changes: 4 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
<NoWarn>$(NoWarn.Replace(';1591', ''))</NoWarn>
</PropertyGroup>

<PropertyGroup>
<NuGetAuditLevel>moderate</NuGetAuditLevel>
</PropertyGroup>

<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions benchmark/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

<PropertyGroup>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\rulesets\EFCore.test.ruleset</CodeAnalysisRuleSet>
<NuGetAudit>false</NuGetAudit>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
<ProjectReference Include="..\..\src\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" />
</ItemGroup>

<ItemGroup>
<None Update="AdventureWorks2014.db">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down
10 changes: 10 additions & 0 deletions src/ef/ef.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Configuration" />
</ItemGroup>

<PropertyGroup>
<!-- Permit targeting `netcoreapp2.0`, see https://github.com/dotnet/efcore/issues/34654 -->
<NoWarn>$(NoWarn);NU1903</NoWarn>
</PropertyGroup>

<ItemGroup>
<!-- Permit targeting `netcoreapp2.0`, see https://github.com/dotnet/efcore/issues/34654 -->
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-7mfr-774f-w5r9" />
</ItemGroup>

<ItemGroup>
<None Update="Generators\BundleProgramGenerator.tt">
Expand Down
2 changes: 2 additions & 0 deletions test/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<NoWarn>$(NoWarn);CA1707;1591;xUnit1000;xUnit1003;xUnit1004;xUnit1010;xUnit1013;xUnit1026;xUnit2013;xUnit1024</NoWarn>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\rulesets\EFCore.test.ruleset</CodeAnalysisRuleSet>
<LangVersion>preview</LangVersion>
<DefaultNetCoreTargetFramework>net10.0</DefaultNetCoreTargetFramework>
<NuGetAudit>false</NuGetAudit>
</PropertyGroup>

</Project>
4 changes: 2 additions & 2 deletions test/EFCore.Cosmos.FunctionalTests/Query/PrimitiveCollectionsQueryCosmosTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,11 +1370,11 @@ public override async Task Parameter_collection_Concat_column_collection()

AssertSql(
"""
@ints='[11,111]'
@p='[11,111]'

SELECT VALUE c
FROM root c
WHERE (ARRAY_LENGTH(ARRAY_CONCAT(@ints, c["Ints"])) = 2)
WHERE (ARRAY_LENGTH(ARRAY_CONCAT(@p, c["Ints"])) = 2)
""");
}

Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.Specification.Tests/Query/NorthwindMiscellaneousQueryTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5122,7 +5122,7 @@ public virtual Task Contains_over_concatenated_parameter_and_constant(bool async

return AssertQuery(
async,
ss => ss.Set<Customer>().Where(c => data.Contains(someVariable + "SomeConstant")));
ss => ss.Set<Customer>().Where(c => ((IEnumerable<string>)data).Contains(someVariable + "SomeConstant")));
}

[ConditionalTheory, MemberData(nameof(IsAsyncData))]
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.Specification.Tests/Query/PrimitiveCollectionsQueryTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ public virtual Task Parameter_collection_Concat_column_collection()
{
int[] ints = [11, 111];

return AssertQuery(ss => ss.Set<PrimitiveCollectionsEntity>().Where(c => ints.Concat(c.Ints).Count() == 2));
return AssertQuery(ss => ss.Set<PrimitiveCollectionsEntity>().Where(c => ((IEnumerable<int>)ints).Concat(c.Ints).Count() == 2));
}

[ConditionalFact] // #33582
Expand Down
8 changes: 4 additions & 4 deletions test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServer160Test.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1494,19 +1494,19 @@ public override async Task Parameter_collection_Concat_column_collection()

AssertSql(
"""
@ints1='11'
@ints2='111'
@p1='11'
@p2='111'

SELECT [p].[Id], [p].[Bool], [p].[Bools], [p].[DateTime], [p].[DateTimes], [p].[Enum], [p].[Enums], [p].[Int], [p].[Ints], [p].[NullableInt], [p].[NullableInts], [p].[NullableString], [p].[NullableStrings], [p].[NullableWrappedId], [p].[NullableWrappedIdWithNullableComparer], [p].[String], [p].[Strings], [p].[WrappedId]
FROM [PrimitiveCollectionsEntity] AS [p]
WHERE (
SELECT COUNT(*)
FROM (
SELECT 1 AS empty
FROM (VALUES (@ints1), (@ints2)) AS [i]([Value])
FROM (VALUES (@p1), (@p2)) AS [p0]([Value])
UNION ALL
SELECT 1 AS empty
FROM OPENJSON([p].[Ints]) AS [i0]
FROM OPENJSON([p].[Ints]) AS [i]
) AS [u]) = 2
""");
}
Expand Down
8 changes: 4 additions & 4 deletions test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,19 +1517,19 @@ public override async Task Parameter_collection_Concat_column_collection()

AssertSql(
"""
@ints1='11'
@ints2='111'
@p1='11'
@p2='111'

SELECT [p].[Id], [p].[Bool], [p].[Bools], [p].[DateTime], [p].[DateTimes], [p].[Enum], [p].[Enums], [p].[Int], [p].[Ints], [p].[NullableInt], [p].[NullableInts], [p].[NullableString], [p].[NullableStrings], [p].[NullableWrappedId], [p].[NullableWrappedIdWithNullableComparer], [p].[String], [p].[Strings], [p].[WrappedId]
FROM [PrimitiveCollectionsEntity] AS [p]
WHERE (
SELECT COUNT(*)
FROM (
SELECT 1 AS empty
FROM (VALUES (@ints1), (@ints2)) AS [i]([Value])
FROM (VALUES (@p1), (@p2)) AS [p0]([Value])
UNION ALL
SELECT 1 AS empty
FROM OPENJSON([p].[Ints]) AS [i0]
FROM OPENJSON([p].[Ints]) AS [i]
) AS [u]) = 2
""");
}
Expand Down
8 changes: 4 additions & 4 deletions test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1464,8 +1464,8 @@ public override async Task Parameter_collection_Concat_column_collection()

AssertSql(
"""
@ints1='11'
@ints2='111'
@p1='11'
@p2='111'

SELECT "p"."Id", "p"."Bool", "p"."Bools", "p"."DateTime", "p"."DateTimes", "p"."Enum", "p"."Enums", "p"."Int", "p"."Ints", "p"."NullableInt", "p"."NullableInts", "p"."NullableString", "p"."NullableStrings", "p"."NullableWrappedId", "p"."NullableWrappedIdWithNullableComparer", "p"."String", "p"."Strings", "p"."WrappedId"
FROM "PrimitiveCollectionsEntity" AS "p"
Expand All @@ -1474,11 +1474,11 @@ SELECT COUNT(*)
FROM (
SELECT * FROM (
SELECT 1
FROM (SELECT @ints1 AS "Value" UNION ALL VALUES (@ints2)) AS "i"
FROM (SELECT @p1 AS "Value" UNION ALL VALUES (@p2)) AS "p0"
)
UNION ALL
SELECT 1
FROM json_each("p"."Ints") AS "i0"
FROM json_each("p"."Ints") AS "i"
) AS "u") = 2
""");
}
Expand Down