From 671b54505759f0b80548d1eaf05f6847a48449ab Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 10 Jul 2026 00:17:01 +0000 Subject: [PATCH 01/11] Update SQLitePCLRaw packages and Sqlite test project setup Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- Directory.Packages.props | 2 +- EFCore.sln | 7 ----- Microsoft.Data.Sqlite.slnf | 1 - eng/Versions.props | 3 +- .../Properties/InternalsVisibleTo.cs | 2 -- test/Directory.Packages.props | 6 ++-- .../PrimitiveCollectionsQuerySqliteTest.cs | 29 ++----------------- ...osoft.Data.Sqlite.e_sqlite3mc.Tests.csproj | 17 ----------- ...Microsoft.Data.Sqlite.sqlite3.Tests.csproj | 3 +- ...rosoft.Data.Sqlite.winsqlite3.Tests.csproj | 3 +- .../TestUtilities/SqliteTestFramework.cs | 22 ++++++++++++-- 11 files changed, 33 insertions(+), 62 deletions(-) delete mode 100644 test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj diff --git a/Directory.Packages.props b/Directory.Packages.props index d47446d208a..b296cebea0e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -54,7 +54,7 @@ - + \ No newline at end of file diff --git a/EFCore.sln b/EFCore.sln index 91075f55dfd..1e706a50641 100644 --- a/EFCore.sln +++ b/EFCore.sln @@ -114,8 +114,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Benchmarks", "benchm EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.e_sqlcipher.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj", "{7B598E0C-B8E2-4F1F-B53C-ED84178E65BE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.e_sqlite3mc.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj", "{203F3577-9E24-4714-AD31-F119B26FA8C1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.winsqlite3.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.winsqlite3.Tests.csproj", "{B163761D-FB4A-4C80-BAB9-01905E1351EF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.sqlite3.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.sqlite3.Tests.csproj", "{E0FF35C8-8038-4394-9C2A-AF34BE3CC61F}" @@ -318,10 +316,6 @@ Global {7B598E0C-B8E2-4F1F-B53C-ED84178E65BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {7B598E0C-B8E2-4F1F-B53C-ED84178E65BE}.Release|Any CPU.ActiveCfg = Release|Any CPU {7B598E0C-B8E2-4F1F-B53C-ED84178E65BE}.Release|Any CPU.Build.0 = Release|Any CPU - {203F3577-9E24-4714-AD31-F119B26FA8C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {203F3577-9E24-4714-AD31-F119B26FA8C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {203F3577-9E24-4714-AD31-F119B26FA8C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {203F3577-9E24-4714-AD31-F119B26FA8C1}.Release|Any CPU.Build.0 = Release|Any CPU {B163761D-FB4A-4C80-BAB9-01905E1351EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B163761D-FB4A-4C80-BAB9-01905E1351EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {B163761D-FB4A-4C80-BAB9-01905E1351EF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -428,7 +422,6 @@ Global {5A44F67E-517F-458D-B9C7-12A4DBBAD64A} = {293B4F79-3CB9-402A-A74C-B8108C41A7CF} {2642F4F0-69BE-4C43-94B7-B298FEC87D89} = {293B4F79-3CB9-402A-A74C-B8108C41A7CF} {7B598E0C-B8E2-4F1F-B53C-ED84178E65BE} = {258D5057-81B9-40EC-A872-D21E27452749} - {203F3577-9E24-4714-AD31-F119B26FA8C1} = {258D5057-81B9-40EC-A872-D21E27452749} {B163761D-FB4A-4C80-BAB9-01905E1351EF} = {258D5057-81B9-40EC-A872-D21E27452749} {E0FF35C8-8038-4394-9C2A-AF34BE3CC61F} = {258D5057-81B9-40EC-A872-D21E27452749} {7C0E5443-FE44-4436-8A7D-CE64D1F889BD} = {258D5057-81B9-40EC-A872-D21E27452749} diff --git a/Microsoft.Data.Sqlite.slnf b/Microsoft.Data.Sqlite.slnf index f70d63bf969..993d24cad16 100644 --- a/Microsoft.Data.Sqlite.slnf +++ b/Microsoft.Data.Sqlite.slnf @@ -6,7 +6,6 @@ "src\\Microsoft.Data.Sqlite\\Microsoft.Data.Sqlite.csproj", "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.Tests.csproj", "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj", - "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj", "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.sqlite3.Tests.csproj", "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.winsqlite3.Tests.csproj" ] diff --git a/eng/Versions.props b/eng/Versions.props index 911a36eeab8..69a2387b6dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,6 +31,7 @@ 1.21.0 1.3.2 1.12.0 - 2.1.11 + 3.0.3 + 3.53.3 diff --git a/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs b/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs index 30f05a579ca..a4f553a153b 100644 --- a/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs +++ b/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs @@ -5,8 +5,6 @@ [assembly: InternalsVisibleTo( "Microsoft.Data.Sqlite.e_sqlcipher.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo( - "Microsoft.Data.Sqlite.e_sqlite3mc.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo( "Microsoft.Data.Sqlite.sqlite3.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo( diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index ccb6ff0671d..f46db81ef45 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -19,9 +19,9 @@ - - - + + + diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs index 844d0975b3e..f082954f5ee 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs @@ -1594,32 +1594,9 @@ INNER JOIN json_each("p"."Ints") AS "i" ON "v"."Value" = "i"."value") = 2 """); } - [ConditionalFact] - public override async Task Parameter_collection_Concat_column_collection() - { - // Issue #32561 - await Assert.ThrowsAsync(() => base.Parameter_collection_Concat_column_collection()); - - AssertSql( - """ -@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 * FROM ( - SELECT 1 - FROM (SELECT @p1 AS "Value" UNION ALL VALUES (@p2)) AS "p0" - ) - UNION ALL - SELECT 1 - FROM json_each("p"."Ints") AS "i" - ) AS "u") = 2 -"""); - } + [ConditionalFact(Skip = "Issue #32561")] + public override Task Parameter_collection_Concat_column_collection() + => Task.CompletedTask; public override async Task Parameter_collection_with_type_inference_for_JsonScalarExpression() { diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj deleted file mode 100644 index 33eff6e0c39..00000000000 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(DefaultNetCoreTargetFramework);$(NetFrameworkCurrent) - $(DefineConstants);E_SQLITE3MC - enable - - - - - - - - - - - diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj index 58047b3caef..b1ccc9dc6c5 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj @@ -11,7 +11,8 @@ - + + diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj index e0a71beed0f..ba1b8a97d43 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj @@ -11,7 +11,8 @@ - + + diff --git a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs index 602062393a5..24ac9ec23c6 100644 --- a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs +++ b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs @@ -18,8 +18,6 @@ "Microsoft.Data.Sqlite.Tests")] #elif E_SQLCIPHER "Microsoft.Data.Sqlite.e_sqlcipher.Tests")] -#elif E_SQLITE3MC - "Microsoft.Data.Sqlite.e_sqlite3mc.Tests")] #elif WINSQLITE3 "Microsoft.Data.Sqlite.winsqlite3.Tests")] #elif SQLITE3 @@ -30,6 +28,26 @@ namespace Microsoft.Data.Sqlite.Tests.TestUtilities; +#if WINSQLITE3 +public static class Batteries_V2 +{ + public static void Init() + { + SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_winsqlite3()); + } +} +#endif + +#if SQLITE3 +public static class Batteries_V2 +{ + public static void Init() + { + SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3()); + } +} +#endif + internal class SqliteTestFramework : XunitTestFramework { protected SqliteTestFramework(IMessageSink diagnosticMessageSink) From ae4d102799b8058a42aacf5dbc27c0cbca86771b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 10 Jul 2026 00:36:13 +0000 Subject: [PATCH 02/11] Restore sqlite3mc flavor and remove e_sqlcipher test project Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- EFCore.sln | 2 +- Microsoft.Data.Sqlite.slnf | 2 +- .../Properties/InternalsVisibleTo.cs | 2 +- test/Directory.Packages.props | 2 +- ...ts.csproj => Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj} | 4 ++-- .../TestUtilities/SqliteTestFramework.cs | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) rename test/Microsoft.Data.Sqlite.Tests/{Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj => Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj} (74%) diff --git a/EFCore.sln b/EFCore.sln index 1e706a50641..eb272bf3161 100644 --- a/EFCore.sln +++ b/EFCore.sln @@ -112,7 +112,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Sqlite.Benchmarks", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Benchmarks", "benchmark\EFCore.Benchmarks\EFCore.Benchmarks.csproj", "{2642F4F0-69BE-4C43-94B7-B298FEC87D89}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.e_sqlcipher.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj", "{7B598E0C-B8E2-4F1F-B53C-ED84178E65BE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.sqlite3mc.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj", "{7B598E0C-B8E2-4F1F-B53C-ED84178E65BE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.winsqlite3.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.winsqlite3.Tests.csproj", "{B163761D-FB4A-4C80-BAB9-01905E1351EF}" EndProject diff --git a/Microsoft.Data.Sqlite.slnf b/Microsoft.Data.Sqlite.slnf index 993d24cad16..84fe4e29f10 100644 --- a/Microsoft.Data.Sqlite.slnf +++ b/Microsoft.Data.Sqlite.slnf @@ -5,7 +5,7 @@ "src\\Microsoft.Data.Sqlite.Core\\Microsoft.Data.Sqlite.Core.csproj", "src\\Microsoft.Data.Sqlite\\Microsoft.Data.Sqlite.csproj", "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.Tests.csproj", - "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj", + "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj", "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.sqlite3.Tests.csproj", "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.winsqlite3.Tests.csproj" ] diff --git a/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs b/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs index a4f553a153b..cc5f0771222 100644 --- a/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs +++ b/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs @@ -4,7 +4,7 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo( - "Microsoft.Data.Sqlite.e_sqlcipher.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + "Microsoft.Data.Sqlite.sqlite3mc.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo( "Microsoft.Data.Sqlite.sqlite3.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo( diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index f46db81ef45..4f66c1c4675 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -19,7 +19,7 @@ - + diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj similarity index 74% rename from test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj rename to test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj index 29447db7f09..30d84a1fd11 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj @@ -2,7 +2,7 @@ $(DefaultNetCoreTargetFramework);$(NetFrameworkCurrent) - $(DefineConstants);E_SQLCIPHER + $(DefineConstants);E_SQLITE3MC enable @@ -11,7 +11,7 @@ - + diff --git a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs index 24ac9ec23c6..7ea5215a2cc 100644 --- a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs +++ b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs @@ -16,8 +16,8 @@ "Microsoft.Data.Sqlite.Tests.TestUtilities.SqliteTestFramework", #if E_SQLITE3 "Microsoft.Data.Sqlite.Tests")] -#elif E_SQLCIPHER - "Microsoft.Data.Sqlite.e_sqlcipher.Tests")] +#elif E_SQLITE3MC + "Microsoft.Data.Sqlite.sqlite3mc.Tests")] #elif WINSQLITE3 "Microsoft.Data.Sqlite.winsqlite3.Tests")] #elif SQLITE3 From 91e9ba5fcefe6f1f97945985c759f845d76456fa Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Thu, 9 Jul 2026 17:46:11 -0700 Subject: [PATCH 03/11] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../TestUtilities/SqliteTestFramework.cs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs index 7ea5215a2cc..ae28df9b019 100644 --- a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs +++ b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs @@ -28,22 +28,16 @@ namespace Microsoft.Data.Sqlite.Tests.TestUtilities; -#if WINSQLITE3 -public static class Batteries_V2 +#if WINSQLITE3 || SQLITE3 +internal static class Batteries_V2 { public static void Init() { +#if WINSQLITE3 SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_winsqlite3()); - } -} -#endif - -#if SQLITE3 -public static class Batteries_V2 -{ - public static void Init() - { +#elif SQLITE3 SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3()); +#endif } } #endif From fe05d450040c02591277226ada5c6ccc8ba0f2a7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 10 Jul 2026 01:04:38 +0000 Subject: [PATCH 04/11] Fix Microsoft.Data.Sqlite.Tests.csproj win-x64 RID for netfx and explicit lib.e_sqlite3 in EFCore.Design.Tests Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- test/EFCore.Design.Tests/EFCore.Design.Tests.csproj | 1 + .../Microsoft.Data.Sqlite.Tests.csproj | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj index 9d4ed03c0fe..a41512e5a64 100644 --- a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj +++ b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj @@ -58,6 +58,7 @@ + diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj index 7c19ff01620..00507d8fa7b 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj @@ -6,6 +6,10 @@ enable + + win-x64 + + From 119699c27b0e87e2478405f860f508daa3e980f3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 10 Jul 2026 05:01:30 +0000 Subject: [PATCH 05/11] Move SQLite3MC version to Versions.props; revert EFCore.Design.Tests and test skip Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- eng/Versions.props | 1 + test/Directory.Packages.props | 2 +- .../EFCore.Design.Tests.csproj | 1 - .../PrimitiveCollectionsQuerySqliteTest.cs | 29 +++++++++++++++++-- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 69a2387b6dd..af627206048 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,5 +33,6 @@ 1.12.0 3.0.3 3.53.3 + 2.3.5 diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index 4f66c1c4675..607c13d94d1 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -19,7 +19,7 @@ - + diff --git a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj index a41512e5a64..9d4ed03c0fe 100644 --- a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj +++ b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj @@ -58,7 +58,6 @@ - diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs index f082954f5ee..844d0975b3e 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs @@ -1594,9 +1594,32 @@ INNER JOIN json_each("p"."Ints") AS "i" ON "v"."Value" = "i"."value") = 2 """); } - [ConditionalFact(Skip = "Issue #32561")] - public override Task Parameter_collection_Concat_column_collection() - => Task.CompletedTask; + [ConditionalFact] + public override async Task Parameter_collection_Concat_column_collection() + { + // Issue #32561 + await Assert.ThrowsAsync(() => base.Parameter_collection_Concat_column_collection()); + + AssertSql( + """ +@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 * FROM ( + SELECT 1 + FROM (SELECT @p1 AS "Value" UNION ALL VALUES (@p2)) AS "p0" + ) + UNION ALL + SELECT 1 + FROM json_each("p"."Ints") AS "i" + ) AS "u") = 2 +"""); + } public override async Task Parameter_collection_with_type_inference_for_JsonScalarExpression() { From 52f6ec48e31482d766a6c5b32f174d96eb9ddde4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 10 Jul 2026 05:07:48 +0000 Subject: [PATCH 06/11] Rename SQLitePCLRawLibeSqlite3Version to SQLitePCLRawLibESqlite3Version Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- Directory.Packages.props | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index b296cebea0e..7095fd09a85 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -55,6 +55,6 @@ - + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index af627206048..1b020968a4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ 1.3.2 1.12.0 3.0.3 - 3.53.3 + 3.53.3 2.3.5 From 07c03cf3141a7ad1f9e0166b0707ef5294d6c7b3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Jul 2026 17:31:12 +0000 Subject: [PATCH 07/11] Update SQLitePCLRaw versions, revert to bundle packages, fix sqlite3mc CPM override Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- Directory.Packages.props | 2 +- eng/Versions.props | 3 +-- test/Directory.Packages.props | 4 ++-- .../Microsoft.Data.Sqlite.Tests.csproj | 4 ---- .../Microsoft.Data.Sqlite.sqlite3.Tests.csproj | 3 +-- .../Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj | 1 + .../Microsoft.Data.Sqlite.winsqlite3.Tests.csproj | 3 +-- .../TestUtilities/SqliteTestFramework.cs | 14 -------------- 8 files changed, 7 insertions(+), 27 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 7095fd09a85..d47446d208a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -54,7 +54,7 @@ + - \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index 1b020968a4c..8e4942abbcd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,8 +31,7 @@ 1.21.0 1.3.2 1.12.0 - 3.0.3 - 3.53.3 + 2.1.12 2.3.5 diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index 607c13d94d1..ef1ae334859 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -20,8 +20,8 @@ - - + + diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj index 00507d8fa7b..7c19ff01620 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj @@ -6,10 +6,6 @@ enable - - win-x64 - - diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj index b1ccc9dc6c5..58047b3caef 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj @@ -11,8 +11,7 @@ - - + diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj index 30d84a1fd11..851e73344ef 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj @@ -12,6 +12,7 @@ + diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj index ba1b8a97d43..e0a71beed0f 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj @@ -11,8 +11,7 @@ - - + diff --git a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs index ae28df9b019..e400f378239 100644 --- a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs +++ b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs @@ -28,20 +28,6 @@ namespace Microsoft.Data.Sqlite.Tests.TestUtilities; -#if WINSQLITE3 || SQLITE3 -internal static class Batteries_V2 -{ - public static void Init() - { -#if WINSQLITE3 - SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_winsqlite3()); -#elif SQLITE3 - SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3()); -#endif - } -} -#endif - internal class SqliteTestFramework : XunitTestFramework { protected SqliteTestFramework(IMessageSink diagnosticMessageSink) From 665ebbfaa59f3676c8c9a086f4a12f866f8f2061 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Jul 2026 17:56:04 +0000 Subject: [PATCH 08/11] Add win-x64 RID for netfx to Microsoft.Data.Sqlite.Tests.csproj Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- .../Microsoft.Data.Sqlite.Tests.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj index 7c19ff01620..00507d8fa7b 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj @@ -6,6 +6,10 @@ enable + + win-x64 + + From 520a2772a5ef2a9c03c2ccb1631f395f15892e2d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Jul 2026 19:52:20 +0000 Subject: [PATCH 09/11] Restore e_sqlcipher tests and split SQLite bundle versions Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- Directory.Packages.props | 2 +- EFCore.sln | 7 +++++++ eng/Versions.props | 1 + .../Properties/InternalsVisibleTo.cs | 2 ++ test/Directory.Packages.props | 2 +- ...crosoft.Data.Sqlite.e_sqlcipher.Tests.csproj | 17 +++++++++++++++++ .../TestUtilities/SqliteTestFramework.cs | 2 ++ 7 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj diff --git a/Directory.Packages.props b/Directory.Packages.props index d47446d208a..d326616e89d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -54,7 +54,7 @@ - + \ No newline at end of file diff --git a/EFCore.sln b/EFCore.sln index eb272bf3161..5fd737f4e05 100644 --- a/EFCore.sln +++ b/EFCore.sln @@ -112,6 +112,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Sqlite.Benchmarks", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Benchmarks", "benchmark\EFCore.Benchmarks\EFCore.Benchmarks.csproj", "{2642F4F0-69BE-4C43-94B7-B298FEC87D89}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.e_sqlcipher.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj", "{350716CE-FE0C-4FF1-AFB0-B51757C79E68}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.sqlite3mc.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj", "{7B598E0C-B8E2-4F1F-B53C-ED84178E65BE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.winsqlite3.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.winsqlite3.Tests.csproj", "{B163761D-FB4A-4C80-BAB9-01905E1351EF}" @@ -300,6 +302,10 @@ Global {51DAD0D5-5564-4FB7-B34C-98814C900DF9}.Debug|Any CPU.Build.0 = Debug|Any CPU {51DAD0D5-5564-4FB7-B34C-98814C900DF9}.Release|Any CPU.ActiveCfg = Release|Any CPU {51DAD0D5-5564-4FB7-B34C-98814C900DF9}.Release|Any CPU.Build.0 = Release|Any CPU + {350716CE-FE0C-4FF1-AFB0-B51757C79E68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {350716CE-FE0C-4FF1-AFB0-B51757C79E68}.Debug|Any CPU.Build.0 = Debug|Any CPU + {350716CE-FE0C-4FF1-AFB0-B51757C79E68}.Release|Any CPU.ActiveCfg = Release|Any CPU + {350716CE-FE0C-4FF1-AFB0-B51757C79E68}.Release|Any CPU.Build.0 = Release|Any CPU {24D7B6D5-A22A-4734-BB55-F464C112F891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {24D7B6D5-A22A-4734-BB55-F464C112F891}.Debug|Any CPU.Build.0 = Debug|Any CPU {24D7B6D5-A22A-4734-BB55-F464C112F891}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -418,6 +424,7 @@ Global {775A9A2B-2EDB-4E2E-8E74-E46E8E8E1236} = {CE6B50B2-34AE-44C9-940A-4E48C3E1B3BC} {D766273B-DA6A-4C6C-A9CD-AB57EF1E4F22} = {CE6B50B2-34AE-44C9-940A-4E48C3E1B3BC} {51DAD0D5-5564-4FB7-B34C-98814C900DF9} = {258D5057-81B9-40EC-A872-D21E27452749} + {350716CE-FE0C-4FF1-AFB0-B51757C79E68} = {258D5057-81B9-40EC-A872-D21E27452749} {24D7B6D5-A22A-4734-BB55-F464C112F891} = {293B4F79-3CB9-402A-A74C-B8108C41A7CF} {5A44F67E-517F-458D-B9C7-12A4DBBAD64A} = {293B4F79-3CB9-402A-A74C-B8108C41A7CF} {2642F4F0-69BE-4C43-94B7-B298FEC87D89} = {293B4F79-3CB9-402A-A74C-B8108C41A7CF} diff --git a/eng/Versions.props b/eng/Versions.props index 8e4942abbcd..c0520fc6e58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,6 +32,7 @@ 1.3.2 1.12.0 2.1.12 + 2.1.11 2.3.5 diff --git a/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs b/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs index cc5f0771222..504885e8397 100644 --- a/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs +++ b/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs @@ -3,6 +3,8 @@ using System.Runtime.CompilerServices; +[assembly: InternalsVisibleTo( + "Microsoft.Data.Sqlite.e_sqlcipher.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo( "Microsoft.Data.Sqlite.sqlite3mc.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo( diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index ef1ae334859..2f563e35569 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -21,7 +21,7 @@ - + diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj new file mode 100644 index 00000000000..29447db7f09 --- /dev/null +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj @@ -0,0 +1,17 @@ + + + + $(DefaultNetCoreTargetFramework);$(NetFrameworkCurrent) + $(DefineConstants);E_SQLCIPHER + enable + + + + + + + + + + + diff --git a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs index e400f378239..79fdaccaa29 100644 --- a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs +++ b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs @@ -16,6 +16,8 @@ "Microsoft.Data.Sqlite.Tests.TestUtilities.SqliteTestFramework", #if E_SQLITE3 "Microsoft.Data.Sqlite.Tests")] +#elif E_SQLCIPHER + "Microsoft.Data.Sqlite.e_sqlcipher.Tests")] #elif E_SQLITE3MC "Microsoft.Data.Sqlite.sqlite3mc.Tests")] #elif WINSQLITE3 From e15bcce7188fe95b09b0e3abb9cf023a174dbee1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Jul 2026 20:48:05 +0000 Subject: [PATCH 10/11] Address SQLite package version and solution filter review comments Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- Directory.Packages.props | 2 +- Microsoft.Data.Sqlite.slnf | 1 + eng/Versions.props | 4 +++- test/Directory.Packages.props | 5 +++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index d326616e89d..eb1e65fa577 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -54,7 +54,7 @@ - + \ No newline at end of file diff --git a/Microsoft.Data.Sqlite.slnf b/Microsoft.Data.Sqlite.slnf index 84fe4e29f10..815bdac9cc9 100644 --- a/Microsoft.Data.Sqlite.slnf +++ b/Microsoft.Data.Sqlite.slnf @@ -5,6 +5,7 @@ "src\\Microsoft.Data.Sqlite.Core\\Microsoft.Data.Sqlite.Core.csproj", "src\\Microsoft.Data.Sqlite\\Microsoft.Data.Sqlite.csproj", "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.Tests.csproj", + "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj", "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj", "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.sqlite3.Tests.csproj", "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.winsqlite3.Tests.csproj" diff --git a/eng/Versions.props b/eng/Versions.props index c0520fc6e58..0aa194847ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,9 @@ 1.3.2 1.12.0 2.1.12 - 2.1.11 + 2.1.11 + 2.1.11 + 2.1.11 2.3.5 diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index 2f563e35569..75a7da0fc2c 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -20,8 +20,9 @@ - - + + + From 2fafd6b74f069659806afd39e8e7b77d330cd0ae Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Jul 2026 22:03:13 +0000 Subject: [PATCH 11/11] Use precision-based asserter for nested/max average subquery tests Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- .../Query/NorthwindAggregateOperatorsQueryTestBase.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/EFCore.Specification.Tests/Query/NorthwindAggregateOperatorsQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/NorthwindAggregateOperatorsQueryTestBase.cs index 165fbb6a5de..c842813fe3e 100644 --- a/test/EFCore.Specification.Tests/Query/NorthwindAggregateOperatorsQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/NorthwindAggregateOperatorsQueryTestBase.cs @@ -249,14 +249,16 @@ public virtual Task Average_over_nested_subquery(bool async) => AssertAverage( async, ss => ss.Set().OrderBy(c => c.CustomerID).Take(3), - selector: c => (decimal)c.Orders.Average(double (o) => 5 + o.OrderDetails.Average(int (od) => od.ProductID))); + selector: c => (decimal)c.Orders.Average(double (o) => 5 + o.OrderDetails.Average(int (od) => od.ProductID)), + asserter: (e, a) => Assert.Equal(e, a, 10)); [ConditionalTheory, MemberData(nameof(IsAsyncData))] public virtual Task Average_over_max_subquery(bool async) => AssertAverage( async, ss => ss.Set().OrderBy(c => c.CustomerID).Take(3), - selector: c => (decimal)c.Orders.Average(int (o) => 5 + o.OrderDetails.Max(int (od) => od.ProductID))); + selector: c => (decimal)c.Orders.Average(int (o) => 5 + o.OrderDetails.Max(int (od) => od.ProductID)), + asserter: (e, a) => Assert.Equal(e, a, 10)); [ConditionalTheory, MemberData(nameof(IsAsyncData))] public virtual Task Average_on_float_column(bool async)