Merge branch 'master' into nh3565

Author: hazzik

.deepsource.toml

@@ -2,6 +2,16 @@ version = 1
 
 test_patterns = ["src/NHibernate.Test/**"]
 
+exclude_patterns = [
+  "src/NHibernate/Async/**/*.cs",
+  "src/NHibernate.DomainModel/Async/**/*.cs",
+  "src/NHibernate.Test/Async/**/*.cs"
+]
+
 [[analyzers]]
 name = "csharp"
 enabled = true
+
+[[transformers]]
+name = "dotnet-format"
+enabled = true

.github/renovate.json

@@ -7,6 +7,7 @@
   "pruneStaleBranches": false,
   "automerge": true,
   "platformAutomerge": true,
+  "rebaseWhen": "never",
   "labels": [
     "dependencies",
     "p: Lowest",

.github/workflows/GenerateAsyncCode.yml

@@ -0,0 +1,44 @@
+name: Generate Async code
+
+on: 
+  pull_request_target:
+    paths:
+      - '**.cs'
+
+permissions: {}
+
+jobs:
+  generate-async:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.ref }}
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
+        token: ${{ secrets.NHIBERNATE_BOT_TOKEN }}
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: 6.0.x
+
+    - name: Generate Async code
+      run: |
+        pushd src
+        dotnet tool restore
+        dotnet restore ./NHibernate.sln
+        dotnet async-generator
+        popd
+
+    - name: Push changes
+      run: |
+        git config user.name github-actions[bot]
+        git config user.email github-actions[bot]@users.noreply.github.com
+        if [[ -z "$(git status --porcelain)" ]]; then
+            echo "No changes to commit"
+            exit 0
+        fi
+        git add -A
+        git commit -am "Generate async files"
+        git push

.github/workflows/NetCoreTests.yml

@@ -52,9 +52,9 @@ jobs:
       run: |
         docker run -d -p 1521:1521 -e APP_USER=nhibernate -e APP_USER_PASSWORD=nhibernate -e ORACLE_PASSWORD=nhibernate gvenzl/oracle-xe:18-slim
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
         dotnet-version: 6.0.x
 

.gitignore

@@ -19,3 +19,7 @@ TestResult.xml
 .vs/
 /build-common/NHibernate.dev.props
 /doc/reference/master.xml
+/doc/bin/
+/doc/obj/
+/Tools/bin/
+/Tools/obj/

Tools/actual_msbuild.cmd

@@ -11,7 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="vswhere" Version="2.1.4" />
     <PackageReference Include="NUnit.Console" Version="3.10.0" />
   </ItemGroup>
 

Tools/packages.csproj

@@ -32,8 +32,7 @@
     <TreatSpecificWarningsAsErrors />
 
     <DisableImplicitPackageTargetFallback>True</DisableImplicitPackageTargetFallback>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(IsPackable)' == 'True'">
+
     <PackageProjectUrl>https://nhibernate.info</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</PackageIconUrl>
     <PackageIcon>NHibernate-NuGet.png</PackageIcon>
@@ -46,6 +45,6 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
   </ItemGroup>
 </Project>

build-common/NHibernate.props

@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <!-- The configuration and platform will be used to determine which
          assemblies to include from solution and project documentation
@@ -7,26 +8,27 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{91f431cd-23fb-4ed4-a690-0344073c65f0}</ProjectGuid>
-    <SHFBSchemaVersion>1.8.0.0</SHFBSchemaVersion>
+    <SHFBSchemaVersion>2017.9.26.0</SHFBSchemaVersion>
     <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
          Studio adds them anyway -->
     <AssemblyName>Documentation</AssemblyName>
     <RootNamespace>Documentation</RootNamespace>
     <Name>Documentation</Name>
     <!-- SHFB properties -->
-    <OutputPath>${doc.out.dir}</OutputPath>
+    <FrameworkVersion>.NET Framework 4.6.1</FrameworkVersion>
+    <OutputPath></OutputPath>
     <HtmlHelpName>NHibernateAPI</HtmlHelpName>
-    <HelpFileFormat>HtmlHelp1x</HelpFileFormat>
+    <HelpFileFormat>HtmlHelp1</HelpFileFormat>
     <CopyrightText>NHibernate</CopyrightText>
     <CopyrightHref>https://nhibernate.info</CopyrightHref>
     <FeedbackEMailAddress>https://groups.google.com/group/nhibernate-development</FeedbackEMailAddress>
     <FeedbackEMailLinkText>nhibernate team</FeedbackEMailLinkText>
     <HelpTitle>NHibernate API Reference</HelpTitle>
     <IndentHtml>False</IndentHtml>
-    <HelpFileVersion>${project.version}</HelpFileVersion>
+    <HelpFileVersion>1.0.0.0</HelpFileVersion>
     <DocumentationSources>
