Skip to content

Restore sqlite3mc test project using SQLite3MC.PCLRaw.bundle #38015

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
AndriySvyryd merged 4 commits into from
Mar 27, 2026
Merged

Restore sqlite3mc test project using SQLite3MC.PCLRaw.bundle #38015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c4d608
Restore sqlite3mc test project based on SQLite3MC.PCLRaw.bundle
Copilot Mar 26, 2026
4edfba9
Replace E_SQLITE3MC with SQLITE3MC in SqliteConnectionTest.cs
Copilot Mar 26, 2026
29e8f1a
Update test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3…
AndriySvyryd Mar 26, 2026
ecefdf6
Remove all SQLCIPHER/E_SQLCIPHER references from SqliteConnectionTest.cs
Copilot Mar 27, 2026
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
1 change: 1 addition & 0 deletions EFCore.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
<Project Path="test/EFCore.Tests/EFCore.Tests.csproj" />
<Project Path="test/EFCore.VisualBasic.FunctionalTests/EFCore.VisualBasic.FunctionalTests.vbproj" />
<Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj" />
<Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj" />
<Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj" />
<Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj" />
<Project Path="test/EFCore.NativeAotTests/EFCore.NativeAotTests.csproj">
Expand Down
3 changes: 1 addition & 2 deletions Microsoft.Data.Sqlite.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
"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.e_sqlite3mc.Tests.csproj",
"test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.sqlite3.Tests.csproj",
"test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj",
"test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.winsqlite3.Tests.csproj"
]
}
Expand Down
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<AzureResourceManagerCosmosDBVersion>1.3.2</AzureResourceManagerCosmosDBVersion>
<OpenTelemetryExporterInMemoryVersion>1.12.0</OpenTelemetryExporterInMemoryVersion>
<SQLitePCLRawVersion>3.0.2</SQLitePCLRawVersion>
<SQLite3MCPCLRawBundleVersion>2.3.2</SQLite3MCPCLRawBundleVersion>
</PropertyGroup>

<PropertyGroup Label="Analyzers">
Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

[assembly: InternalsVisibleTo(
"Microsoft.Data.Sqlite.sqlite3.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo(
"Microsoft.Data.Sqlite.sqlite3mc.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo(
"Microsoft.Data.Sqlite.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo(
Expand Down
1 change: 1 addition & 0 deletions test/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<PackageVersion Include="Grpc.AspNetCore" Version="2.76.0" />
<PackageVersion Include="NetTopologySuite.IO.GeoJSON" Version="4.0.0" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="$(OpenTelemetryExporterInMemoryVersion)" />
<PackageVersion Include="SQLite3MC.PCLRaw.bundle" Version="$(SQLite3MCPCLRawBundleVersion)" />
<PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="$(SQLitePCLRawVersion)" />
<PackageVersion Include="SQLitePCLRaw.provider.winsqlite3" Version="$(SQLitePCLRawVersion)" />
</ItemGroup>
Expand Down
20 changes: 20 additions & 0 deletions test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(DefaultNetCoreTargetFramework);$(NetFrameworkCurrent)</TargetFrameworks>
<DefineConstants>$(DefineConstants);SQLITE3MC</DefineConstants>
<Nullable>enable</Nullable>
</PropertyGroup>

Comment thread
AndriySvyryd marked this conversation as resolved.
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkCurrent)' ">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="SQLite3MC.PCLRaw.bundle" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions test/Microsoft.Data.Sqlite.Tests/SqliteConnectionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ public void Open_works_when_password()
{
#if E_SQLITE3 || WINSQLITE3
Open_works_when_password_unsupported();
#elif E_SQLCIPHER || E_SQLITE3MC || SQLCIPHER
#elif SQLITE3MC
Open_works_when_password_supported();
#elif SQLITE3
Open_works_when_password_might_be_supported();
Expand Down Expand Up @@ -313,7 +313,7 @@ private void Open_works_when_password_might_be_supported()
connection.Open();
}

#if E_SQLCIPHER || E_SQLITE3MC || SQLCIPHER
#if SQLITE3MC
[Fact]
public void Open_decrypts_lazily_when_no_password()
{
Expand Down Expand Up @@ -1287,7 +1287,7 @@ public void Open_releases_handle_when_constructor_fails()
var ex = Assert.Throws<InvalidOperationException>(connection.Open);
Assert.Equal(Resources.EncryptionNotSupported(GetNativeLibraryName()), ex.Message);
Assert.Equal(ConnectionState.Closed, connection.State);
#elif E_SQLCIPHER || E_SQLITE3MC || SQLCIPHER
#elif SQLITE3MC
var ex = Assert.Throws<SqliteException>(connection.Open);
Assert.Equal(SQLITE_NOTADB, ex.SqliteErrorCode);
Assert.Equal(ConnectionState.Closed, connection.State);
Expand Down
2 changes: 2 additions & 0 deletions test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"Microsoft.Data.Sqlite.winsqlite3.Tests")]
#elif SQLITE3
"Microsoft.Data.Sqlite.sqlite3.Tests")]
#elif SQLITE3MC
"Microsoft.Data.Sqlite.sqlite3mc.Tests")]
#else
#error Unexpected native library
#endif
Expand Down
Loading