diff --git a/Directory.Build.props b/Directory.Build.props index dad2800abf3..0605f449c7b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -57,6 +57,10 @@ $(NoWarn.Replace(';1591', '')) + + moderate + + diff --git a/benchmark/Directory.Build.props b/benchmark/Directory.Build.props index acb8c8be1b6..2b1c507f4c6 100644 --- a/benchmark/Directory.Build.props +++ b/benchmark/Directory.Build.props @@ -3,6 +3,7 @@ $(MSBuildThisFileDirectory)..\rulesets\EFCore.test.ruleset + false diff --git a/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj b/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj index 2eb2534dfb2..5829a05d56f 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj +++ b/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj @@ -16,10 +16,6 @@ - - - - Always diff --git a/src/ef/ef.csproj b/src/ef/ef.csproj index bc690085b1c..eeb9b64e468 100644 --- a/src/ef/ef.csproj +++ b/src/ef/ef.csproj @@ -29,6 +29,16 @@ + + + + $(NoWarn);NU1903 + + + + + + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index b25ad56fdd8..7a6f6156093 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -5,6 +5,8 @@ $(NoWarn);CA1707;1591;xUnit1000;xUnit1003;xUnit1004;xUnit1010;xUnit1013;xUnit1026;xUnit2013;xUnit1024 $(MSBuildThisFileDirectory)..\rulesets\EFCore.test.ruleset preview + net10.0 + false \ No newline at end of file diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/PrimitiveCollectionsQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/PrimitiveCollectionsQueryCosmosTest.cs index 4661ec0126c..057e4638a6b 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/PrimitiveCollectionsQueryCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/PrimitiveCollectionsQueryCosmosTest.cs @@ -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) """); } diff --git a/test/EFCore.Specification.Tests/Query/NorthwindMiscellaneousQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/NorthwindMiscellaneousQueryTestBase.cs index 9e9773a0b65..0b70b83c750 100644 --- a/test/EFCore.Specification.Tests/Query/NorthwindMiscellaneousQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/NorthwindMiscellaneousQueryTestBase.cs @@ -5122,7 +5122,7 @@ public virtual Task Contains_over_concatenated_parameter_and_constant(bool async return AssertQuery( async, - ss => ss.Set().Where(c => data.Contains(someVariable + "SomeConstant"))); + ss => ss.Set().Where(c => ((IEnumerable)data).Contains(someVariable + "SomeConstant"))); } [ConditionalTheory, MemberData(nameof(IsAsyncData))] diff --git a/test/EFCore.Specification.Tests/Query/PrimitiveCollectionsQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/PrimitiveCollectionsQueryTestBase.cs index ce390626e95..c78fa4ff783 100644 --- a/test/EFCore.Specification.Tests/Query/PrimitiveCollectionsQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/PrimitiveCollectionsQueryTestBase.cs @@ -794,7 +794,7 @@ public virtual Task Parameter_collection_Concat_column_collection() { int[] ints = [11, 111]; - return AssertQuery(ss => ss.Set().Where(c => ints.Concat(c.Ints).Count() == 2)); + return AssertQuery(ss => ss.Set().Where(c => ((IEnumerable)ints).Concat(c.Ints).Count() == 2)); } [ConditionalFact] // #33582 diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServer160Test.cs b/test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServer160Test.cs index 694958227be..1c7d9eead0d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServer160Test.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServer160Test.cs @@ -1494,8 +1494,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] @@ -1503,10 +1503,10 @@ FROM [PrimitiveCollectionsEntity] AS [p] 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 """); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServerTest.cs index 0583fd68035..e212a8fe336 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServerTest.cs @@ -1517,8 +1517,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] @@ -1526,10 +1526,10 @@ FROM [PrimitiveCollectionsEntity] AS [p] 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 """); } diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs index 11a01b838bb..90ab6e1d1d0 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs @@ -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" @@ -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 """); }