From bfb561e298a216f7836c0ab1fcbde4ea5e7c213c Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Fri, 22 Aug 2025 10:59:27 +1000
Subject: [PATCH 1/2] Update Microsoft.Data.SqlClient to v5

5.1.6 is the lowest version that is not deprecated and does not report vulnerabilities
---
 src/NHibernate.Test/NHibernate.Test.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
index c11820cdab..01167762bd 100644
--- a/src/NHibernate.Test/NHibernate.Test.csproj
+++ b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -56,7 +56,7 @@
   <ItemGroup>
     <PackageReference Include="log4net" Version="3.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.OData" Version="7.7.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="3.1.5" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.6" />
     <PackageReference Include="NHibernate.Caches.CoreDistributedCache.Memory" Version="5.9.0" />
     <PackageReference Include="NHibernate.Caches.Util.JsonSerializer" Version="5.9.0" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.117" />

From 3beaa365e3de6ef61a65a8f9ba959520bff55ecb Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Fri, 22 Aug 2025 11:13:08 +1000
Subject: [PATCH 2/2] Set TrustServerCertificate=true as mitigation for
 encrypting connection by default

---
 .github/workflows/NetCoreTests.yml | 2 +-
 appveyor.yml                       | 2 +-
 teamcity.build                     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/NetCoreTests.yml b/.github/workflows/NetCoreTests.yml
index 093c1e9953..da62800678 100644
--- a/.github/workflows/NetCoreTests.yml
+++ b/.github/workflows/NetCoreTests.yml
@@ -16,7 +16,7 @@ jobs:
             DB_INIT: |
               docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=P@ssw0rd" -e "MSSQL_PID=Express" -p 1433:1433 -d --name sqlexpress mcr.microsoft.com/mssql/server:2019-latest;
           - DB: SqlServer2008-MicrosoftDataSqlClientDriver
-            CONNECTION_STRING: "Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;packet size=4096;"
+            CONNECTION_STRING: "Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;packet size=4096;TrustServerCertificate=true;"
             OS: ubuntu-latest
             DB_INIT: |
               docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=P@ssw0rd" -e "MSSQL_PID=Express" -p 1433:1433 -d --name sqlexpress mcr.microsoft.com/mssql/server:2019-latest;
diff --git a/appveyor.yml b/appveyor.yml
index e497e3469d..9a26700c4c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,7 @@ environment:
   - DB: SqlServer2008
     CONNECTION_STRING: Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;
   - DB: SqlServer2008-MicrosoftDataSqlClientDriver
-    CONNECTION_STRING: Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;
+    CONNECTION_STRING: Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;TrustServerCertificate=true;
   - DB: Firebird
   - DB: Firebird4
   - DB: MySQL
diff --git a/teamcity.build b/teamcity.build
index 0d2955c26b..7d26cb2572 100644
--- a/teamcity.build
+++ b/teamcity.build
@@ -72,6 +72,7 @@
 	<target name="setup-teamcity-sqlServer-MicrosoftDataSqlClientDriver">
 		<property name="db-service" value="MSSQL$SQLEXPRESS" />
 		<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.MicrosoftDataSqlClientDriver" />
+		<property name="nhibernate.connection.connection_string" value="Server=(local);initial catalog=nhibernate;Integrated Security=SSPI;TrustServerCertificate=true;" />
 	</target>
 
 	<target name="setup-teamcity-sqlServer2012">