diff --git a/.editorconfig b/.editorconfig
index f25bbdc43..a87fd69d8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -27,7 +27,7 @@ tab_width = 2
 
 
 # Solution and project configuration files
-[*.{props,targets,yml,ruleset,nuspec,vsixmanifest,vsct}]
+[*.{props,targets,manifest,yml,ruleset,nuspec,vsixmanifest,vsct}]
 indent_size = 2
 tab_width = 2
 
@@ -76,56 +76,57 @@ dotnet_sort_system_directives_first = true
 file_header_template = unset
 
 # this. and Me. preferences
-dotnet_style_qualification_for_event = false
-dotnet_style_qualification_for_field = false
-dotnet_style_qualification_for_method = false
-dotnet_style_qualification_for_property = false
+dotnet_style_qualification_for_event = false:silent
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_property = false:silent
 
 # Language keywords vs BCL types preferences
-dotnet_style_predefined_type_for_locals_parameters_members = true
-dotnet_style_predefined_type_for_member_access = true
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
 
 # Parentheses preferences
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
 
 # Modifier preferences
-dotnet_style_require_accessibility_modifiers = for_non_interface_members
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
 
 # Expression-level preferences
-dotnet_style_coalesce_expression = true
-dotnet_style_collection_initializer = true
-dotnet_style_explicit_tuple_names = true
-dotnet_style_namespace_match_folder = true
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
 dotnet_diagnostic.IDE0130.severity = suggestion
-dotnet_style_null_propagation = true
-dotnet_style_object_initializer = true
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_object_initializer = true:suggestion
 dotnet_style_operator_placement_when_wrapping = end_of_line
-dotnet_style_prefer_auto_properties = true
-dotnet_style_prefer_compound_assignment = true
-dotnet_style_prefer_conditional_expression_over_assignment = true
-dotnet_style_prefer_conditional_expression_over_return = true
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_collection_expression = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
 dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
-dotnet_style_prefer_inferred_anonymous_type_member_names = true
-dotnet_style_prefer_inferred_tuple_names = true
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true
-dotnet_style_prefer_simplified_boolean_expressions = true
-dotnet_style_prefer_simplified_interpolation = true
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
 
 # Field preferences
-dotnet_style_readonly_field = true
+dotnet_style_readonly_field = true:suggestion
 
 # Parameter preferences
-dotnet_code_quality_unused_parameters = all
+dotnet_code_quality_unused_parameters = all:suggestion
 
 # Suppression preferences
 dotnet_remove_unnecessary_suppression_exclusions = none
 
 # New line preferences
-dotnet_style_allow_multiple_blank_lines_experimental = true
-dotnet_style_allow_statement_immediately_after_block_experimental = false
+dotnet_style_allow_multiple_blank_lines_experimental = true:silent
+dotnet_style_allow_statement_immediately_after_block_experimental = false:silent
 
 
 #### Naming styles ####
@@ -177,11 +178,19 @@ dotnet_naming_style.begins_with_i.capitalization = pascal_case
 
 # CA1307: Specify StringComparison for clarity
 # https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1307
-dotnet_diagnostic.CA1307.severity = suggestion
+dotnet_diagnostic.CA1307.severity = warning
 
 # CA1309: Use ordinal StringComparison
 # https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1309
-dotnet_diagnostic.CA1309.severity = suggestion
+dotnet_diagnostic.CA1309.severity = warning
+
+# CA1311: Specify a culture or use an invariant version
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1311
+dotnet_diagnostic.CA1311.severity = warning
+
+# CA1815: Override equals and operator equals on value types
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1815
+dotnet_diagnostic.CA1815.severity = error
 
 
 # C# files
@@ -190,64 +199,64 @@ dotnet_diagnostic.CA1309.severity = suggestion
 #### C# Coding Conventions ####
 
 # var preferences
-csharp_style_var_elsewhere = true
-csharp_style_var_for_built_in_types = true
-csharp_style_var_when_type_is_apparent = true
+csharp_style_var_elsewhere = true:silent
+csharp_style_var_for_built_in_types = true:silent
+csharp_style_var_when_type_is_apparent = true:silent
 
 # Expression-bodied members
-csharp_style_expression_bodied_accessors = true
-csharp_style_expression_bodied_constructors = false
-csharp_style_expression_bodied_indexers = true
-csharp_style_expression_bodied_lambdas = true
-csharp_style_expression_bodied_local_functions = false
-csharp_style_expression_bodied_methods = false
-csharp_style_expression_bodied_operators = false
-csharp_style_expression_bodied_properties = true
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
 
 # Pattern matching preferences
-csharp_style_pattern_matching_over_as_with_null_check = true
-csharp_style_pattern_matching_over_is_with_cast_check = true
-csharp_style_prefer_extended_property_pattern = true
-csharp_style_prefer_not_pattern = true
-csharp_style_prefer_pattern_matching = true
-csharp_style_prefer_switch_expression = true
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_prefer_extended_property_pattern = true:suggestion
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_prefer_switch_expression = true:suggestion
 
 # Null-checking preferences
-csharp_style_conditional_delegate_call = true
+csharp_style_conditional_delegate_call = true:suggestion
 
 # Modifier preferences
-csharp_prefer_static_local_function = true
+csharp_prefer_static_local_function = true:suggestion
 csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
 
 # Code-block preferences
-csharp_prefer_braces = true
-csharp_prefer_simple_using_statement = true
-csharp_style_namespace_declarations = block_scoped
-csharp_style_prefer_method_group_conversion = true
-csharp_style_prefer_top_level_statements = true
+csharp_prefer_braces = true:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_style_namespace_declarations = file_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
 
 # Expression-level preferences
-csharp_prefer_simple_default_expression = true
-csharp_style_deconstructed_variable_declaration = true
-csharp_style_implicit_object_creation_when_type_is_apparent = true
-csharp_style_inlined_variable_declaration = true
-csharp_style_prefer_index_operator = true
-csharp_style_prefer_local_over_anonymous_function = true
-csharp_style_prefer_null_check_over_type_check = true
-csharp_style_prefer_range_operator = true
-csharp_style_prefer_tuple_swap = true
-csharp_style_prefer_utf8_string_literals = true
-csharp_style_throw_expression = true
-csharp_style_unused_value_assignment_preference = discard_variable
-csharp_style_unused_value_expression_statement_preference = discard_variable
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_prefer_index_operator = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_style_prefer_range_operator = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
 
 # 'using' directive preferences
-csharp_using_directive_placement = inside_namespace
+csharp_using_directive_placement = inside_namespace:silent
 
 # New line preferences
-csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
-csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false
-csharp_style_allow_embedded_statements_on_same_line_experimental = false
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:silent
+csharp_style_allow_embedded_statements_on_same_line_experimental = false:silent
 
 
 #### C# Formatting Rules ####
@@ -296,6 +305,11 @@ csharp_space_between_square_brackets = false
 # Wrapping preferences
 csharp_preserve_single_line_blocks = true
 csharp_preserve_single_line_statements = true
+csharp_style_prefer_primary_constructors = false:suggestion
+csharp_style_prefer_readonly_struct_member = true:suggestion
+csharp_style_prefer_readonly_struct = true:suggestion
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
 
 
 # C# generated files
