Run tests using .NET 4.8 (nhibernate#3057)

Author: hazzik

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\net461\NHibernate.TestDatabaseSetup.dll" />
-    <assembly path="src\NHibernate.Test\bin\Debug\net461\NHibernate.Test.dll" />
-    <assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\net461\NHibernate.Test.VisualBasic.dll" />
+    <assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\net48\NHibernate.TestDatabaseSetup.dll" />
+    <assembly path="src\NHibernate.Test\bin\Debug\net48\NHibernate.Test.dll" />
+    <assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\net48\NHibernate.Test.VisualBasic.dll" />
   </Config>
   <Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
-    <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\net461\NHibernate.Test.VisualBasic.dll" />
+    <assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\net48\NHibernate.TestDatabaseSetup.dll" />
+    <assembly path="src\NHibernate.Test\bin\Release\net48\NHibernate.Test.dll" />
+    <assembly path="src\NHibernate.Test.VisualBasic\bin\Release\net48\NHibernate.Test.VisualBasic.dll" />
   </Config>
 </NUnitProject>

build-common/NHibernate.props

@@ -13,7 +13,7 @@
     <FileVersion Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionPrefix).$(BuildNumber)</FileVersion>
     <FileVersion Condition="'$(FileVersion)' == ''">$(VersionPrefix).0</FileVersion>
 
-    <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;net6.0</NhAppTargetFrameworks>
+    <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net48;net6.0</NhAppTargetFrameworks>
     <NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
     <NhNetFx>false</NhNetFx>
     <NhNetFx Condition="$(TargetFramework.StartsWith('net4'))">true</NhNetFx>

default.build

@@ -6,7 +6,8 @@
 >
 
 	<property name="root.dir" value="." />
-	<property name="target.dir" value="net461" />
+	<property name="bin.target.dir" value="net461" />
+	<property name="test.target.dir" value="net48" />
 
 	<include buildfile="${root.dir}/build-common/common.xml" />
 
@@ -141,7 +142,7 @@
 	</target>
 
 	<target name="put-connection-settings-into-app-config">
-		<property name="app.config" value="src/${test.file}/bin/${build.config}/${target.dir}/${test.file}.dll.config" />
+		<property name="app.config" value="src/${test.file}/bin/${build.config}/${test.target.dir}/${test.file}.dll.config" />
 		<call target="put-connection-settings-into-defined-app-config" />
 	</target>
 
@@ -153,15 +154,15 @@
 
 	<target name="run-tests" depends="find-nunit" description="Run NUnit tests">
 		<exec program="${nunit-console}" failonerror="${not property::exists(test.file + '.IgnoreFail')}">
-			<arg value="${root.dir}/src/${test.file}/bin/${build.config}/${target.dir}/${test.file}.dll" />
+			<arg value="${root.dir}/src/${test.file}/bin/${build.config}/${test.target.dir}/${test.file}.dll" />
 			<arg value="--result=${testresults.dir}/${test.file}.dll-results.xml;format=nunit2" />
 			<arg value="--teamcity" if="${property::exists('config.teamcity')}" />
 			<arg value="--x86" unless="${property::exists('nunit-x64')}" />
 		</exec>
 	</target>
 
 	<target name="remove-connection-settings-from-app-config">
-		<property name="app.config" value="${root.dir}/src/${test.file}/bin/${build.config}/${target.dir}/${test.file}.dll.config" />
+		<property name="app.config" value="${root.dir}/src/${test.file}/bin/${build.config}/${test.target.dir}/${test.file}.dll.config" />
 
 		<xmlpoke
 			file="${app.config}"
@@ -243,7 +244,7 @@
 			</fileset>
 		</copy>
 		<copy todir="${bin-pack.required}">
-			<fileset basedir="${root.dir}/src/NHibernate/bin/${build.config}/${target.dir}/">
+			<fileset basedir="${root.dir}/src/NHibernate/bin/${build.config}/${bin.target.dir}/">
 				<include name="Antlr3.Runtime.???" />
 				<include name="Iesi.Collections.???" />
 				<include name="NHibernate.???" />
@@ -260,20 +261,20 @@
 			</fileset>
 		</copy>
 		<copy todir="${bin-pack.tests}">
-			<fileset basedir="${root.dir}/src/NHibernate.Test/bin/${build.config}/${target.dir}">
+			<fileset basedir="${root.dir}/src/NHibernate.Test/bin/${build.config}/${test.target.dir}">
 				<include name="log4net*" />
 				<include name="NHibernate.DomainModel.*" />
 				<include name="NHibernate.Test.*" />
 				<include name="nunit*" />
 			</fileset>
 		</copy>
 		<copy todir="${bin-pack.tests}">
-			<fileset basedir="${root.dir}/src/NHibernate.Test.VisualBasic/bin/${build.config}/${target.dir}">
+			<fileset basedir="${root.dir}/src/NHibernate.Test.VisualBasic/bin/${build.config}/${test.target.dir}">
 				<include name="NHibernate.Test.VisualBasic.*" />
 			</fileset>
 		</copy>
 		<copy todir="${bin-pack.tests}">
-			<fileset basedir="${root.dir}/src/NHibernate.TestDatabaseSetup/bin/${build.config}/${target.dir}">
+			<fileset basedir="${root.dir}/src/NHibernate.TestDatabaseSetup/bin/${build.config}/${test.target.dir}">
 				<include name="NHibernate.TestDatabaseSetup.*" />
 			</fileset>
 		</copy>

src/NHibernate.Example.Web/NHibernate.Example.Web.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net48</TargetFrameworks>
     <DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
   </PropertyGroup>