Merge branch 'master' into AsyncSupport

nhibernate · Jan 27, 2024 · 27612fe · 27612fe
2 parents 041f6ab + fd99653
commit 27612fe
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -21,8 +21,8 @@ jobs:
             dialect: "NHibernate.Dialect.FirebirdDialect"
             driverclass: "NHibernate.Driver.FirebirdClientDriver"
           - db: MySQL
-            connectionstring: "Server=localhost;Uid=root;Password=envers;Database=envers;Old Guids=True;SslMode=none;"
-            dialect: "NHibernate.Dialect.MySQL5Dialect"
+            connectionstring: "Server=localhost;Uid=root;Password=envers;Database=envers;SslMode=none;"
+            dialect: "NHibernate.Dialect.MySQL8InnoDBDialect"
             driverclass: "NHibernate.Driver.MySqlConnector.MySqlConnectorDriver, NHibernate.Driver.MySqlConnector"
           - db: Oracle
             connectionstring: "User ID=envers;Password=envers;Metadata Pooling=false;Self Tuning=false;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XEPDB1)))"
@@ -47,7 +47,7 @@ jobs:
       if: matrix.db == 'MySQL'
       run: |
         sudo service mysql stop
-        docker run --name mysql -e MYSQL_ROOT_PASSWORD=envers -e MYSQL_USER=envers -e MYSQL_PASSWORD=envers -e MYSQL_DATABASE=envers -p 3306:3306 --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 -d mysql:5.7 mysqld --lower_case_table_names=1 --character-set-server=utf8 --collation-server=utf8_general_ci
+        docker run --name mysql --tmpfs /var/lib/mysql:rw,noexec,nosuid,size=256m -e MYSQL_ROOT_PASSWORD=envers -e MYSQL_USER=envers -e MYSQL_PASSWORD=envers -e MYSQL_DATABASE=envers -p 3306:3306 --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 -d mysql:8.0 mysqld --lower_case_table_names=1 --skip-ssl --default_authentication_plugin=mysql_native_password
     - name: Set up Oracle
       if: matrix.db == 'Oracle'
       run: |

diff --git a/Src/NHibernate.Envers.Tests/NHibernate.Envers.Tests.csproj b/Src/NHibernate.Envers.Tests/NHibernate.Envers.Tests.csproj
@@ -25,10 +25,10 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
     <PackageReference Include="SharpTestsEx" Version="2.0.0" />
-    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
-    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.120" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.180" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Src/NHibernate.Envers/NHibernate.Envers.csproj b/Src/NHibernate.Envers/NHibernate.Envers.csproj
@@ -18,6 +18,6 @@
     <DebugType>Portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NHibernate" Version="[5.4.0, 5.5.0)" />
+    <PackageReference Include="NHibernate" Version="[5.5.0, 5.6.0)" />
   </ItemGroup>
 </Project>
diff --git a/Src/NHibernate.Envers/RevisionType.cs b/Src/NHibernate.Envers/RevisionType.cs
@@ -18,6 +18,6 @@ public enum RevisionType
 		/// <summary>
 		/// Indicates that the entity was deleted (removed) at that revision.
 		/// </summary>
-		Deleted = 2,
+		Deleted = 2
 	}
 }
diff --git a/Src/ReleaseNotes.txt b/Src/ReleaseNotes.txt
@@ -1,4 +1,14 @@
-=== vNext, NH 5.4.0 ===
+=== vNext ===
+
+** Tasks
+* #51 Run tests on MySQL 8 with MySQL8InnoDBDialect
+
+
+=== v5.5.0 (v 5.5.0.0), 2024-01-04, NH 5.5.0 ===
+
+
+
+=== v5.4.0 (v 5.4.0.0), 2022-11-23, NH 5.4.0 ===