@@ -307,6 +321,3 @@ generated_code = true
 [*.vb]
 # Modifier preferences
 visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async
-
-
-
diff --git a/.gitattributes b/.gitattributes
index b064dcd65..92e024d03 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -67,6 +67,3 @@ MAKEFILE    text eol=crlf
 *.PDF       diff=astextplain
 *.rtf       diff=astextplain
 *.RTF       diff=astextplain
-
-
-
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8c91063a2..3a72b0dfe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
         os: [windows-latest, ubuntu-latest, macos-latest]
         project:
           - 'Castle.Facilities.NHibernateIntegration.sln'
-        framework: [net7.0, net6.0, net48]
+        framework: [net8.0, net7.0, net6.0, net48]
         configuration: [Release]
         exclude:
           - os: ubuntu-latest
@@ -36,6 +36,12 @@ jobs:
       - name: Checkout Source Code
         uses: actions/checkout@v3
 
+      - name: Setup .NET 8.0 SDK
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 8.0.x
+        if: ${{ startswith(matrix.framework, 'net8.') }}
+
       - name: Setup .NET 7.0 SDK
         uses: actions/setup-dotnet@v3
         with:
diff --git a/.gitignore b/.gitignore
index d47f4e545..51c2a1030 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,11 @@
 ## https://github.com/github/gitignore
 
-src/*/bin/
-src/*/obj/
-lib/packages/
-packages/
+.vs/
+.idea/
 build/
 bin/
-log/
 obj/
-temp/
-.vs/
-.idea/
+log/
 
 *.suo
 *.user
@@ -19,6 +14,3 @@ temp/
 *.log
 *.cache
 Thumbs.db
-
-
-
diff --git a/BuildPackages.cmd b/BuildPackages.cmd
index a851a998e..6e9fe3b11 100644
--- a/BuildPackages.cmd
+++ b/BuildPackages.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM ****************************************************************************
-REM Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+REM Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 REM Licensed under the Apache License, Version 2.0 (the "License");
 REM you may not use this file except in compliance with the License.
 REM You may obtain a copy of the License at
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29438f2fa..f068f68c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,11 @@
 # Castle.Facilities.NHibernateIntegration - Changelog
 
-## 5.4.0 (2023-xx-xx)
+## 5.4.0 (2024-xx-xx)
 
 Improvements:
-- Added .NET 7.0 support
+- Added .NET 8.0 and .NET 7.0 support
 - Updated [System.Data.SqlClient] version to 4.8.5
-- Updated [NHibernate] version to 5.4.6
+- Updated [NHibernate] version to 5.4.7
 
 Breaking Changes:
 - Upgraded [Castle.Core] version to 5.1.1 (TBD)
diff --git a/Castle.Facilities.NHibernateIntegration.sln b/Castle.Facilities.NHibernateIntegration.sln
index 8534d7d03..f15ccf949 100644
--- a/Castle.Facilities.NHibernateIntegration.sln
+++ b/Castle.Facilities.NHibernateIntegration.sln
@@ -2,24 +2,35 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32616.157
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Castle Build", "Castle Build", "{31144CF9-AFCB-4A8C-80A7-3A834D6AAFE2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Castle", "Castle", "{31144CF9-AFCB-4A8C-80A7-3A834D6AAFE2}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		CHANGELOG.md = CHANGELOG.md
+		CONTRIBUTING.md = CONTRIBUTING.md
+		LICENSE = LICENSE
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{34CB1007-C1A1-4CCE-A4C9-56FCFE3988DD}"
+	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
 		build.cmd = build.cmd
-		buildscripts\build.cmd = buildscripts\build.cmd
 		build.sh = build.sh
 		BuildPackages.cmd = BuildPackages.cmd
-		buildscripts\BuildPackages.cmd = buildscripts\BuildPackages.cmd
-		CHANGELOG.md = CHANGELOG.md
 		CleanPackages.cmd = CleanPackages.cmd
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+		Directory.Packages.props = Directory.Packages.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "buildscripts", "buildscripts", "{D7F0D6E6-A41E-4F41-B7FD-65B07D5BA6E0}"
+	ProjectSection(SolutionItems) = preProject
+		buildscripts\build.cmd = buildscripts\build.cmd
+		buildscripts\BuildPackages.cmd = buildscripts\BuildPackages.cmd
 		buildscripts\common.props = buildscripts\common.props
 		buildscripts\CommonAssemblyInfo.cs = buildscripts\CommonAssemblyInfo.cs
-		CONTRIBUTING.md = CONTRIBUTING.md
-		LICENSE = LICENSE
-		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Actions", "GitHub Actions", "{47F2F74D-7773-450C-B6E7-2D3B7C8814A8}"
@@ -27,6 +38,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Actions", "GitHub Ac
 		.github\workflows\build.yml = .github\workflows\build.yml
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CD342E79-A425-4922-8CFE-4B990EACF71E}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+		src\Directory.Build.targets = src\Directory.Build.targets
+	EndProjectSection
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Facilities.NHibernateIntegration", "src\Castle.Facilities.NHibernateIntegration\Castle.Facilities.NHibernateIntegration.csproj", "{5E3FDB17-A6C1-4FA2-8834-17AA672746D5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Facilities.NHibernateIntegration.Tests", "src\Castle.Facilities.NHibernateIntegration.Tests\Castle.Facilities.NHibernateIntegration.Tests.csproj", "{1D68E0C9-FFC1-4271-8194-1AD17C318433}"
@@ -50,7 +67,10 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{47F2F74D-7773-450C-B6E7-2D3B7C8814A8} = {31144CF9-AFCB-4A8C-80A7-3A834D6AAFE2}
+		{47F2F74D-7773-450C-B6E7-2D3B7C8814A8} = {34CB1007-C1A1-4CCE-A4C9-56FCFE3988DD}
+		{34CB1007-C1A1-4CCE-A4C9-56FCFE3988DD} = {31144CF9-AFCB-4A8C-80A7-3A834D6AAFE2}
+		{D7F0D6E6-A41E-4F41-B7FD-65B07D5BA6E0} = {34CB1007-C1A1-4CCE-A4C9-56FCFE3988DD}
+		{CD342E79-A425-4922-8CFE-4B990EACF71E} = {34CB1007-C1A1-4CCE-A4C9-56FCFE3988DD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A4EC0140-6DD7-4D6D-8F91-38F891D8DC44}
diff --git a/Castle.Facilities.NHibernateIntegration.sln.licenseheader b/Castle.Facilities.NHibernateIntegration.sln.licenseheader
index 6d1abbec5..2b4614686 100644
--- a/Castle.Facilities.NHibernateIntegration.sln.licenseheader
+++ b/Castle.Facilities.NHibernateIntegration.sln.licenseheader
@@ -1,7 +1,7 @@
 extensions: designer.cs generated.cs
 extensions: .cs .cpp .h
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ extensions: .cs .cpp .h
 
 extensions: .vb
 #Region License
-' Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+' Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 '
 ' Licensed under the Apache License, Version 2.0 (the "License");
 ' you may not use this file except in compliance with the License.
diff --git a/CleanPackages.cmd b/CleanPackages.cmd
index de1f1a6e2..27fba85cf 100644
--- a/CleanPackages.cmd
+++ b/CleanPackages.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM ****************************************************************************
-REM Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+REM Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 REM Licensed under the Apache License, Version 2.0 (the "License");
 REM you may not use this file except in compliance with the License.
 REM You may obtain a copy of the License at
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 000000000..fe81abdb0
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,36 @@
+<Project>
+  <!--
+    https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management
+    https://devblogs.microsoft.com/nuget/introducing-central-package-management/
+  -->
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Castle.Core" Version="[4.4.1,5)" />
+    <PackageVersion Include="Castle.Facilities.AutoTx" Version="[5.4,5.5)" />
+    <PackageVersion Include="Castle.LoggingFacility" Version="[5.1.2,6)" />
+    <PackageVersion Include="Castle.Services.Transaction" Version="[5.4,5.5)" />
+    <PackageVersion Include="Castle.Windsor" Version="[5.1.2,6)" />
+    <PackageVersion Include="DotNetZip" Version="1.16.0" />
+    <PackageVersion Include="LiquidTestReports.Markdown" Version="1.0.9" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
+    <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.8.0" />
+    <PackageVersion Include="Moq" Version="4.17.2" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="NHibernate" Version="5.4.7" />
+    <PackageVersion Include="NUnit" Version="4.0.1" />
+    <PackageVersion Include="NUnit.Analyzers" Version="3.10.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageVersion Include="NUnitLite" Version="4.0.1" />
+    <PackageVersion Include="NunitXml.TestLogger" Version="3.1.15" />
+    <PackageVersion Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net6.0'">
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
+    <PackageVersion Include="IndexRange" Version="1.0.3" />
+  </ItemGroup>
+</Project>
diff --git a/README.md b/README.md
index 198309a1b..79880c8fb 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Castle.Facilities.NHibernateIntegration
 
 ## License
 
-Castle.Facilities.NHibernateIntegration is &copy; 2004-2022 Castle Project. It is free software, and may be redistributed under the terms of the [Apache 2.0](http://opensource.org/licenses/Apache-2.0) license.
+Castle.Facilities.NHibernateIntegration is &copy; 2004-2024 Castle Project. It is free software, and may be redistributed under the terms of the [Apache 2.0](http://opensource.org/licenses/Apache-2.0) license.
 
 ## NuGet Preview Feed
 
@@ -16,14 +16,13 @@ https://ci.appveyor.com/nuget/windsor-qkry8n2r6yak
 
 ## Tests
 
-The test cases run against a MSSQL Server 2008 database by default.
-But due to NHibernate's features, you can change the database to whathever you like.
+The tests run against a MSSQL Server 2008 by default.
+But due to NHibernate's features, you can change the database server to any of your choice.
 
-1. Modify the connection properties information.
+1. Create two databases on a database server, e.g.: "test" and "test2" on a MSSQL Server.
 
-   See file "facilityconfig.xml" for full details.
-
-2. Create two databases (test and test2 on a MSSQL Server will do).
+2. Modify the connection information properties in "Castle.Facilities.NHibernateIntegration.Tests" project to use the databases created.
+   See "App.config" and all "\*Configuration\*.xml" files for full details.
 
 
 
diff --git a/appveyor.yml b/appveyor.yml
index 8e6a1ebf7..6cb5f33ab 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -56,6 +56,8 @@ for:
   after_build:
   - ps: |
       $wc = New-Object System.Net.WebClient
+      $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "build\Release\Castle.Facilities.NHibernateIntegration.Tests_net8.0_TestResults.xml"))
+      $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "build\Release\Castle.Facilities.NHibernateIntegration.Tests_net7.0_TestResults.xml"))
       $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "build\Release\Castle.Facilities.NHibernateIntegration.Tests_net6.0_TestResults.xml"))
       $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "build\Release\Castle.Facilities.NHibernateIntegration.Tests_net48_TestResults.xml"))
 