-      <DocumentationSource sourceFile="${root.dir}/src/NHibernate/bin/${build.config}/net461/NHibernate.dll" />
-      <DocumentationSource sourceFile="${root.dir}/src/NHibernate/bin/${build.config}/net461/Nhibernate.xml" />
+      <DocumentationSource sourceFile="../src/NHibernate/bin/$(Configuration)/net461/NHibernate.dll" />
+      <DocumentationSource sourceFile="../src/NHibernate/bin/$(Configuration)/net461/Nhibernate.xml" />
     </DocumentationSources>
   </PropertyGroup>
   <!-- There are no properties for these two groups but they need to appear in
@@ -35,6 +37,10 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="EWSoftware.SHFB.NETFramework" Version="4.8.0.2" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="'$(MSBuildRestoreSessionId)' != ''" />
   <!-- Import the SHFB build targets -->
-  <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
+  <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" Condition="'$(MSBuildRestoreSessionId)' == ''" />
 </Project>

doc/.gitignore

@@ -42,15 +42,7 @@
 		</zip>
 	</target>
 
-	<target name="apidocbuilder-project" depends="init">
-		<copy file="NHibernate.shfbproj.template" tofile="NHibernate.shfbproj" overwrite="true">
-			<filterchain>
-				<expandproperties />
-			</filterchain>
-		</copy>
-	</target>
-
-	<target name="api" depends="init apidocbuilder-project" description="Generates the API documentation (in MSDN style if available)">
+	<target name="api" depends="init" description="Generates the API documentation (in MSDN style if available)">
 		<uptodate property="api.uptodate">
 			<sourcefiles>
 				<include name="${root.dir}/src/NHibernate/bin/${build.config}/net461/*.dll" />
@@ -65,8 +57,12 @@
 		<echo if="${api.uptodate}">API documentation is up to date, skipping generation step.</echo>
 
 		<if test="${not api.uptodate}">
-			<exec program="${path::combine(tools.dir, 'actual_msbuild.cmd')}">
-				<arg line="NHibernate.shfbproj" />
+			<exec program="dotnet">
+				<arg value="build" />
+				<arg value="/p:HelpFileVersion=&quot;${project.version}&quot;" />
+				<arg value="/p:OutputPath=&quot;${doc.out.dir}&quot;" />
+				<arg value="/p:Configuration=&quot;${build.config}&quot;" />
+				<arg value="NHibernate.shfbproj" />
 			</exec>
 		</if>
 	</target>

doc/NHibernate.shfbproj.template renamed to doc/NHibernate.shfbproj

@@ -22,8 +22,8 @@ the documentation. You don't need to download and install Saxon, its jars are
 present in the repository.
 
 You need HTML Help Workshop to build the CHM help file, and Sandcastle Help File
