Skip to content

Commit 8babe4b

Browse files
Restore sqlite3mc test project using SQLite3MC.PCLRaw.bundle (#38015)
Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
1 parent 04ac424 commit 8babe4b

8 files changed

Lines changed: 31 additions & 5 deletions

File tree

EFCore.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<Project Path="test/EFCore.Tests/EFCore.Tests.csproj" />
7777
<Project Path="test/EFCore.VisualBasic.FunctionalTests/EFCore.VisualBasic.FunctionalTests.vbproj" />
7878
<Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj" />
79+
<Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj" />
7980
<Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj" />
8081
<Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj" />
8182
<Project Path="test/EFCore.NativeAotTests/EFCore.NativeAotTests.csproj">

Microsoft.Data.Sqlite.slnf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
"src\\Microsoft.Data.Sqlite.Core\\Microsoft.Data.Sqlite.Core.csproj",
66
"src\\Microsoft.Data.Sqlite\\Microsoft.Data.Sqlite.csproj",
77
"test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.Tests.csproj",
8-
"test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj",
9-
"test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj",
108
"test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.sqlite3.Tests.csproj",
9+
"test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj",
1110
"test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.winsqlite3.Tests.csproj"
1211
]
1312
}

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<AzureResourceManagerCosmosDBVersion>1.3.2</AzureResourceManagerCosmosDBVersion>
4343
<OpenTelemetryExporterInMemoryVersion>1.12.0</OpenTelemetryExporterInMemoryVersion>
4444
<SQLitePCLRawVersion>3.0.2</SQLitePCLRawVersion>
45+
<SQLite3MCPCLRawBundleVersion>2.3.2</SQLite3MCPCLRawBundleVersion>
4546
</PropertyGroup>
4647

4748
<PropertyGroup Label="Analyzers">

src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
[assembly: InternalsVisibleTo(
77
"Microsoft.Data.Sqlite.sqlite3.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
8+
[assembly: InternalsVisibleTo(
9+
"Microsoft.Data.Sqlite.sqlite3mc.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
810
[assembly: InternalsVisibleTo(
911
"Microsoft.Data.Sqlite.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1012
[assembly: InternalsVisibleTo(

test/Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PackageVersion Include="Grpc.AspNetCore" Version="2.76.0" />
1717
<PackageVersion Include="NetTopologySuite.IO.GeoJSON" Version="4.0.0" />
1818
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="$(OpenTelemetryExporterInMemoryVersion)" />
19+
<PackageVersion Include="SQLite3MC.PCLRaw.bundle" Version="$(SQLite3MCPCLRawBundleVersion)" />
1920
<PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="$(SQLitePCLRawVersion)" />
2021
<PackageVersion Include="SQLitePCLRaw.provider.winsqlite3" Version="$(SQLitePCLRawVersion)" />
2122
</ItemGroup>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);$(NetFrameworkCurrent)</TargetFrameworks>
5+
<DefineConstants>$(DefineConstants);SQLITE3MC</DefineConstants>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
8+
9+
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkCurrent)' ">
10+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
11+
</PropertyGroup>
12+
<ItemGroup>
13+
<ProjectReference Include="..\..\src\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="SQLite3MC.PCLRaw.bundle" />
18+
</ItemGroup>
19+
20+
</Project>

test/Microsoft.Data.Sqlite.Tests/SqliteConnectionTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ public void Open_works_when_password()
266266
{
267267
#if E_SQLITE3 || WINSQLITE3
268268
Open_works_when_password_unsupported();
269-
#elif E_SQLCIPHER || E_SQLITE3MC || SQLCIPHER
269+
#elif SQLITE3MC
270270
Open_works_when_password_supported();
271271
#elif SQLITE3
272272
Open_works_when_password_might_be_supported();
@@ -313,7 +313,7 @@ private void Open_works_when_password_might_be_supported()
313313
connection.Open();
314314
}
315315

316-
#if E_SQLCIPHER || E_SQLITE3MC || SQLCIPHER
316+
#if SQLITE3MC
317317
[Fact]
318318
public void Open_decrypts_lazily_when_no_password()
319319
{
@@ -1287,7 +1287,7 @@ public void Open_releases_handle_when_constructor_fails()
12871287
var ex = Assert.Throws<InvalidOperationException>(connection.Open);
12881288
Assert.Equal(Resources.EncryptionNotSupported(GetNativeLibraryName()), ex.Message);
12891289
Assert.Equal(ConnectionState.Closed, connection.State);
1290-
#elif E_SQLCIPHER || E_SQLITE3MC || SQLCIPHER
1290+
#elif SQLITE3MC
12911291
var ex = Assert.Throws<SqliteException>(connection.Open);
12921292
Assert.Equal(SQLITE_NOTADB, ex.SqliteErrorCode);
12931293
Assert.Equal(ConnectionState.Closed, connection.State);

test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
"Microsoft.Data.Sqlite.winsqlite3.Tests")]
2121
#elif SQLITE3
2222
"Microsoft.Data.Sqlite.sqlite3.Tests")]
23+
#elif SQLITE3MC
24+
"Microsoft.Data.Sqlite.sqlite3mc.Tests")]
2325
#else
2426
#error Unexpected native library
2527
#endif

0 commit comments

Comments
 (0)