diff --git a/build.cmd b/build.cmd
index 2041d4b46..c90c37e63 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM ****************************************************************************
-REM Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+REM Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 REM Licensed under the Apache License, Version 2.0 (the "License");
 REM you may not use this file except in compliance with the License.
 REM You may obtain a copy of the License at
diff --git a/build.sh b/build.sh
index e14e8eaa5..1fc804c3b 100644
--- a/build.sh
+++ b/build.sh
@@ -42,6 +42,18 @@ echo "OSNAME: $OSNAME"
 
 dotnet build "Castle.Facilities.NHibernateIntegration.sln" --configuration Release || exit 1
 
+echo ------------------------------------
+echo Running .NET (net8.0) Unit Tests
+echo ------------------------------------
+
+dotnet test "src\Castle.Facilities.NHibernateIntegration.Tests\bin\Release\net8.0\Castle.Facilities.NHibernateIntegration.Tests.dll" --results-directory "build\Release" --logger "nunit;LogFileName=Castle.Facilities.NHibernateIntegration.Tests_net8.0_TestResults.xml;format=nunit3" || exit 1
+
+echo ------------------------------------
+echo Running .NET (net7.0) Unit Tests
+echo ------------------------------------
+
+dotnet test "src\Castle.Facilities.NHibernateIntegration.Tests\bin\Release\net7.0\Castle.Facilities.NHibernateIntegration.Tests.dll" --results-directory "build\Release" --logger "nunit;LogFileName=Castle.Facilities.NHibernateIntegration.Tests_net7.0_TestResults.xml;format=nunit3" || exit 1
+
 echo ------------------------------------
 echo Running .NET (net6.0) Unit Tests
 echo ------------------------------------
