From 3b9d754a29855cfa0d2dfc341d963c6bd2026d1d Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Wed, 27 Jul 2022 14:52:14 +1200
Subject: [PATCH 1/5] Build documentation without MSBuild

---
 .gitignore                                     |  4 ++++
 Tools/actual_msbuild.cmd                       | 11 -----------
 Tools/packages.csproj                          |  1 -
 doc/.gitignore                                 |  3 ---
 ...e.shfbproj.template => NHibernate.shfbproj} | 16 ++++++++--------
 doc/documentation.build                        | 18 +++++++-----------
 doc/reference/README.txt                       |  4 ++--
 7 files changed, 21 insertions(+), 36 deletions(-)
 delete mode 100644 Tools/actual_msbuild.cmd
 delete mode 100644 doc/.gitignore
 rename doc/{NHibernate.shfbproj.template => NHibernate.shfbproj} (77%)

diff --git a/.gitignore b/.gitignore
index 678ae179fb6..fdac10fee79 100644
--- a/.gitignore
+++ b/.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/
diff --git a/Tools/actual_msbuild.cmd b/Tools/actual_msbuild.cmd
deleted file mode 100644
index 7596a39ba5b..00000000000
--- a/Tools/actual_msbuild.cmd
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-
-for /f "usebackq tokens=*" %%i in (`%~dp0\vswhere\2.1.4\tools\vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
-  set InstallDir=%%i
-)
-
-if exist "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (
-  "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %*
-) else ( 
-  exit /b -1
-)
diff --git a/Tools/packages.csproj b/Tools/packages.csproj
index dd520651934..284acfacbb9 100644
--- a/Tools/packages.csproj
+++ b/Tools/packages.csproj
@@ -11,7 +11,6 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="vswhere" Version="2.1.4" />
     <PackageReference Include="NUnit.Console" Version="3.10.0" />
     <PackageReference Include="GitReleaseManager" Version="0.11.0" />
   </ItemGroup>
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index 7200cc50b8d..00000000000
--- a/doc/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# doc-level .gitignore.
-
-NHibernate.shfbproj
diff --git a/doc/NHibernate.shfbproj.template b/doc/NHibernate.shfbproj
similarity index 77%
rename from doc/NHibernate.shfbproj.template
rename to doc/NHibernate.shfbproj
index de6d308eba5..3ed94405162 100644
--- a/doc/NHibernate.shfbproj.template
+++ b/doc/NHibernate.shfbproj
@@ -1,4 +1,4 @@
-<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">
   <PropertyGroup>
     <!-- The configuration and platform will be used to determine which
          assemblies to include from solution and project documentation
@@ -7,26 +7,26 @@
     <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>
+    <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
@@ -37,4 +37,4 @@
   </PropertyGroup>
   <!-- Import the SHFB build targets -->
   <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/doc/documentation.build b/doc/documentation.build
index 52cf503cd6d..07b93972175 100644
--- a/doc/documentation.build
+++ b/doc/documentation.build
@@ -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>
diff --git a/doc/reference/README.txt b/doc/reference/README.txt
index 0321acf9548..521f455d10a 100644
--- a/doc/reference/README.txt
+++ b/doc/reference/README.txt
@@ -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

From 81f3dd91fa15f3b48fd986e260d1eb86c0db544d Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Mon, 1 Aug 2022 10:45:56 +1200
Subject: [PATCH 2/5] Try explicitly set FX version

---
 doc/NHibernate.shfbproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/NHibernate.shfbproj b/doc/NHibernate.shfbproj
index 3ed94405162..368df4e3e40 100644
--- a/doc/NHibernate.shfbproj
+++ b/doc/NHibernate.shfbproj
@@ -28,6 +28,7 @@
       <DocumentationSource sourceFile="../src/NHibernate/bin/$(Configuration)/net461/NHibernate.dll" />
       <DocumentationSource sourceFile="../src/NHibernate/bin/$(Configuration)/net461/Nhibernate.xml" />
     </DocumentationSources>
+    <FrameworkVersion>.NET Framework 4.6.1</FrameworkVersion>
   </PropertyGroup>
   <!-- There are no properties for these two groups but they need to appear in
        order for Visual Studio to perform the build. -->

From bbbc2a2d900d6c0a229fd04651b22fc6f8ef6d1c Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Mon, 1 Aug 2022 10:50:41 +1200
Subject: [PATCH 3/5] Revert "Try explicitly set FX version"

This reverts commit 81f3dd91fa15f3b48fd986e260d1eb86c0db544d.
---
 doc/NHibernate.shfbproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/NHibernate.shfbproj b/doc/NHibernate.shfbproj
index 368df4e3e40..3ed94405162 100644
--- a/doc/NHibernate.shfbproj
+++ b/doc/NHibernate.shfbproj
@@ -28,7 +28,6 @@
       <DocumentationSource sourceFile="../src/NHibernate/bin/$(Configuration)/net461/NHibernate.dll" />
       <DocumentationSource sourceFile="../src/NHibernate/bin/$(Configuration)/net461/Nhibernate.xml" />
     </DocumentationSources>
-    <FrameworkVersion>.NET Framework 4.6.1</FrameworkVersion>
   </PropertyGroup>
   <!-- There are no properties for these two groups but they need to appear in
        order for Visual Studio to perform the build. -->

From b3bfc7475c288291d80e4606b525758e5eef72ee Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Wed, 10 Aug 2022 12:12:51 +1200
Subject: [PATCH 4/5] Explicitly specify FX version

---
 doc/NHibernate.shfbproj | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/NHibernate.shfbproj b/doc/NHibernate.shfbproj
index 3ed94405162..34ff632e7fc 100644
--- a/doc/NHibernate.shfbproj
+++ b/doc/NHibernate.shfbproj
@@ -1,4 +1,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
@@ -14,6 +15,7 @@
     <RootNamespace>Documentation</RootNamespace>
     <Name>Documentation</Name>
     <!-- SHFB properties -->
+    <FrameworkVersion>.NET Framework 4.6.1</FrameworkVersion>
     <OutputPath></OutputPath>
     <HtmlHelpName>NHibernateAPI</HtmlHelpName>
     <HelpFileFormat>HtmlHelp1</HelpFileFormat>
@@ -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>
\ No newline at end of file

From 7bb90e00bc0867ad5c3d423f1a9c5394138a1c92 Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Wed, 10 Aug 2022 12:14:59 +1200
Subject: [PATCH 5/5] Newline

---
 doc/NHibernate.shfbproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/NHibernate.shfbproj b/doc/NHibernate.shfbproj
index 34ff632e7fc..ec0ca3101fb 100644
--- a/doc/NHibernate.shfbproj
+++ b/doc/NHibernate.shfbproj
@@ -43,4 +43,4 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="'$(MSBuildRestoreSessionId)' != ''" />
   <!-- Import the SHFB build targets -->
   <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" Condition="'$(MSBuildRestoreSessionId)' == ''" />
-</Project>
\ No newline at end of file
+</Project>