From 91e0748b6663fba5deef73120e359e74a04a3050 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2026 15:08:22 +0000 Subject: [PATCH 1/7] [deps]: Update linq2db to v6 --- .../Infrastructure.EntityFramework.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj b/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj index 180bcd770575..06393f62d446 100644 --- a/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj +++ b/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj @@ -7,7 +7,7 @@ - + From 12d4be184bbf648ce94a4f00ecbfb690e8a8fcc9 Mon Sep 17 00:00:00 2001 From: Robert Y Date: Thu, 9 Apr 2026 06:44:27 -0600 Subject: [PATCH 2/7] fix: use Microsoft.EntityFrameworkCore for async query methods removed in linq2db 6.x --- .../Billing/Repositories/ProviderInvoiceItemRepository.cs | 2 +- .../Dirt/Repositories/OrganizationApplicationRepository.cs | 2 +- .../Dirt/Repositories/OrganizationReportRepository.cs | 1 + .../Repositories/PasswordHealthReportApplicationRepository.cs | 2 +- .../Vault/Repositories/CipherRepositoryTests.cs | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Infrastructure.EntityFramework/Billing/Repositories/ProviderInvoiceItemRepository.cs b/src/Infrastructure.EntityFramework/Billing/Repositories/ProviderInvoiceItemRepository.cs index ed729070ae99..6c143ecd7153 100644 --- a/src/Infrastructure.EntityFramework/Billing/Repositories/ProviderInvoiceItemRepository.cs +++ b/src/Infrastructure.EntityFramework/Billing/Repositories/ProviderInvoiceItemRepository.cs @@ -2,7 +2,7 @@ using Bit.Core.Billing.Providers.Entities; using Bit.Core.Billing.Providers.Repositories; using Bit.Infrastructure.EntityFramework.Repositories; -using LinqToDB; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using EFProviderInvoiceItem = Bit.Infrastructure.EntityFramework.Billing.Models.ProviderInvoiceItem; diff --git a/src/Infrastructure.EntityFramework/Dirt/Repositories/OrganizationApplicationRepository.cs b/src/Infrastructure.EntityFramework/Dirt/Repositories/OrganizationApplicationRepository.cs index f408ed85ba4a..b5504906b49f 100644 --- a/src/Infrastructure.EntityFramework/Dirt/Repositories/OrganizationApplicationRepository.cs +++ b/src/Infrastructure.EntityFramework/Dirt/Repositories/OrganizationApplicationRepository.cs @@ -2,7 +2,7 @@ using Bit.Core.Dirt.Repositories; using Bit.Infrastructure.EntityFramework.Dirt.Models; using Bit.Infrastructure.EntityFramework.Repositories; -using LinqToDB; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; namespace Bit.Infrastructure.EntityFramework.Dirt.Repositories; diff --git a/src/Infrastructure.EntityFramework/Dirt/Repositories/OrganizationReportRepository.cs b/src/Infrastructure.EntityFramework/Dirt/Repositories/OrganizationReportRepository.cs index c06519f12a16..570a6976b3a1 100644 --- a/src/Infrastructure.EntityFramework/Dirt/Repositories/OrganizationReportRepository.cs +++ b/src/Infrastructure.EntityFramework/Dirt/Repositories/OrganizationReportRepository.cs @@ -8,6 +8,7 @@ using Bit.Core.Dirt.Repositories; using Bit.Infrastructure.EntityFramework.Repositories; using LinqToDB; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; diff --git a/src/Infrastructure.EntityFramework/Dirt/Repositories/PasswordHealthReportApplicationRepository.cs b/src/Infrastructure.EntityFramework/Dirt/Repositories/PasswordHealthReportApplicationRepository.cs index 296a542a8bb7..d49dd93cb035 100644 --- a/src/Infrastructure.EntityFramework/Dirt/Repositories/PasswordHealthReportApplicationRepository.cs +++ b/src/Infrastructure.EntityFramework/Dirt/Repositories/PasswordHealthReportApplicationRepository.cs @@ -2,7 +2,7 @@ using Bit.Core.Dirt.Repositories; using Bit.Infrastructure.EntityFramework.Dirt.Models; using Bit.Infrastructure.EntityFramework.Repositories; -using LinqToDB; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; namespace Bit.Infrastructure.EntityFramework.Dirt.Repositories; diff --git a/test/Infrastructure.EFIntegration.Test/Vault/Repositories/CipherRepositoryTests.cs b/test/Infrastructure.EFIntegration.Test/Vault/Repositories/CipherRepositoryTests.cs index 02c65319db55..d2d19b5e6492 100644 --- a/test/Infrastructure.EFIntegration.Test/Vault/Repositories/CipherRepositoryTests.cs +++ b/test/Infrastructure.EFIntegration.Test/Vault/Repositories/CipherRepositoryTests.cs @@ -10,7 +10,7 @@ using Bit.Infrastructure.EntityFramework.Repositories.Vault.Queries; using Bit.Infrastructure.EntityFramework.Vault.Repositories.Queries; using Bit.Test.Common.AutoFixture.Attributes; -using LinqToDB; +using Microsoft.EntityFrameworkCore; using Xunit; using EfAdminConsoleRepo = Bit.Infrastructure.EntityFramework.AdminConsole.Repositories; using EfRepo = Bit.Infrastructure.EntityFramework.Repositories; From a6cdb3105257bd9882821d05526a4a4029cbcafe Mon Sep 17 00:00:00 2001 From: Robert Y Date: Thu, 9 Apr 2026 06:53:16 -0600 Subject: [PATCH 3/7] fix: replace LinqToDB with Microsoft.EntityFrameworkCore for SingleAsync in IdentityApplicationFactory --- .../Factories/IdentityApplicationFactory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs b/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs index af60cadce464..f3d973fed6da 100644 --- a/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs +++ b/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs @@ -15,8 +15,8 @@ using Bit.Identity.IdentityServer; using Bit.Identity.IdentityServer.RequestValidators; using Bit.Test.Common.Helpers; -using LinqToDB; using Microsoft.AspNetCore.Hosting; +using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Http; using NSubstitute; using Xunit; From 861f1e791b459604999ae12b81e06d27b16fb2b8 Mon Sep 17 00:00:00 2001 From: Robert Y Date: Thu, 9 Apr 2026 07:02:49 -0600 Subject: [PATCH 4/7] fix: replace LinqToDB with Microsoft.EntityFrameworkCore for FirstAsync, fix import ordering --- .../Endpoints/IdentityServerTwoFactorTests.cs | 2 +- .../Factories/IdentityApplicationFactory.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Identity.IntegrationTest/Endpoints/IdentityServerTwoFactorTests.cs b/test/Identity.IntegrationTest/Endpoints/IdentityServerTwoFactorTests.cs index ba2a551e15cd..64617bd9809a 100644 --- a/test/Identity.IntegrationTest/Endpoints/IdentityServerTwoFactorTests.cs +++ b/test/Identity.IntegrationTest/Endpoints/IdentityServerTwoFactorTests.cs @@ -20,7 +20,7 @@ using Duende.IdentityModel; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; -using LinqToDB; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Distributed; using NSubstitute; using Xunit; diff --git a/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs b/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs index f3d973fed6da..12f28c586cbe 100644 --- a/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs +++ b/test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs @@ -16,8 +16,8 @@ using Bit.Identity.IdentityServer.RequestValidators; using Bit.Test.Common.Helpers; using Microsoft.AspNetCore.Hosting; -using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Http; +using Microsoft.EntityFrameworkCore; using NSubstitute; using Xunit; From 8adadbdc9943d7a5f2767f27ab63574cb7c21729 Mon Sep 17 00:00:00 2001 From: Robert Y Date: Thu, 9 Apr 2026 07:11:04 -0600 Subject: [PATCH 5/7] fix: bump linq2db.EntityFrameworkCore to 8.5.0 for compatibility with linq2db 6.x --- .../Infrastructure.EntityFramework.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj b/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj index 06393f62d446..b89c9e5f3dfb 100644 --- a/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj +++ b/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj @@ -13,7 +13,7 @@ - + From b270931b56d9546b7d5e25f3a05d6ab3dc5f2185 Mon Sep 17 00:00:00 2001 From: Robert Y Date: Thu, 9 Apr 2026 08:41:01 -0600 Subject: [PATCH 6/7] trigger review From 6de8e6b51188ad0557b294e5323510d1fd1b0ca0 Mon Sep 17 00:00:00 2001 From: Robert Y Date: Thu, 9 Apr 2026 08:56:22 -0600 Subject: [PATCH 7/7] fix: add bracket pinning for linq2db version --- .../Infrastructure.EntityFramework.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj b/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj index b89c9e5f3dfb..cb8ec6845ad3 100644 --- a/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj +++ b/src/Infrastructure.EntityFramework/Infrastructure.EntityFramework.csproj @@ -7,7 +7,7 @@ - +