@@ -62,6 +74,20 @@ if [[ !( -f "build\Release\Castle.Facilities.NHibernateIntegration.Tests_net6.0_
 fi
 
 # Unit Test Failures
+NET_FAILCOUNT=$(grep -F "One or more child tests had errors." "build\Release\Castle.Facilities.NHibernateIntegration.Tests_net8.0_TestResults.xml" | wc -l)
+if [ $NET_FAILCOUNT -ne 0 ]
+then
+    echo ".NET (net8.0) Unit Tests have failed, failing the build."
+    exit 1
+fi
+
+NET_FAILCOUNT=$(grep -F "One or more child tests had errors." "build\Release\Castle.Facilities.NHibernateIntegration.Tests_net7.0_TestResults.xml" | wc -l)
+if [ $NET_FAILCOUNT -ne 0 ]
+then
+    echo ".NET (net7.0) Unit Tests have failed, failing the build."
+    exit 1
+fi
+
 NET_FAILCOUNT=$(grep -F "One or more child tests had errors." "build\Release\Castle.Facilities.NHibernateIntegration.Tests_net6.0_TestResults.xml" | wc -l)
 if [ $NET_FAILCOUNT -ne 0 ]
 then
diff --git a/buildscripts/BuildPackages.cmd b/buildscripts/BuildPackages.cmd
index 5f57f3144..03371d0b5 100644
--- a/buildscripts/BuildPackages.cmd
+++ b/buildscripts/BuildPackages.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM ****************************************************************************
-REM Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+REM Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 REM Licensed under the Apache License, Version 2.0 (the "License");
 REM you may not use this file except in compliance with the License.
 REM You may obtain a copy of the License at
@@ -59,6 +59,12 @@ REM https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-vstest
 REM https://github.com/Microsoft/vstest-docs/blob/main/docs/report.md
 REM https://github.com/spekt/nunit.testlogger/issues/56
 
+ECHO ------------------------------------
+ECHO Running .NET (net8.0) Unit Tests
+ECHO ------------------------------------
+
+dotnet test "src\Castle.Facilities.NHibernateIntegration.Tests\bin\%BUILD_CONFIGURATION%\net8.0\Castle.Facilities.NHibernateIntegration.Tests.dll" --results-directory "build\%BUILD_CONFIGURATION%" --logger "nunit;LogFileName=Castle.Facilities.NHibernateIntegration.Tests_net8.0_TestResults.xml;format=nunit3"
+
 ECHO ------------------------------------
 ECHO Running .NET (net7.0) Unit Tests
 ECHO ------------------------------------
diff --git a/buildscripts/CommonAssemblyInfo.cs b/buildscripts/CommonAssemblyInfo.cs
index 6135929c6..4178669c9 100644
--- a/buildscripts/CommonAssemblyInfo.cs
+++ b/buildscripts/CommonAssemblyInfo.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/buildscripts/build.cmd b/buildscripts/build.cmd
index fe718b404..265507973 100644
--- a/buildscripts/build.cmd
+++ b/buildscripts/build.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM ****************************************************************************
-REM Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+REM Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 REM Licensed under the Apache License, Version 2.0 (the "License");
 REM you may not use this file except in compliance with the License.
 REM You may obtain a copy of the License at
@@ -40,6 +40,12 @@ REM https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-vstest
 REM https://github.com/Microsoft/vstest-docs/blob/main/docs/report.md
 REM https://github.com/spekt/nunit.testlogger/issues/56
 
+ECHO ------------------------------------
+ECHO Running .NET (net8.0) Unit Tests
+ECHO ------------------------------------
+
+dotnet test "src\Castle.Facilities.NHibernateIntegration.Tests\bin\%BUILD_CONFIGURATION%\net8.0\Castle.Facilities.NHibernateIntegration.Tests.dll" --results-directory "build\%BUILD_CONFIGURATION%" --logger "nunit;LogFileName=Castle.Facilities.NHibernateIntegration.Tests_net8.0_TestResults.xml;format=nunit3"
+
 ECHO ------------------------------------
 ECHO Running .NET (net7.0) Unit Tests
 ECHO ------------------------------------
diff --git a/buildscripts/common.props b/buildscripts/common.props
index 32569d7ea..59d3b8d57 100644
--- a/buildscripts/common.props
+++ b/buildscripts/common.props
@@ -72,9 +72,9 @@
     <!--
       https://andrewlock.net/using-reference-assemblies-to-build-net-framework-libararies-on-linux-without-mono/
     -->
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net6.0'">
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
     <!--
@@ -83,7 +83,7 @@
     -->
     <Reference Include="System.Net.Http" />
 
-    <PackageReference Include="IndexRange" Version="1.0.3" />
+    <PackageReference Include="IndexRange" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/buildscripts/docker-run-mono.sh b/buildscripts/docker-run-mono.sh
index 8dcd3b93f..a35ba9fcd 100644
--- a/buildscripts/docker-run-mono.sh
+++ b/buildscripts/docker-run-mono.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # ****************************************************************************
-# Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+# Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/AbstractNHibernateTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/AbstractNHibernateTestCase.cs
index ef66e8582..a3d7cf055 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/AbstractNHibernateTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/AbstractNHibernateTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/App.config b/src/Castle.Facilities.NHibernateIntegration.Tests/App.config
index c3bbf28c8..8dd4dcb18 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/App.config
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/App.config
@@ -15,7 +15,4 @@
          value="Server=.; Initial Catalog=test2; Integrated Security=SSPI" />
   </appSettings>
 
-  <system.diagnostics>
-  </system.diagnostics>
-
 </configuration>
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Castle.Facilities.NHibernateIntegration.Tests.csproj b/src/Castle.Facilities.NHibernateIntegration.Tests/Castle.Facilities.NHibernateIntegration.Tests.csproj
index fcbd6d984..a92877448 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Castle.Facilities.NHibernateIntegration.Tests.csproj
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Castle.Facilities.NHibernateIntegration.Tests.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0;net48</TargetFrameworks>
 
+    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
     <OutputType>Exe</OutputType>
     <StartupObject>Program</StartupObject>
   </PropertyGroup>
@@ -15,31 +16,29 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="[4.4.1,5)" />
-    <PackageReference Include="Castle.Facilities.AutoTx" Version="[5.4.0,5.5)" />
-    <PackageReference Include="Castle.LoggingFacility" Version="[5.1.2,6)" />
-    <PackageReference Include="Castle.Services.Transaction" Version="[5.4.0,5.5)" />
-    <PackageReference Include="Castle.Windsor" Version="[5.1.2,6)" />
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="LiquidTestReports.Markdown" Version="1.0.9" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.7.2" />
-    <PackageReference Include="Moq" Version="4.17.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NHibernate" Version="5.4.6" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+    <PackageReference Include="Castle.Core"  />
+    <PackageReference Include="Castle.Facilities.AutoTx"  />
+    <PackageReference Include="Castle.LoggingFacility"  />
+    <PackageReference Include="Castle.Services.Transaction"  />
+    <PackageReference Include="Castle.Windsor"  />
+    <PackageReference Include="LiquidTestReports.Markdown"  />
+    <PackageReference Include="Microsoft.NET.Test.Sdk"  />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel"  />
+    <PackageReference Include="Moq"  />
+    <PackageReference Include="Newtonsoft.Json"  />
+    <PackageReference Include="NHibernate"  />
+    <PackageReference Include="NUnit"  />
+    <PackageReference Include="NUnit.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnitLite" Version="3.13.3" />
-    <PackageReference Include="NunitXml.TestLogger" Version="3.1.15" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-    <PackageReference Include="System.Text.Json" Version="7.0.3" />
+    <PackageReference Include="NUnit3TestAdapter"  />
+    <PackageReference Include="NUnitLite"  />
+    <PackageReference Include="NunitXml.TestLogger"  />
+    <PackageReference Include="System.Data.SqlClient"  />
+    <PackageReference Include="System.Text.Json"  />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net6.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
@@ -51,7 +50,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="App.config">
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="App.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/Blog.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/Blog.cs
index 8b2021a35..2c0f68fce 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/Blog.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/Blog.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogDao.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogDao.cs
index 38afdaa84..4d18f22e5 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogDao.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogDao.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogItem.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogItem.cs
index 6cdedfa8f..f02a5887e 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogItem.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogItem.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogItemDao.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogItemDao.cs
index 7ecf2142e..8156ac28d 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogItemDao.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogItemDao.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogRef.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogRef.cs
index de02cc10c..3447a4ecc 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogRef.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogRef.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogRepository.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogRepository.cs
index 7324fdd70..3bfaeecc0 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogRepository.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogRepository.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/CustomDeleteListener.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/CustomDeleteListener.cs
index 8f24d143d..c37c3fb37 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/CustomDeleteListener.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/CustomDeleteListener.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/CustomSaveUpdateListener.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/CustomSaveUpdateListener.cs
index ae8e05716..d57421c17 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/CustomSaveUpdateListener.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/CustomSaveUpdateListener.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/Order.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/Order.cs
index dd9c08155..61e889183 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/Order.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/Order.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/TestInterceptor.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/TestInterceptor.cs
index 3c2bf26ae..dda42f0fd 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/TestInterceptor.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/TestInterceptor.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Components/NHibernateGenericDaoTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Components/NHibernateGenericDaoTestCase.cs
index 31d505ae4..44e0e57d3 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Components/NHibernateGenericDaoTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Components/NHibernateGenericDaoTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Components/ReflectionUtilityTests.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Components/ReflectionUtilityTests.cs
index a817309d1..3a5d0d626 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Components/ReflectionUtilityTests.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Components/ReflectionUtilityTests.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public void CanGetPropertiesAsDictionary()
                 Name = "osman",
                 Items = new List<BlogItem>()
                 {
-                    new BlogItem { }
+                    new() { }
                 }
             };
             var dictionary = ReflectionUtility.GetPropertiesDictionary(blog);
@@ -51,10 +51,10 @@ public void CanGetPropertiesAsDictionary()
         [Test]
         public void SimpleTypeReturnsTrueForEnumStringDatetimeAndPrimitiveTypes()
         {
-            Assert.True(ReflectionUtility.IsSimpleType(typeof(string)));
-            Assert.True(ReflectionUtility.IsSimpleType(typeof(DateTime)));
-            Assert.True(ReflectionUtility.IsSimpleType(typeof(MyEnum)));
-            Assert.True(ReflectionUtility.IsSimpleType(typeof(char)));
+            Assert.That(ReflectionUtility.IsSimpleType(typeof(string)), Is.True);
+            Assert.That(ReflectionUtility.IsSimpleType(typeof(DateTime)), Is.True);
+            Assert.That(ReflectionUtility.IsSimpleType(typeof(MyEnum)), Is.True);
+            Assert.That(ReflectionUtility.IsSimpleType(typeof(char)), Is.True);
         }
     }
 }
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/DaoTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/DaoTestCase.cs
index 4bb614707..1cc4513cb 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/DaoTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/DaoTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/AsyncLocalSessionStoreTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/AsyncLocalSessionStoreTestCase.cs
index ddd855566..4fa23d157 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/AsyncLocalSessionStoreTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/AsyncLocalSessionStoreTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/CallContextSessionStoreTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/CallContextSessionStoreTestCase.cs
index 08b6c0120..e1c57dd77 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/CallContextSessionStoreTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/CallContextSessionStoreTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/ConfigurationBuilderTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/ConfigurationBuilderTestCase.cs
index ae575e67a..bf516b22c 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/ConfigurationBuilderTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/ConfigurationBuilderTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/CustomConfigurationBuilderTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/CustomConfigurationBuilderTestCase.cs
index 173ef201a..f3847ecff 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/CustomConfigurationBuilderTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/CustomConfigurationBuilderTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@ public Configuration GetConfiguration(IConfiguration facilityConfiguration)
             ConfigurationsCreated++;
 
             var configuration = new DefaultConfigurationBuilder().GetConfiguration(facilityConfiguration);
