Merge branch 'master' into GH3643

Author: fredericDelaporte

.editorconfig

@@ -27,6 +27,9 @@ dotnet_diagnostic.NUnit2031.severity = suggestion
 dotnet_diagnostic.NUnit2049.severity = suggestion
 # The SameAs constraint always fails on value types as the actual and the expected value cannot be the same reference
 dotnet_diagnostic.NUnit2040.severity = suggestion
+dotnet_diagnostic.CA1849.severity = error
+dotnet_diagnostic.CA2007.severity = error
+dotnet_code_quality.CA2007.output_kind = DynamicallyLinkedLibrary
 
 [*.xsd]
 indent_style = tab

.gitattributes

@@ -11,6 +11,7 @@
 *.cmd     text
 *.msbuild text
 *.md      text
+*.sql     text
 
 *.sln text eol=crlf
 *.csproj text eol=crlf

.github/workflows/GenerateAsyncCode.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: ${{ github.event.pull_request.head.ref }}
         repository: ${{ github.event.pull_request.head.repo.full_name }}

.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;
@@ -69,7 +69,7 @@ jobs:
         dotnet-version: 8.0.x
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         show-progress: false
 

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

build-common/NHibernate.props

@@ -47,6 +47,9 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PublicKey>
+      002400000480000094000000060200000024000052534131000400000100010097dcf11f130a2a2ac4df89be27a41d403258c943574cd324c819f20798506b9ffadf8870efae2c40073b6cd97076e88a3c80dfe5011d259de719e85d68d1673720f6a36476a3a25b6a6277dd8bc3ce394f5c2a7b04bda884edc8d4c9d6e1d376b509ba68ae64031cab45b0b1a4ea95933258722a3a4ee98f1c6b4c8571e3b8a5
+    </PublicKey>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />

doc/reference/modules/configuration.xml

@@ -1606,6 +1606,11 @@ in the parameter binding.</programlisting>
                             <entry><literal>NHibernate.Dialect.SybaseASE15Dialect</literal></entry>
                             <entry></entry>
                         </row>
+                        <row>
+                            <entry>Sybase Adaptive Server Enterprise 16</entry>
+                            <entry><literal>NHibernate.Dialect.SybaseASE16Dialect</literal></entry>
+                            <entry></entry>
+                        </row>
                         <row>
                             <entry>Sybase SQL Anywhere 10</entry>
                             <entry><literal>NHibernate.Dialect.SybaseSQLAnywhere10Dialect</literal></entry>

releasenotes.txt

@@ -1,4 +1,17 @@
-Build 5.5.2
+Build 5.5.3
+=============================
+
+Release notes - NHibernate - Version 5.5.3
+
+2 issues were resolved in this release.
+
+** Task
+
+   * #3692 Release 5.5.3
+   * #3691 Merge 5.4.10 into 5.5.x
+
+
+Build 5.5.2
 =============================
 
 Release notes - NHibernate - Version 5.5.2
@@ -122,6 +135,23 @@ Release notes - NHibernate - Version 5.5.0
    * #3412 Revive hql ParsingFixture
 
 
+Build 5.4.10
+=============================
+
+Release notes - NHibernate - Version 5.4.10
+
+3 issues were resolved in this release.
+
+** Bug
+
+   * #3609 Fitering with a subquery on a many-to-one with property-ref generates invalid SQL
+   * #3607 Invalid ByCode serialization to XML for OneToOne mappings
+
+** Task
+
+   * #3688 Release 5.4.10
+
+
 Build 5.4.9
 =============================
 

src/NHibernate.DomainModel/NHibernate.DomainModel.csproj

@@ -6,6 +6,10 @@
     <IsTestProject>true</IsTestProject>
     <NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\NHibernate.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <None Remove="**\*.hbm.xml" />
   </ItemGroup>
@@ -15,4 +19,7 @@
   <ItemGroup>
     <ProjectReference Include="..\NHibernate\NHibernate.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
+  </ItemGroup>
 </Project>

src/NHibernate.DomainModel/Northwind/Entities/AnotherEntity.cs

@@ -4,6 +4,7 @@ public class AnotherEntity
     {
         public virtual int Id { get; set; }
         public virtual string Output { get; set; }
-		public virtual string Input { get; set; }
+        public virtual string Input { get; set; } 
+        public virtual CompositeIdEntity CompositeIdEntity { get; set; }
     }
-}
+}