-Builder (SHFB - https://github.com/EWSoftware/SHFB) to build the HtmlHelp2 help
-file.
+Builder v2021.11.7.0 or later (SHFB - https://github.com/EWSoftware/SHFB) to
+build the HtmlHelp2 help file.
 
 ================================================================================
 DocBook Quick Start

doc/documentation.build

@@ -15,6 +15,7 @@
 using NHibernate.Cache;
 using NHibernate.Cfg;
 using NHibernate.Linq;
+using NHibernate.Loader;
 using NHibernate.Multi;
 using NHibernate.Test.CacheTest.Caches;
 using NUnit.Framework;
@@ -24,9 +25,17 @@ namespace NHibernate.Test.CacheTest
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	[TestFixture]
+	[TestFixture(BatchFetchStyle.Dynamic)]
+	[TestFixture(BatchFetchStyle.Legacy)]
 	public class BatchableCacheFixtureAsync : TestCase
 	{
+		private readonly BatchFetchStyle _fetchStyle;
+
+		public BatchableCacheFixtureAsync(BatchFetchStyle fetchStyle)
+		{
+			_fetchStyle = fetchStyle;
+		}
+
 		protected override string[] Mappings => new[]
 		{
 			"CacheTest.ReadOnly.hbm.xml",
@@ -43,6 +52,7 @@ protected override void Configure(Configuration configuration)
 			configuration.SetProperty(Environment.UseQueryCache, "true");
 			configuration.SetProperty(Environment.GenerateStatistics, "true");
 			configuration.SetProperty(Environment.CacheProvider, typeof(BatchableCacheProvider).AssemblyQualifiedName);
+			configuration.SetProperty(Environment.BatchFetchStyle, _fetchStyle.ToString());
 		}
 
 		protected override void OnSetUp()

doc/reference/README.txt

@@ -15,15 +15,24 @@
 using NHibernate.Cache;
 using NHibernate.Cfg;
 using NHibernate.DomainModel;
+using NHibernate.Loader;
 using NHibernate.Test.CacheTest.Caches;
 using NUnit.Framework;
 
 namespace NHibernate.Test.CacheTest
 {
 	using System.Threading.Tasks;
-	[TestFixture]
+	[TestFixture(BatchFetchStyle.Dynamic)]
+	[TestFixture(BatchFetchStyle.Legacy)]
 	public class BatchableCacheSubclassFixtureAsync : TestCase
 	{
+		private readonly BatchFetchStyle _fetchStyle;
+
+		public BatchableCacheSubclassFixtureAsync(BatchFetchStyle fetchStyle)
+		{
+			_fetchStyle = fetchStyle;
+		}
+
 		protected override string[] Mappings
 		{
 			get
@@ -56,6 +65,7 @@ protected override void Configure(Configuration configuration)
 			configuration.SetProperty(Cfg.Environment.UseSecondLevelCache, "true");
 			configuration.SetProperty(Cfg.Environment.UseQueryCache, "true");
 			configuration.SetProperty(Cfg.Environment.CacheProvider, typeof(BatchableCacheProvider).AssemblyQualifiedName);
+			configuration.SetProperty(Cfg.Environment.BatchFetchStyle, _fetchStyle.ToString());
 		}
 
 		protected override void OnSetUp()

src/NHibernate.Test/Async/CacheTest/BatchableCacheFixture.cs

@@ -111,6 +111,23 @@ public async Task LeftJoinExtensionMethodWithMultipleKeyPropertiesAsync()
 			}
 		}
 
+		[Test(Description = "GH-3104")]
+		public async Task LeftJoinExtensionMethodWithInnerJoinAfterAsync()
+		{
+			var animals = await (db.Animals
+						   .LeftJoin(db.Mammals, o => o.Id, i => i.Id, (o, i) => new { animal = o, mammalLeft1 = i })
+						   .LeftJoin(db.Mammals, x => x.mammalLeft1.Id, y => y.Id, (o, i) => new { o.animal, o.mammalLeft1, mammalLeft2 = i })
+						   .Join(db.Mammals, o => o.mammalLeft2.Id, y => y.Id, (o, i) => new { o.animal, o.mammalLeft1, o.mammalLeft2, mammalInner = i })
+						   .Where(x => x.mammalLeft1.SerialNumber.StartsWith("9"))
+						   .Where(x => x.mammalLeft2.SerialNumber.StartsWith("9"))
+						   .Where(x => x.animal.SerialNumber.StartsWith("9"))
+						   .Where(x => x.mammalInner.SerialNumber.StartsWith("9"))
+						   .Select(x => new { SerialNumber = x.animal.SerialNumber })
+						   .ToListAsync());
+
+			Assert.That(animals.Count, Is.EqualTo(1));
+		}
+
 		[Test]
 		public async Task LeftJoinExtensionMethodWithOuterReferenceInWhereClauseOnlyAsync()
 		{
@@ -299,6 +316,19 @@ from o2 in db.Animals.Where(x => x.BodyWeight > 50)
 						select new {o, o2}).Take(1).ToListAsync());
 		}
 
+		[Test]
+		public async Task CanInnerJoinOnEntityWithSubclassesAsync()
+		{
+			//inner joined animal is not used in output (no need to join subclasses)
+			var resultsFromOuter1 = await (db.Animals.Join(db.Animals, o => o.Id, i => i.Id, (o, i) => o).Take(1).ToListAsync());
+
+			//inner joined mammal is not used in output (but subclass join is needed for mammal)
+			var resultsFromOuter2 = await (db.Animals.Join(db.Mammals, o => o.Id, i => i.Id, (o, i) => o).Take(1).ToListAsync());
+
+			//inner joined animal is used in output (all subclass joins are required)
+			var resultsFromInner1 = await (db.Animals.Join(db.Animals, o => o.Id, i => i.Id, (o, i) => i).Take(1).ToListAsync());
+		}
+
 		[Test(Description = "GH-2580")]
 		public async Task CanInnerJoinOnSubclassWithBaseTableReferenceInOnClauseAsync()
 		{

src/NHibernate.Test/Async/CacheTest/BatchableCacheSubclassFixture.cs

@@ -11,15 +11,31 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using NHibernate.Cfg;
 using NHibernate.Driver;
+using NHibernate.Loader;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH3142
 {
 	using System.Threading.Tasks;
-	[TestFixture]
+	[TestFixture(BatchFetchStyle.Dynamic)]
+	[TestFixture(BatchFetchStyle.Legacy)]
 	public class ChildrenTestAsync : BugTestCase
 	{
+		private readonly BatchFetchStyle _fetchStyle;
+
+		public ChildrenTestAsync(BatchFetchStyle fetchStyle)
+		{
+			_fetchStyle = fetchStyle;
+		}
+
+		protected override void Configure(Configuration configuration)
+		{
+			base.Configure(configuration);
+			configuration.SetProperty(Cfg.Environment.BatchFetchStyle, _fetchStyle.ToString());
+		}
+
 		protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)
 		{
 			return !(factory.ConnectionProvider.Driver is OracleManagedDataClientDriver);