+
             configuration.Properties["dialect"] =
                 ConfigurationManager.AppSettings["nhf.dialect"];
             configuration.Properties["connection.driver_class"] =
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/LogicalCallContextSessionStoreTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/LogicalCallContextSessionStoreTestCase.cs
index 27b936379..797f85d1f 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/LogicalCallContextSessionStoreTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/LogicalCallContextSessionStoreTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/SessionManagerTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/SessionManagerTestCase.cs
index 0b364e187..2c38b81d2 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/SessionManagerTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Internal/SessionManagerTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities102/Fixture.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities102/Fixture.cs
index b245fba9c..bea20d43d 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities102/Fixture.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities102/Fixture.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities103/Fixture.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities103/Fixture.cs
index 156d74e27..2f5808c49 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities103/Fixture.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities103/Fixture.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities106/Fixture.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities106/Fixture.cs
index b04bf8e99..e59b0949a 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities106/Fixture.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities106/Fixture.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities112/Fixture.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities112/Fixture.cs
index 72fea6ca1..a50688e81 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities112/Fixture.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities112/Fixture.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities113/Fixture.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities113/Fixture.cs
index 84f72f66d..96884ac57 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities113/Fixture.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities113/Fixture.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities116/Fixture.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities116/Fixture.cs
index 048388895..ba8ca79d8 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities116/Fixture.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities116/Fixture.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -42,8 +42,8 @@ public class Fixture : IssueTestCase
     {
         private const string FilePath = "myconfig.dat";
 
-        private readonly Func<IObjectPersister<Configuration>> _objectPersisterMethod =
-            () => ObjectPersisterFactory.Create<Configuration>();
+        private readonly Func<IObjectPersister<Configuration>> _objectPersister =
+            ObjectPersisterFactory.Create<Configuration>;
 
         private IConfiguration _facilityConfiguration;
         private IConfigurationBuilder _configurationBuilder;
@@ -61,7 +61,7 @@ public void CanCreateSerializedFileInTheDisk()
             _configurationBuilder.GetConfiguration(_facilityConfiguration);
             Assert.That(File.Exists(FilePath), Is.True);
 
-            var persister = _objectPersisterMethod();
+            var persister = _objectPersister();
             var configuration = persister.Read(FilePath);
 
             Assert.That(configuration, Is.Not.Null);
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities117/PersistentConfigurationBuilderConventionsFixture.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities117/PersistentConfigurationBuilderConventionsFixture.cs
index 37ae5217d..ad44bee2d 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities117/PersistentConfigurationBuilderConventionsFixture.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities117/PersistentConfigurationBuilderConventionsFixture.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities119/IndividualConfigurationBuildersTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities119/IndividualConfigurationBuildersTestCase.cs
index 04a4fcdc6..2c14cb3d5 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities119/IndividualConfigurationBuildersTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities119/IndividualConfigurationBuildersTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities119/TestConfigurationBuilder2.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities119/TestConfigurationBuilder2.cs
index e150ad590..a9d1ae1b3 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities119/TestConfigurationBuilder2.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities119/TestConfigurationBuilder2.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities119/TestConfigurationBuilder3.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities119/TestConfigurationBuilder3.cs
index 8b3bf9550..2d6781468 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities119/TestConfigurationBuilder3.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities119/TestConfigurationBuilder3.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities152/Fixture.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities152/Fixture.cs
index f5a0ace44..73e9fb7c4 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities152/Fixture.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/Facilities152/Fixture.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/IssueTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/IssueTestCase.cs
index d4ebae5c6..90d8efe3e 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/IssueTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Issues/IssueTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Program.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Program.cs
index 1fd158d1a..c38d97609 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Program.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Program.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Properties/AssemblyInfo.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Properties/AssemblyInfo.cs
index d3ddafa5d..d5e2ca464 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Properties/AssemblyInfo.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Properties/AssemblyInfo.cs
@@ -1,3 +1,19 @@
+#region License
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#endregion
+
 #region License
 // Copyright 2004-2022 Castle Project - https://www.castleproject.org/
 //
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Registration/FacilityFluentConfigTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Registration/FacilityFluentConfigTestCase.cs
index d97d0348a..2cc306b96 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Registration/FacilityFluentConfigTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Registration/FacilityFluentConfigTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/SessionCreation/DaoTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/SessionCreation/DaoTestCase.cs
index 1ec313c58..1e43f2137 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/SessionCreation/DaoTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/SessionCreation/DaoTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/SessionCreation/MyDao.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/SessionCreation/MyDao.cs
index 1e8a3fd67..64771375d 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/SessionCreation/MyDao.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/SessionCreation/MyDao.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/SessionCreation/MySecondDao.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/SessionCreation/MySecondDao.cs
index 8705817c0..535a15e98 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/SessionCreation/MySecondDao.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/SessionCreation/MySecondDao.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/SessionManagementInterceptorsTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/SessionManagementInterceptorsTestCase.cs
index e16af3bfc..d487b0c84 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/SessionManagementInterceptorsTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/SessionManagementInterceptorsTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/TestConfigurationBuilder.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/TestConfigurationBuilder.cs
index b1b7e18c8..141b84b1c 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/TestConfigurationBuilder.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/TestConfigurationBuilder.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/DistributedTransactionsTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/DistributedTransactionsTestCase.cs
index 8b33d2e7d..3ce5f7658 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/DistributedTransactionsTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/DistributedTransactionsTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/FirstDao.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/FirstDao.cs
index 9e3985292..baaa8c019 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/FirstDao.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/FirstDao.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/FirstDao2.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/FirstDao2.cs
index 2987ff9fa..24a1773f6 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/FirstDao2.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/FirstDao2.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/OrderDao.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/OrderDao.cs
index 26a7b0e7a..9c00c6d9c 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/OrderDao.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/OrderDao.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/OrderDao2.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/OrderDao2.cs
index 9b5e0d054..814b154d8 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/OrderDao2.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/OrderDao2.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/RootService.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/RootService.cs
index a1fccfbfd..c6feb25c5 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/RootService.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/RootService.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/RootService2.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/RootService2.cs
index 2e9b11119..c000a4308 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/RootService2.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/RootService2.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/SecondDao.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/SecondDao.cs
index ac48a052f..d0a74acbd 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/SecondDao.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/SecondDao.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/SecondDao2.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/SecondDao2.cs
index d36423287..38b306ad7 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/SecondDao2.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/Model/SecondDao2.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/TransactionWithTwoDatabasesTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/TransactionWithTwoDatabasesTestCase.cs
index 9db603731..cf2d5bd8f 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/TransactionWithTwoDatabasesTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/TransactionWithTwoDatabasesTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/TransactionsTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/TransactionsTestCase.cs
index 6cffa641d..f58186e20 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/TransactionsTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Transactions/TransactionsTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Wiring/DaoTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Wiring/DaoTestCase.cs
index 20c8613b7..b2c39cefa 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Wiring/DaoTestCase.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Wiring/DaoTestCase.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Wiring/MyDao.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Wiring/MyDao.cs
index 87948bd23..cb665982a 100644
--- a/src/Castle.Facilities.NHibernateIntegration.Tests/Wiring/MyDao.cs
+++ b/src/Castle.Facilities.NHibernateIntegration.Tests/Wiring/MyDao.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Builders/DefaultConfigurationBuilder.cs b/src/Castle.Facilities.NHibernateIntegration/Builders/DefaultConfigurationBuilder.cs
index 66ed1177e..65c03da08 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Builders/DefaultConfigurationBuilder.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Builders/DefaultConfigurationBuilder.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Builders/PersistentConfigurationBuilder.cs b/src/Castle.Facilities.NHibernateIntegration/Builders/PersistentConfigurationBuilder.cs
index b4cd7a5ba..b8ad3d00a 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Builders/PersistentConfigurationBuilder.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Builders/PersistentConfigurationBuilder.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Builders/XmlConfigurationBuilder.cs b/src/Castle.Facilities.NHibernateIntegration/Builders/XmlConfigurationBuilder.cs
index bbf2b6fa8..c2557f083 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Builders/XmlConfigurationBuilder.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Builders/XmlConfigurationBuilder.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Castle.Facilities.NHibernateIntegration.csproj b/src/Castle.Facilities.NHibernateIntegration/Castle.Facilities.NHibernateIntegration.csproj
index 9c93fcd55..26c74d299 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Castle.Facilities.NHibernateIntegration.csproj
+++ b/src/Castle.Facilities.NHibernateIntegration/Castle.Facilities.NHibernateIntegration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0;net48</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -17,14 +17,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="[4.4.1,5)" />
-    <PackageReference Include="Castle.Services.Transaction" Version="[5.4.0,5.5)" />
-    <PackageReference Include="Castle.Windsor" Version="[5.1.2,6)" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NHibernate" Version="[5.4.6,6)" />
-    <PackageReference Include="System.Text.Json" Version="7.0.3" />
+    <PackageReference Include="Castle.Core"  />
+    <PackageReference Include="Castle.Services.Transaction"  />
+    <PackageReference Include="Castle.Windsor"  />
+    <PackageReference Include="Newtonsoft.Json"  />
+    <PackageReference Include="NHibernate"  />
+    <PackageReference Include="System.Text.Json"  />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net6.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
diff --git a/src/Castle.Facilities.NHibernateIntegration/Components/Dao/DataException.cs b/src/Castle.Facilities.NHibernateIntegration/Components/Dao/DataException.cs
index 3633218bd..a47028786 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Components/Dao/DataException.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Components/Dao/DataException.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@ public DataException(string message, Exception inner) : base(message, inner)
         {
         }
 
+#if NETFRAMEWORK
         /// <summary>
         /// Initializes a new instance of the <see cref="DataException" /> class.
         /// </summary>
@@ -53,5 +54,6 @@ public DataException(string message, Exception inner) : base(message, inner)
         public DataException(SerializationInfo info, StreamingContext context) : base(info, context)
         {
         }
+#endif
     }
 }
