NH-3990 - Upgrade to VS2017 project structure

- use dotnet to build solution
- fix typo in TestEmbeddedConfig.cfg.xml name
- fix extension of EntityWithFilters.hbm.xml

NHibernate.nunit

@@ -1,13 +1,13 @@
 <NUnitProject>
   <Settings activeconfig="Debug" processModel="Multiple" />
   <Config name="Debug" binpathtype="Auto" runtimeFramework="net-4.0">
-    <assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\NHibernate.TestDatabaseSetup.dll" />
-    <assembly path="src\NHibernate.Test\bin\Debug-2.0\NHibernate.Test.dll" />
+    <assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\net461\NHibernate.TestDatabaseSetup.dll" />
+    <assembly path="src\NHibernate.Test\bin\Debug\net461\NHibernate.Test.dll" />
     <assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\NHibernate.Test.VisualBasic.dll" />
   </Config>
   <Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
-    <assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\NHibernate.TestDatabaseSetup.dll" />
-    <assembly path="src\NHibernate.Test\bin\Release-2.0\NHibernate.Test.dll" />
+    <assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\net461\NHibernate.TestDatabaseSetup.dll" />
+    <assembly path="src\NHibernate.Test\bin\Release\net461\NHibernate.Test.dll" />
     <assembly path="src\NHibernate.Test.VisualBasic\bin\Release\NHibernate.Test.VisualBasic.dll" />
   </Config>
-</NUnitProject>
+</NUnitProject>

Tools/msbuild.cmd

@@ -1,13 +1 @@
-@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
-)
+dotnet msbuild %*

Tools/packages.config

@@ -7,5 +7,4 @@
   <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" />
-  <package id="vswhere" version="1.0.58" targetFramework="net461" />
 </packages>

build-common/common-project.xml

@@ -53,10 +53,6 @@
 	</target>
 
 	<target name="common.nuget-restore" depends="common.init common.download-nuget">
-		<exec basedir="${tools.dir}" workingdir="${root.dir}/src" program="NuGet.exe">
-			<arg value="restore" />
-			<arg value="NHibernate.sln" />
-		</exec>
 		<exec basedir="${tools.dir}" workingdir="${root.dir}/Tools" program="NuGet.exe">
 			<arg value="install" />
 		</exec>
@@ -70,6 +66,7 @@
 				<arg value="/p:Platform=&quot;Any CPU&quot;" />
 				<arg value="/p:Configuration=&quot;Debug&quot;" if="${build.debug == 'true'}" />
 				<arg value="/p:Configuration=&quot;Release&quot;" if="${build.release == 'true'}" />
+				<arg value="/t:Restore" />
 				<arg value="/t:Rebuild" />
 				<arg value="/v:q" />
 				<arg value="/m" />

default.build

@@ -194,7 +194,7 @@
 		</copy>
 		<!--Required Bins for lazy loading NHibernate.ByteCode.Castle.dll-->
 		<!-- Tests -->
-		<copy file="${bin.dir}/TestEnbeddedConfig.cfg.xml" todir="${bin-pack.tests}"/>
+		<copy file="${bin.dir}/TestEmbeddedConfig.cfg.xml" todir="${bin-pack.tests}"/>
 		<copy file="${bin.dir}/ABC.hbm.xml" todir="${bin-pack.tests}"/>
     <copy todir="${bin-pack.tests}/DbScripts">
       <fileset basedir="${root.dir}/src/NHibernate.Test/DbScripts">