Skip to content

Run tests using .NET 4.8 #3057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 9, 2022
Merged

Run tests using .NET 4.8 #3057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2fe94e
Run tests using .NET 4.8
hazzik Apr 29, 2022
2edad17
Split bin and test target dirs
hazzik May 1, 2022
04e1d92
Merge branch 'master' into net48-tests
hazzik May 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions NHibernate.nunit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion build-common/NHibernate.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
17 changes: 9 additions & 8 deletions default.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down Expand Up @@ -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>

Expand All @@ -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}"
Expand Down Expand Up @@ -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.???" />
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/NHibernate.Example.Web/NHibernate.Example.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down