diff --git a/src/Castle.Facilities.NHibernateIntegration/Components/Dao/IGenericDao.cs b/src/Castle.Facilities.NHibernateIntegration/Components/Dao/IGenericDao.cs
index 724edba4d..fb559dc04 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Components/Dao/IGenericDao.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Components/Dao/IGenericDao.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Components/Dao/INHibernateGenericDao.cs b/src/Castle.Facilities.NHibernateIntegration/Components/Dao/INHibernateGenericDao.cs
index 36019f73f..b4cfba779 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Components/Dao/INHibernateGenericDao.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Components/Dao/INHibernateGenericDao.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Components/Dao/NHibernateGenericDao.cs b/src/Castle.Facilities.NHibernateIntegration/Components/Dao/NHibernateGenericDao.cs
index 44f8c9ba6..16d2b764a 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Components/Dao/NHibernateGenericDao.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Components/Dao/NHibernateGenericDao.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Components/Web/SessionWebModule.cs b/src/Castle.Facilities.NHibernateIntegration/Components/Web/SessionWebModule.cs
index 1db1855ff..a41e6f3e2 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Components/Web/SessionWebModule.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Components/Web/SessionWebModule.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Constants.cs b/src/Castle.Facilities.NHibernateIntegration/Constants.cs
index 9bc5c57ca..093437773 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Constants.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Constants.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/DefaultSessionManager.cs b/src/Castle.Facilities.NHibernateIntegration/DefaultSessionManager.cs
index 3b70f9741..ef982f675 100644
--- a/src/Castle.Facilities.NHibernateIntegration/DefaultSessionManager.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/DefaultSessionManager.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/IConfigurationBuilder.cs b/src/Castle.Facilities.NHibernateIntegration/IConfigurationBuilder.cs
index c98a20e9b..bc846fbce 100644
--- a/src/Castle.Facilities.NHibernateIntegration/IConfigurationBuilder.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/IConfigurationBuilder.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/IConfigurationContributor.cs b/src/Castle.Facilities.NHibernateIntegration/IConfigurationContributor.cs
index b1481fad5..a86dd8037 100644
--- a/src/Castle.Facilities.NHibernateIntegration/IConfigurationContributor.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/IConfigurationContributor.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/IConfigurationPersister.cs b/src/Castle.Facilities.NHibernateIntegration/IConfigurationPersister.cs
index 5ba6cec21..d1de60c4c 100644
--- a/src/Castle.Facilities.NHibernateIntegration/IConfigurationPersister.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/IConfigurationPersister.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/ISessionFactoryResolver.cs b/src/Castle.Facilities.NHibernateIntegration/ISessionFactoryResolver.cs
index 326d84c42..4e60c765f 100644
--- a/src/Castle.Facilities.NHibernateIntegration/ISessionFactoryResolver.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/ISessionFactoryResolver.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/ISessionManager.cs b/src/Castle.Facilities.NHibernateIntegration/ISessionManager.cs
index 46e679d80..def931f58 100644
--- a/src/Castle.Facilities.NHibernateIntegration/ISessionManager.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/ISessionManager.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/ISessionStore.cs b/src/Castle.Facilities.NHibernateIntegration/ISessionStore.cs
index 2750d7a82..3d3421320 100644
--- a/src/Castle.Facilities.NHibernateIntegration/ISessionStore.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/ISessionStore.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Internal/FileAssemblyResource.cs b/src/Castle.Facilities.NHibernateIntegration/Internal/FileAssemblyResource.cs
index 9217dbdb8..5c9d5505e 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Internal/FileAssemblyResource.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Internal/FileAssemblyResource.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Internal/NHibernateSessionComponentInspector.cs b/src/Castle.Facilities.NHibernateIntegration/Internal/NHibernateSessionComponentInspector.cs
index 7853001f2..a83f15e74 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Internal/NHibernateSessionComponentInspector.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Internal/NHibernateSessionComponentInspector.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Internal/NHibernateSessionInterceptor.cs b/src/Castle.Facilities.NHibernateIntegration/Internal/NHibernateSessionInterceptor.cs
index 9a465f221..2df9ebce7 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Internal/NHibernateSessionInterceptor.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Internal/NHibernateSessionInterceptor.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Internal/ResourceAdapter.cs b/src/Castle.Facilities.NHibernateIntegration/Internal/ResourceAdapter.cs
index 792930b4e..61c2fc39d 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Internal/ResourceAdapter.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Internal/ResourceAdapter.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Internal/SessionDelegate.cs b/src/Castle.Facilities.NHibernateIntegration/Internal/SessionDelegate.cs
index 3133afdcf..35d986ab2 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Internal/SessionDelegate.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Internal/SessionDelegate.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Internal/SessionDisposeSynchronization.cs b/src/Castle.Facilities.NHibernateIntegration/Internal/SessionDisposeSynchronization.cs
index 3d3eb383b..0d18e6c37 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Internal/SessionDisposeSynchronization.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Internal/SessionDisposeSynchronization.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Internal/SessionFactoryActivator.cs b/src/Castle.Facilities.NHibernateIntegration/Internal/SessionFactoryActivator.cs
index 3d6f77c40..b072a7d92 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Internal/SessionFactoryActivator.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Internal/SessionFactoryActivator.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Internal/SessionFactoryResolver.cs b/src/Castle.Facilities.NHibernateIntegration/Internal/SessionFactoryResolver.cs
index cdb00a2f5..65d37fb9b 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Internal/SessionFactoryResolver.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Internal/SessionFactoryResolver.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Internal/StatelessSessionDelegate.cs b/src/Castle.Facilities.NHibernateIntegration/Internal/StatelessSessionDelegate.cs
index 77e7f3688..e30ee1602 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Internal/StatelessSessionDelegate.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Internal/StatelessSessionDelegate.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Internal/StatelessSessionDisposeSynchronization.cs b/src/Castle.Facilities.NHibernateIntegration/Internal/StatelessSessionDisposeSynchronization.cs
index c8ddae9d3..d5cdf67dc 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Internal/StatelessSessionDisposeSynchronization.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Internal/StatelessSessionDisposeSynchronization.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/NHSessionAttribute.cs b/src/Castle.Facilities.NHibernateIntegration/NHSessionAttribute.cs
index 56100526b..4233649fe 100644
--- a/src/Castle.Facilities.NHibernateIntegration/NHSessionAttribute.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/NHSessionAttribute.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/NHibernateFacility.cs b/src/Castle.Facilities.NHibernateIntegration/NHibernateFacility.cs
index bc7baec92..9dfc87449 100644
--- a/src/Castle.Facilities.NHibernateIntegration/NHibernateFacility.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/NHibernateFacility.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Persisters/DefaultConfigurationPersister.cs b/src/Castle.Facilities.NHibernateIntegration/Persisters/DefaultConfigurationPersister.cs
index 6236b5f90..ba7879ae3 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Persisters/DefaultConfigurationPersister.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Persisters/DefaultConfigurationPersister.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Persisters/ObjectPersisters.cs b/src/Castle.Facilities.NHibernateIntegration/Persisters/ObjectPersisters.cs
index 26deaf356..65c096516 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Persisters/ObjectPersisters.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Persisters/ObjectPersisters.cs
@@ -1,3 +1,19 @@
+#region License
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#endregion
+
 namespace Castle.Facilities.NHibernateIntegration.Persisters
 {
     using System;
diff --git a/src/Castle.Facilities.NHibernateIntegration/Properties/AssemblyInfo.cs b/src/Castle.Facilities.NHibernateIntegration/Properties/AssemblyInfo.cs
index 592aa8b97..9c0ab78b3 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Properties/AssemblyInfo.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Properties/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/SessionStores/AbstractDictionaryStackSessionStore.cs b/src/Castle.Facilities.NHibernateIntegration/SessionStores/AbstractDictionaryStackSessionStore.cs
index 7852eea41..c1688ec8e 100644
--- a/src/Castle.Facilities.NHibernateIntegration/SessionStores/AbstractDictionaryStackSessionStore.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/SessionStores/AbstractDictionaryStackSessionStore.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/SessionStores/AbstractSessionStore.cs b/src/Castle.Facilities.NHibernateIntegration/SessionStores/AbstractSessionStore.cs
index 5fa9c656e..d6ea5349f 100644
--- a/src/Castle.Facilities.NHibernateIntegration/SessionStores/AbstractSessionStore.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/SessionStores/AbstractSessionStore.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/SessionStores/AsyncLocalSessionStore.cs b/src/Castle.Facilities.NHibernateIntegration/SessionStores/AsyncLocalSessionStore.cs
index 571b6fc7c..c2ea13def 100644
--- a/src/Castle.Facilities.NHibernateIntegration/SessionStores/AsyncLocalSessionStore.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/SessionStores/AsyncLocalSessionStore.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/SessionStores/CallContextSessionStore.cs b/src/Castle.Facilities.NHibernateIntegration/SessionStores/CallContextSessionStore.cs
index bd75c8d04..6b188223f 100644
--- a/src/Castle.Facilities.NHibernateIntegration/SessionStores/CallContextSessionStore.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/SessionStores/CallContextSessionStore.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/SessionStores/LogicalCallContextSessionStore.cs b/src/Castle.Facilities.NHibernateIntegration/SessionStores/LogicalCallContextSessionStore.cs
index b20a7fdc1..5d2b65fee 100644
--- a/src/Castle.Facilities.NHibernateIntegration/SessionStores/LogicalCallContextSessionStore.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/SessionStores/LogicalCallContextSessionStore.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/SessionStores/WebSessionStore.cs b/src/Castle.Facilities.NHibernateIntegration/SessionStores/WebSessionStore.cs
index ea9744edc..f80a59aad 100644
--- a/src/Castle.Facilities.NHibernateIntegration/SessionStores/WebSessionStore.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/SessionStores/WebSessionStore.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Facilities.NHibernateIntegration/Util/ArrayPoolExtensions.cs b/src/Castle.Facilities.NHibernateIntegration/Util/ArrayPoolExtensions.cs
index 81dfaa026..f524d903a 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Util/ArrayPoolExtensions.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Util/ArrayPoolExtensions.cs
@@ -1,3 +1,19 @@
+#region License
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#endregion
+
 namespace Castle.Facilities.NHibernateIntegration.Util
 {
     using System;
@@ -10,19 +26,34 @@ public static class ArrayPoolExtensions
     {
         public static ArrayPoolAllocation<T> Allocate<T>(this ArrayPool<T> pool,
                                                          int minimumLength,
-                                                         bool clearBufferContents = false)
+                                                         bool clearBufferContents = true)
         {
             return new ArrayPoolAllocation<T>(pool, minimumLength, clearBufferContents);
         }
 
         public static ArrayPoolByteAllocation AllocateByte(this ArrayPool<byte> pool,
                                                            int minimumLength,
-                                                           bool clearBufferContents = false)
+                                                           bool clearBufferContents = true)
         {
             return new ArrayPoolByteAllocation(pool, minimumLength, clearBufferContents);
         }
     }
 
