From 127ebc50728a9832f60a2cff13aed1c03dc9b4a7 Mon Sep 17 00:00:00 2001 From: Brice Lambson Date: Wed, 2 Nov 2022 09:48:51 -0700 Subject: [PATCH 1/2] :arrow_up: Update to SQLitePCLRaw 2.1.2 (#29435) --- .../EFCore.Sqlite.Benchmarks.csproj | 2 +- src/EFCore.Sqlite/EFCore.Sqlite.csproj | 2 +- .../Microsoft.Data.Sqlite.Core.csproj | 2 +- src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj | 2 +- .../EFCore.Sqlite.FunctionalTests.csproj | 2 +- .../Scaffolding/SqliteDatabaseModelFactoryTest.cs | 10 +++++----- .../Microsoft.Data.Sqlite.Tests.csproj | 2 +- .../Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj | 2 +- .../Microsoft.Data.Sqlite.sqlite3.Tests.csproj | 2 +- .../Microsoft.Data.Sqlite.winsqlite3.Tests.csproj | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj b/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj index 1e69372b348..08d444909a5 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj +++ b/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/EFCore.Sqlite/EFCore.Sqlite.csproj b/src/EFCore.Sqlite/EFCore.Sqlite.csproj index 231c9c36f77..c1a2b88af61 100644 --- a/src/EFCore.Sqlite/EFCore.Sqlite.csproj +++ b/src/EFCore.Sqlite/EFCore.Sqlite.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj b/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj index 801c3e67826..9a4adce8145 100644 --- a/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj +++ b/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj @@ -39,7 +39,7 @@ Microsoft.Data.Sqlite.SqliteTransaction - + diff --git a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj index cabcd1466f9..dd337e8d27c 100644 --- a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj +++ b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj @@ -24,7 +24,7 @@ Microsoft.Data.Sqlite.SqliteTransaction - + diff --git a/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj b/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj index fdd118480a7..d8cb29affbf 100644 --- a/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj +++ b/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj @@ -18,7 +18,7 @@ - + diff --git a/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs b/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs index 5d5b699317e..d772b88443c 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs @@ -383,11 +383,11 @@ RandomProperty randomType { var columns = dbModel.Tables.Single().Columns; - Assert.Equal("integer", columns.Single(c => c.Name == "IntegerProperty").StoreType); - Assert.Equal("real", columns.Single(c => c.Name == "RealProperty").StoreType); - Assert.Equal("text", columns.Single(c => c.Name == "TextProperty").StoreType); - Assert.Equal("blob", columns.Single(c => c.Name == "BlobProperty").StoreType); - Assert.Equal("randomType", columns.Single(c => c.Name == "RandomProperty").StoreType); + Assert.Equal("integer", columns.Single(c => c.Name == "IntegerProperty").StoreType, ignoreCase: true); + Assert.Equal("real", columns.Single(c => c.Name == "RealProperty").StoreType, ignoreCase: true); + Assert.Equal("text", columns.Single(c => c.Name == "TextProperty").StoreType, ignoreCase: true); + Assert.Equal("blob", columns.Single(c => c.Name == "BlobProperty").StoreType, ignoreCase: true); + Assert.Equal("randomType", columns.Single(c => c.Name == "RandomProperty").StoreType, ignoreCase: true); }, "DROP TABLE StoreType;"); } 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 987df8b6193..2b2abc83e8b 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj @@ -11,7 +11,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 index 7987d9734bf..94e4dad52cc 100644 --- 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 @@ -11,7 +11,7 @@ - + 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 efd58536fcb..317339a31a9 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,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 7f7909af569..03e6fbbe5c0 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,7 @@ - + From 2e955f4a856ea3ab58b1dfc2e2a4eb3b517d1484 Mon Sep 17 00:00:00 2001 From: Brice Lambson Date: Wed, 2 Nov 2022 09:49:05 -0700 Subject: [PATCH 2/2] :arrow_up: Update to SQLitePCLRaw 2.1.2 (#29434) --- eng/Versions.props | 6 +++--- .../Scaffolding/SqliteDatabaseModelFactoryTest.cs | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d4a0a1d4598..00519a6239c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,9 +24,9 @@ 2.0.0 2.0.0 2.0.0 - 2.0.4 - 2.0.4 - 2.0.4 + 2.1.2 + 2.1.2 + 2.1.2 1.1.118 0.11.3 1.1.3 diff --git a/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs b/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs index 1e64115707d..baa78e1478a 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs @@ -337,11 +337,11 @@ RandomProperty randomType { var columns = dbModel.Tables.Single().Columns; - Assert.Equal("integer", columns.Single(c => c.Name == "IntegerProperty").StoreType); - Assert.Equal("real", columns.Single(c => c.Name == "RealProperty").StoreType); - Assert.Equal("text", columns.Single(c => c.Name == "TextProperty").StoreType); - Assert.Equal("blob", columns.Single(c => c.Name == "BlobProperty").StoreType); - Assert.Equal("randomType", columns.Single(c => c.Name == "RandomProperty").StoreType); + Assert.Equal("integer", columns.Single(c => c.Name == "IntegerProperty").StoreType, ignoreCase: true); + Assert.Equal("real", columns.Single(c => c.Name == "RealProperty").StoreType, ignoreCase: true); + Assert.Equal("text", columns.Single(c => c.Name == "TextProperty").StoreType, ignoreCase: true); + Assert.Equal("blob", columns.Single(c => c.Name == "BlobProperty").StoreType, ignoreCase: true); + Assert.Equal("randomType", columns.Single(c => c.Name == "RandomProperty").StoreType, ignoreCase: true); }, "DROP TABLE StoreType;"); }