NH-3962 - Build with MSBuild Tools 2017

Author: hazzik

Tools/.gitignore

@@ -1,2 +1,3 @@
 nuget.exe
 NUnit.*
+vswhere.*

Tools/msbuild.cmd

@@ -0,0 +1,13 @@
+@echo off
+set pre=Microsoft.VisualStudio.Product.
+set ids=%pre%Community %pre%Professional %pre%Enterprise %pre%BuildTools
+
+for /f "usebackq tokens=1* delims=: " %%i in (`%~dp0\vswhere.1.0.58\tools\vswhere.exe -latest -products %ids% -requires Microsoft.Component.MSBuild`) do (
+  if /i "%%i"=="installationPath" set InstallDir=%%j
+)
+
+if exist "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (
+  "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %*
+) else ( 
+  exit /b -1
+)

Tools/packages.config

@@ -7,4 +7,5 @@
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.5.0" targetFramework="net461" />
   <package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
   <package id="NUnit.Extension.VSProjectLoader" version="3.5.0" targetFramework="net461" />
-</packages>
+  <package id="vswhere" version="1.0.58" targetFramework="net461" />
+</packages>

build-common/common-project.xml

@@ -64,9 +64,7 @@
 
 	<target name="common.compile-all" depends="common.generate-assemblyinfo common.nuget-restore">
 		<!--property name="msbuild.cmd" value="${cmd.sln} ${cmd.out} ${cmd.platform} ${cmd.debug} ${cmd.optimize} ${cmd.doc} /t:Rebuild /v:q /m" /-->		
-		<readregistry property="MSBuildToolsPath" key="SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0\MSBuildToolsPath" hive="LocalMachine" />
-
-		<exec program="${path::combine(MSBuildToolsPath, 'msbuild.exe')}" verbose="true">
+		<exec program="${path::combine(tools.dir, 'msbuild.cmd')}" verbose="true">
 				<arg value="${root.dir}/src/NHibernate.sln" />
 				<arg value="/p:OutputPath=&quot;${path::get-full-path(bin.dir)}&quot;" />
 				<arg value="/p:Platform=&quot;Any CPU&quot;" />

doc/documentation.build

@@ -9,7 +9,7 @@
 	<property name="root.dir" value=".." />
 	<include buildfile="${root.dir}/build-common/common-project.xml" />
 
-	<target name="init" depends="common.init">
+	<target name="init" depends="common.init common.nuget-restore">
 		<property name="doc.out.dir" value="${build.dir}/doc" />
 		<property name="doc.help2.out.dir" value="${doc.out.dir}/help2" />
 		<property name="doc.chm.out.dir" value="${doc.out.dir}" />
@@ -49,7 +49,7 @@
 		</copy>
 	</target>
 
-	<target name="api" depends="init apidocbuilder-project" description="Generates the API documentation (in MSDN style and VS.NET 2005 if available)">
+	<target name="api" depends="init apidocbuilder-project" description="Generates the API documentation (in MSDN style if available)">
 		<uptodate property="api.uptodate">
 			<sourcefiles>
 				<include name="${bin.dir}/*.dll" />
@@ -64,8 +64,7 @@
 		<echo if="${api.uptodate}">API documentation is up to date, skipping generation step.</echo>
 
 		<if test="${not api.uptodate}">
-			<property name="apidocbuilder.exe" value="${directory::get-parent-directory(environment::get-folder-path('System'))}\Microsoft.NET\Framework\v3.5\MSBuild.exe" />
-			<exec program="${apidocbuilder.exe}">
+			<exec program="${path::combine(tools.dir, 'msbuild.cmd')}">
 				<arg line="NHibernate.shfbproj" />
 			</exec>
 		</if>

doc/reference/README.txt

@@ -21,8 +21,9 @@ You need a Java Runtime Environment (JRE) to run Saxon which is used to build
 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 Visual Studio
-Help Integration Kit (VSHIK) to build the HtmlHelp2 help file.
+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.
 
 ================================================================================
 DocBook Quick Start