+    /// <summary>
+    ///
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <remarks>
+    ///     REFERENCES:
+    ///     -   <see href="https://ericlippert.com/2011/03/14/to-box-or-not-to-box/" />
+    ///     -   <see href="https://stackoverflow.com/questions/7914423/struct-and-idisposable" />
+    ///     -   <see href="https://stackoverflow.com/questions/2412981/if-my-struct-implements-idisposable-will-it-be-boxed-when-used-in-a-using-statem" />
+    ///     -   <see href="https://stackoverflow.com/questions/1330571/when-does-a-using-statement-box-its-argument-when-its-a-struct" />
+    ///     -   <see href="" />
+    /// </remarks>
+#if NET
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1815:Override equals and operator equals on value types", Justification = "Not needed.")]
+#endif
     public readonly struct ArrayPoolAllocation<T> : IDisposable
     {
         private readonly ArrayPool<T> _pool;
@@ -38,20 +69,23 @@ internal ArrayPoolAllocation(ArrayPool<T> pool,
             Buffer = _pool.Rent(minimumLength);
         }
 
-        public T[] Buffer { get; }
-
         public void Dispose()
         {
             if (_clearBufferContents)
             {
                 // https://github.com/dotnet/runtime/discussions/48697
-                Buffer.AsSpan(0, Buffer.Length).Clear();
+                Buffer.AsSpan().Clear();
             }
 
             _pool.Return(Buffer);
         }
+
+        public T[] Buffer { get; }
     }
 
+#if NET
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1815:Override equals and operator equals on value types", Justification = "Not needed.")]
+#endif
     public readonly struct ArrayPoolByteAllocation : IDisposable
     {
         private readonly ArrayPool<byte> _pool;
@@ -67,21 +101,21 @@ internal ArrayPoolByteAllocation(ArrayPool<byte> pool,
             Buffer = _pool.Rent(minimumLength);
         }
 
-        public byte[] Buffer { get; }
-
         public void Dispose()
         {
             if (_clearBufferContents)
             {
                 // https://github.com/dotnet/runtime/discussions/48697
 #if NET
-                CryptographicOperations.ZeroMemory(Buffer.AsSpan(0, Buffer.Length));
+                CryptographicOperations.ZeroMemory(Buffer.AsSpan());
 #else
-                Buffer.AsSpan(0, Buffer.Length).Clear();
+                Buffer.AsSpan().Clear();
 #endif
             }
 
             _pool.Return(Buffer);
         }
+
+        public byte[] Buffer { get; }
     }
 }
diff --git a/src/Castle.Facilities.NHibernateIntegration/Util/ReflectionUtility.cs b/src/Castle.Facilities.NHibernateIntegration/Util/ReflectionUtility.cs
index 6abfedc15..0cc40dd96 100644
--- a/src/Castle.Facilities.NHibernateIntegration/Util/ReflectionUtility.cs
+++ b/src/Castle.Facilities.NHibernateIntegration/Util/ReflectionUtility.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2022 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.csproj b/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.csproj
index d9a877bf8..9d6688fa6 100644
--- a/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.csproj
+++ b/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DotNetZip" Version="1.16.0" />
+    <PackageReference Include="DotNetZip" />
   </ItemGroup>
 
 </Project>
diff --git a/tools/Explicit.NuGet.Versions/Program.cs b/tools/Explicit.NuGet.Versions/Program.cs
index 2a97b1fc7..5f21a3bd3 100644
--- a/tools/Explicit.NuGet.Versions/Program.cs
+++ b/tools/Explicit.NuGet.Versions/Program.cs
@@ -91,7 +91,7 @@ private static void SetPackageDependencyVersionsToBeExplicitForXmlDocument(XmlDo
             {
                 if (node.Name.ToLowerInvariant() == "dependency" &&
                     !string.IsNullOrEmpty(node.Attributes["id"].Value) &&
-                    node.Attributes["id"].Value.StartsWith(nugetIdFilter, StringComparison.InvariantCultureIgnoreCase))
+                    node.Attributes["id"].Value.StartsWith(nugetIdFilter, StringComparison.OrdinalIgnoreCase))
                 {
                     var currentVersion = node.Attributes["version"].Value;
                     if (!node.Attributes["version"].Value.StartsWith("[") &&