diff --git a/Tools/msbuild.cmd b/Tools/msbuild.cmd
deleted file mode 100644
index 32e35d11acd..00000000000
--- a/Tools/msbuild.cmd
+++ /dev/null
@@ -1 +0,0 @@
-dotnet msbuild %*
diff --git a/build-common/common-project.xml b/build-common/common-project.xml
deleted file mode 100644
index 4d358568bed..00000000000
--- a/build-common/common-project.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" ?>
-<project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
-
-  <description>
-		<![CDATA[
-		This file contains common tasks tailored specifically for the NHibernate
-		build process. The goal was to define all the actions in this file, so
-		that actual project build files only have to configure a few variables
-		and call tasks in this file.
-
-		Usage
-
-		<property name="root.dir" value="../.." />;
-		<include buildfile="${root.dir}/build-common/common-project.xml" />;
-
-		These lines should be placed at the top level under the <project>
-		element. Property root.dir defines a relative path to the root of the
-		distribution, that is, NHibernate directory.
-
-		After including the file, a target should be defined to initialize
-		configuration variables according to the project being built.
-		The standard name of this target is init (but any other name can be chosen).
-		The init target should depend on (or call) target common.init defined
-		in this file.
-
-		Other predefined targets are:
-
-			- common.compile-all
-				compile a solution, generating the documentation file (.xml)
-
-			- common.run-tests
-				run compiled NUnit tests.
-
-		All compile/run targets put the output in bin.dir. Common.compile*
-		targets use source fileset with id="project.sources", assembly fileset
-		with id="project.references" and resource fileset with id="project.resources"
-		to compile the project. The source and resource filesets are optional and
-		default to **/*.cs files and no files respectively.
-		]]>
-	</description>
-
-	<include buildfile="common.xml" />
-
-	<target name="common.download-nuget" depends="common.init">
-		<get 
-			src="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" 
-			dest="${tools.dir}/nuget.exe" 
-			usetimestamp="true"
-		/>
-	</target>
-
-	<target name="common.nuget-restore" depends="common.init common.download-nuget">
-		<exec basedir="${tools.dir}" workingdir="${root.dir}/Tools" program="NuGet.exe">
-			<arg value="install" />
-		</exec>
-	</target>
-
-	<target name="common.solution-restore" depends="common.nuget-restore">
-		<exec program="${path::combine(tools.dir, 'msbuild.cmd')}" verbose="true">
-			<arg value="/t:Restore" />
-			<arg value="${root.dir}/src/NHibernate.sln" />
-		</exec> 
-	</target>
-
-	<target name="common.compile-all" depends="common.nuget-restore nuget.set-properties">
-		<!--property name="msbuild.cmd" value="${cmd.sln} ${cmd.out} ${cmd.platform} ${cmd.debug} ${cmd.optimize} ${cmd.doc} /t:Rebuild /v:q /m" /-->		
-		<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;" />
-				<arg value="/p:Configuration=&quot;Debug&quot;" if="${build.debug == 'true'}" />
-				<arg value="/p:Configuration=&quot;Release&quot;" if="${build.release == 'true'}" />
-				<arg value="/p:GeneratePackageOnBuild=&quot;True&quot;" />
-				<arg value="/p:IncludeSymbols=&quot;True&quot;" />
-				<arg value="/p:IncludeSource=&quot;True&quot;" />
-				<arg value="/p:PackageOutputPath=&quot;${path::get-full-path(nuget.nupackages.dir)}&quot;" />
-				<arg value="/t:Restore" />
-				<arg value="/t:Rebuild" />
-				<arg value="/v:q" />
-				<arg value="/m" />
-		</exec> 
-	</target>
-
-	<target name="common.run-tests"
-		description="Run NUnit tests">
-		<call target="common.find-nunit" unless="${property::exists('nunit.found')}" />
-		<property name="common.run-tests.failonerror" value="${not property::exists(test.file + '.IgnoreFail')}"/>
-		<property name="common.run-tests.x86" value="--x86" unless="${property::exists('nunit-x64')}" />
-		<property name="common.run-tests.x86" value="" if="${property::exists('nunit-x64')}" />
-		<property name="common.run-tests.teamcity" value="--teamcity" if="${property::exists('config.teamcity')}" />
-		<property name="common.run-tests.teamcity" value="" unless="${property::exists('common.run-tests.teamcity')}" />
-		<exec program="${nunit-console}" failonerror="${common.run-tests.failonerror}">
-			<arg line="${bin.dir}/${test.file}.dll --result=${testresults.dir}/${test.file}.dll-results.xml;format=nunit2 --framework=${framework::get-target-framework()} ${common.run-tests.teamcity} ${common.run-tests.x86}" />
-		</exec>
-
-	</target>
-
-	<target name="common.run-database-tests"
-		depends="common.put-connection-settings-into-app-config common.run-tests common.remove-connection-settings-from-app-config" />
-
-	<target name="common.put-connection-settings-into-app-config">
-		<property name="app.config" value="${bin.dir}/${test.file}.dll.config" />
-		<call target="common.put-connection-settings-into-defined-app-config" />
-	</target>
-
-	<target name="common.put-connection-settings-into-defined-app-config">
-
-		<!-- make sure the config file is writable -->
-		<attrib file="${app.config}" readonly="false" />
-
-		<!-- 
-			Tell nhibernate how to connect to the test database.
-		-->
-		<xmlpoke file="${app.config}"
-			xpath="//*/hbm:property[@name='dialect']"
-			value="${nhibernate.dialect}">
-			<namespaces>
-				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
-			</namespaces>
-		</xmlpoke>
-
-		<xmlpoke file="${app.config}"
-			xpath="//*/hbm:property[@name='command_timeout']"
-			value="${nhibernate.command_timeout}">
-			<namespaces>
-				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
-			</namespaces>
-		</xmlpoke>
-
-		<xmlpoke file="${app.config}"
-			xpath="//*/hbm:property[@name='connection.driver_class']"
-			value="${nhibernate.connection.driver_class}">
-			<namespaces>
-				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
-			</namespaces>
-		</xmlpoke>
-		<xmlpoke file="${app.config}"
-			xpath="//*/hbm:property[@name='connection.connection_string']"
-			value="${nhibernate.connection.connection_string}">
-			<namespaces>
-				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
-			</namespaces>
-		</xmlpoke>
-		
-		<!-- Make sure the property exists - it's only set for some scenarios. -->
-		<property name="nhibernate.odbc.explicit_datetime_scale" value="" unless="${property::exists('nhibernate.odbc.explicit_datetime_scale')}"/>
-		<xmlpoke file="${app.config}"
-			xpath="//*/hbm:property[@name='odbc.explicit_datetime_scale']"
-			value="${nhibernate.odbc.explicit_datetime_scale}">
-			<namespaces>
-				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
-			</namespaces>
-		</xmlpoke>
-	</target>
-
-	<target name="common.remove-connection-settings-from-app-config">
-		<property name="app.config" value="${bin.dir}/${test.file}.dll.config" />
-
-		<xmlpoke
-			file="${app.config}"
-			xpath="/configuration/nhibernate/add[@key='hibernate.connection.connection_string']/@value"
-			value="conn string here" 
-		/>
-	</target>
-
-</project>
diff --git a/build-common/common.xml b/build-common/common.xml
index 2b69e9167c0..63cfa3f6558 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" ?>
 <project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
-
-	<!-- 
-		Use this to determine if the key file NHibernate.snk should be used to 
-		sign the assemblies. Defaults to true since private key is present
-		in CVS.
-	-->
-	<property name="sign" value="true" overwrite="false" />
-
 	<!--
 		if Visual Studio Help Integration Kit has been installed
 		then change this to true or include -D:vshik.installed=true in the command line.
@@ -22,9 +14,6 @@
 	-->
 	<property name="nunit2report.installed" value="false" overwrite="false" />
 
-	<property name="nant-version.current" value="${assemblyname::get-version(assembly::get-name(nant::get-assembly()))}" />
-	<property name="nant-version.required" value="0.91.4312.0" /> <!-- Nant 0.91 release version -->
-	
 	<!-- Path to the folder that contain the external assemblies -->
 	<property name="lib.dir" value="lib" dynamic="true" />
 
@@ -36,27 +25,10 @@
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />
 
-	<!-- named project configurations -->
-	<target name="set-debug-project-configuration" description="Perform a 'debug' build">
-		<property name="build.release" value="false" />
-		<property name="build.debug" value="true" />
-		<property name="build.name" value="NHibernate-${project.version}-${project.config}" />
-	</target>
-	
-	<target name="set-release-project-configuration" description="Perform a 'release' build">
-		<property name="build.release" value="true" />
-		<property name="build.debug" value="pdbonly" />
-		<property name="build.name" value="NHibernate-${project.version}" />
-	</target>
-
-	<target name="set-project-configuration">
+	<target name="common.init" description="Initializes build properties">
 		<property name="project.config" value="debug" overwrite="false" />
-		<if test="${not(target::exists('set-' + project.config + '-project-configuration'))}">
-			<fail message="Unknown configuration: '${project.config}'" />
-		</if>
-
-		<call target="set-${project.config}-project-configuration" />
-
+		<property name="build.name" value="NHibernate-${project.version}" if="${project.config == 'release'}"/>
+		<property name="build.name" value="NHibernate-${project.version}-${project.config}" unless="${project.config == 'release'}" />
 		<property name="build.root.dir" value="${root.dir}/build/${build.name}" />
 		<property name="build.dir" value="${build.root.dir}" />
 		<property name="bin.dir" value="${build.dir}/bin" />
@@ -64,60 +36,18 @@
 		<property name="tools.dir" value="${root.dir}/Tools"/>
 	</target>
 
-	<target name="display-current-runtime">
-		<echo message="" />
-		<echo message="----------------------------------------------------------" />
-		<echo message=" ${framework::get-description(framework::get-target-framework())}" />
-		<echo message="----------------------------------------------------------" />
-		<echo message="" />
-		<echo message="framework : ${framework::get-target-framework()}" />
-		<echo message="description : ${framework::get-description(framework::get-target-framework())}" />
-		<echo message="sdk directory : ${framework::get-sdk-directory(framework::get-target-framework())}" />
-		<echo message="framework directory : ${framework::get-framework-directory(framework::get-target-framework())}" />
-		<echo message="assembly directory : ${framework::get-assembly-directory(framework::get-target-framework())}" />
-		<echo message="runtime engine : ${framework::get-runtime-engine(framework::get-target-framework())}" />
-		<echo message="" />
+	<target name="common.download-nuget" depends="common.init">
+		<get 
+			src="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" 
+			dest="${tools.dir}/nuget.exe" 
+			usetimestamp="true"
+		/>
 	</target>
 
-	<target name="common.init"
-		depends="set-project-configuration"
-		description="Initializes build properties">
-
-		<fileset id="project.sources" failonempty="true">
-			<include name="**/*.cs" />
-		</fileset>
-		<resourcefileset id="project.resources" />
+	<target name="common.nuget-restore" depends="common.init common.download-nuget">
+		<exec basedir="${tools.dir}" workingdir="${root.dir}/Tools" program="NuGet.exe">
+			<arg value="install" />
+		</exec>
 	</target>
 
-	<target name="common.get-nuget-package-path">
-		<xmlpeek 
-			file="${tools.dir}/packages.config" 
-			xpath="/packages/package[@id = '${nuget-package-id}']/@version"
-			property="nuget-package-version" />
-		<property name="nuget-package-path" value="${tools.dir}/${nuget-package-id}.${nuget-package-version}/" />
-	</target>
-
-	<target name="common.find-async-generator-console">
-		<property name="nuget-package-id" value="CSharpAsyncGenerator.CommandLine" />
-		<call target="common.get-nuget-package-path" />
-		<property name="async-generator-console"  value="${nuget-package-path}/tools/AsyncGenerator.CommandLine.exe" />
-	</target>
-
-	<target name="common.find-nunit">
-		<property name="nuget-package-id" value="NUnit.ConsoleRunner" />
-		<call target="common.get-nuget-package-path" />
-		<property name="nunit-console" value="${nuget-package-path}/tools/nunit3-console.exe" />
-	</target>
-
-	<target name="common.find-ndoc">
-		<property name="ndoc-console" value="${tools.dir}/ndoc/NDocConsole.exe" />
-	</target>
-  
-  <target name="nuget.set-properties">
-    <property name="nuget.nupackages.relative-dir" value="nuget_gallery" />
-
-    <property name="nuget.nupackages.dir" value="${build.dir}/${nuget.nupackages.relative-dir}" />
-    <property name="nuget.nupackages.pushbatfile" value="${nuget.nupackages.dir}/NuGetPush.bat" />
-  </target>
-
 </project>
diff --git a/default.build b/default.build
index 997a8d5ac26..7f83ab2a508 100644
--- a/default.build
+++ b/default.build
@@ -7,16 +7,11 @@
 
 	<property name="root.dir" value="." />
 
-	<include buildfile="${root.dir}/build-common/common-project.xml" />
+	<include buildfile="${root.dir}/build-common/common.xml" />
 
 	<!-- Pass -D:skip.tests=true to NAnt to skip running tests when building -->
 	<property name="skip.tests" value="false" overwrite="false" />
 	<property name="skip.manual" value="false" overwrite="false" />
-	<!--
-		Supported versions of .NET Framework, separated by spaces.
-		Used by *-all-frameworks targets.
-	-->
-	<property name="supported.frameworks" value="net-4.0" />
 
 	<target name="init" depends="common.init" description="Initializes build properties" />
 
@@ -25,20 +20,61 @@
 		<mkdir dir="${testresults.dir}" />
 	</target>
 
+	<target name="nuget.set-properties">
+		<property name="nuget.nupackages.relative-dir" value="nuget_gallery" />
+		<property name="nuget.nupackages.dir" value="${build.dir}/${nuget.nupackages.relative-dir}" />
+		<property name="nuget.nupackages.pushbatfile" value="${nuget.nupackages.dir}/NuGetPush.bat" />
+	</target>
+
 	<target name="build"
-		depends="check-framework-version init prepare-build-directory common.compile-all"
-		description="Builds NHibernate in the current configuration" />
+		depends="init prepare-build-directory nuget.set-properties"
+		description="Builds NHibernate in the current configuration">
+
+		<exec program="dotnet" verbose="true">
+			<arg value="msbuild" />
+			<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;" />
+			<arg value="/p:Configuration=&quot;Debug&quot;" if="${project.config == 'debug'}" />
+			<arg value="/p:Configuration=&quot;Release&quot;" if="${project.config == 'release'}" />
+			<arg value="/p:GeneratePackageOnBuild=&quot;True&quot;" />
+			<arg value="/p:IncludeSymbols=&quot;True&quot;" />
+			<arg value="/p:IncludeSource=&quot;True&quot;" />
+			<arg value="/p:PackageOutputPath=&quot;${path::get-full-path(nuget.nupackages.dir)}&quot;" />
+			<arg value="/t:Restore" />
+			<arg value="/t:Rebuild" />
+			<arg value="/v:q" />
+			<arg value="/m" />
+		</exec> 
+	</target>
+
+	<target name="solution-restore" depends="common.nuget-restore">
+		<exec program="dotnet" verbose="true">
+			<arg value="msbuild" />
+			<arg value="/t:Restore" />
+			<arg value="${root.dir}/src/NHibernate.sln" />
+		</exec> 
+	</target>
+
+	<target name="get-nuget-package-path" depends="common.nuget-restore">
+		<xmlpeek 
+			file="${tools.dir}/packages.config" 
+			xpath="/packages/package[@id = '${nuget-package-id}']/@version"
+			property="nuget-package-version" />
+		<property name="nuget-package-path" value="${tools.dir}/${nuget-package-id}.${nuget-package-version}/" />
+	</target>
+
+	<target name="find-async-generator-console">
+		<property name="nuget-package-id" value="CSharpAsyncGenerator.CommandLine" />
+		<call target="get-nuget-package-path" />
+		<property name="async-generator-console"  value="${nuget-package-path}/tools/AsyncGenerator.CommandLine.exe" />
+	</target>
 
-	<target name="generate-async" depends="common.nuget-restore common.solution-restore common.find-async-generator-console">
+	<target name="generate-async" depends="common.nuget-restore solution-restore find-async-generator-console">
 		<exec
 			workingdir="${root.dir}/src"
 			program="${async-generator-console}" />
 	</target>
-	
-	<target name="check-framework-version">
-			<echo>Running with ${framework::get-target-framework()}</echo>
-			<fail message="ERROR: NHibernate requires .Net 4.0." if="${framework::get-target-framework()!='net-4.0'}"/>
-	</target>
 
 	<target name="test-report" if="${nunit2report.installed}">
 		<mkdir dir="${build.dir}/testresults" />
@@ -49,10 +85,96 @@
 		</nunit2report>
 	</target>
 
+	<target name="put-connection-settings-into-defined-app-config">
+
+		<!-- make sure the config file is writable -->
+		<attrib file="${app.config}" readonly="false" />
+
+		<!-- 
+			Tell nhibernate how to connect to the test database.
+		-->
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='dialect']"
+			value="${nhibernate.dialect}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
+
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='command_timeout']"
+			value="${nhibernate.command_timeout}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
+
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='connection.driver_class']"
+			value="${nhibernate.connection.driver_class}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='connection.connection_string']"
+			value="${nhibernate.connection.connection_string}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
+		
+		<!-- Make sure the property exists - it's only set for some scenarios. -->
+		<property name="nhibernate.odbc.explicit_datetime_scale" value="" unless="${property::exists('nhibernate.odbc.explicit_datetime_scale')}"/>
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='odbc.explicit_datetime_scale']"
+			value="${nhibernate.odbc.explicit_datetime_scale}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
+	</target>
+
+	<target name="put-connection-settings-into-app-config">
+		<property name="app.config" value="${bin.dir}/${test.file}.dll.config" />
+		<call target="put-connection-settings-into-defined-app-config" />
+	</target>
+
+	<target name="find-nunit">
+		<property name="nuget-package-id" value="NUnit.ConsoleRunner" />
+		<call target="get-nuget-package-path" />
+		<property name="nunit-console" value="${nuget-package-path}/tools/nunit3-console.exe" />
+	</target>
+
+	<target name="run-tests" depends="find-nunit"
+		description="Run NUnit tests">
+		<property name="run-tests.failonerror" value="${not property::exists(test.file + '.IgnoreFail')}"/>
+		<property name="run-tests.x86" value="--x86" unless="${property::exists('nunit-x64')}" />
+		<property name="run-tests.x86" value="" if="${property::exists('nunit-x64')}" />
+		<property name="run-tests.teamcity" value="--teamcity" if="${property::exists('config.teamcity')}" />
+		<property name="run-tests.teamcity" value="" unless="${property::exists('run-tests.teamcity')}" />
+		<exec program="${nunit-console}" failonerror="${run-tests.failonerror}">
+			<arg line="${bin.dir}/${test.file}.dll --result=${testresults.dir}/${test.file}.dll-results.xml;format=nunit2 --framework=${framework::get-target-framework()} ${run-tests.teamcity} ${run-tests.x86}" />
+		</exec>
+	</target>
+
+	<target name="remove-connection-settings-from-app-config">
+		<property name="app.config" value="${bin.dir}/${test.file}.dll.config" />
+
+		<xmlpoke
+			file="${app.config}"
+			xpath="/configuration/nhibernate/add[@key='hibernate.connection.connection_string']/@value"
+			value="conn string here" 
+		/>
+	</target>
+
+	<target name="run-database-tests"
+		depends="put-connection-settings-into-app-config run-tests remove-connection-settings-from-app-config" />
+
 	<target name="test" depends="init build" description="Runs all NHibernate tests for the current framework" unless="${skip.tests}">
 		<property name="testfiles.all" value="NHibernate.TestDatabaseSetup NHibernate.Test NHibernate.Test.VisualBasic" />
 		<foreach item="String" in="${testfiles.all}" delim=" " property="test.file">
-			<call target="common.run-database-tests"/>
+			<call target="run-database-tests"/>
 		</foreach>
 	</target>
 	
@@ -86,44 +208,8 @@
 		<call target="coverage-report" />
 	</target>
 
-	<target name="sources">
-		<property name="source.tmpdir" value="${build.dir}/tmp-src" />
-		<copy todir="${source.tmpdir}">
-			<fileset>
-				<!-- copy dlls used by this build -->
-				<include name="${lib.dir}/**"  />
-
-				<!-- copy all of the NHibernate source -->
-				<include name="src/NHibernate*/**" />
-				<include name="src/*.*" />
-
-				<include name="build-common/**" />
-
-				<include name="*.build" />
-				<include name="LICENSE.txt" />
-				<include name="releasenotes.txt" />
-				<include name="README.md" />
-
-				<!-- exclude ReSharper stuff -->
-				<exclude name="**/_ReSharper*/**" />
-				<exclude name="**/*.resharperoptions" />
-				<exclude name="**/*resharper*" />
-
-				<!-- exclude VS.NET stuff -->
-				<exclude name="**/*.suo" />
-				<exclude name="**/*.user" />
-				<exclude name="**/bin/**" />
-				<exclude name="**/obj/**" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="sources-zip" depends="init sources">
-		<zip zipfile="${build.dir}/NHibernate-${project.version}-src.zip">
-			<fileset basedir="${source.tmpdir}">
-				<include name="**/*" />
-			</fileset>
-		</zip>
+	<target name="sources-zip" depends="init">
+		<exec program="git" commandline="archive HEAD --format zip --output &quot;${build.dir}/NHibernate-${project.version}-src.zip&quot;"/>
 	</target>
 
 	<target name="binaries-zip" depends="init bin-pack">
diff --git a/doc/documentation.build b/doc/documentation.build
index b8b5c08a600..32c673b8f53 100644
--- a/doc/documentation.build
+++ b/doc/documentation.build
@@ -7,7 +7,7 @@
 >
 
 	<property name="root.dir" value=".." />
-	<include buildfile="${root.dir}/build-common/common-project.xml" />
+	<include buildfile="${root.dir}/build-common/common.xml" />
 
 	<target name="init" depends="common.init common.nuget-restore">
 		<property name="doc.out.dir" value="${build.dir}/doc" />
diff --git a/src/NHibernate.Everything.sln b/src/NHibernate.Everything.sln
index 234a401f88f..c2c257360fc 100644
--- a/src/NHibernate.Everything.sln
+++ b/src/NHibernate.Everything.sln
@@ -28,7 +28,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projects", "Projects", "{28
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NAnt Build", "NAnt Build", "{4CE16C2F-EFF6-48A4-99BC-8984DCC143FA}"
 	ProjectSection(SolutionItems) = preProject
-		..\build-common\common-project.xml = ..\build-common\common-project.xml
 		..\build-common\common.xml = ..\build-common\common.xml
 		..\default.build = ..\default.build
 	EndProjectSection
diff --git a/teamcity.build b/teamcity.build
index 9a5d35b3815..f3183f7159d 100644
--- a/teamcity.build
+++ b/teamcity.build
@@ -17,8 +17,8 @@
 	<target name="copy-teamcity-configuration">
 		<copy file="build-common/teamcity-hibernate.cfg.xml" tofile="${bin.dir}/hibernate.cfg.xml" />
 		<call target="setup-teamcity-${config.teamcity}"/>
-		<property name="app.config" value="../${bin.dir}/hibernate.cfg.xml" />
-		<nant buildfile="${root.dir}/build-common/common-project.xml" target="common.put-connection-settings-into-defined-app-config" />
+		<property name="app.config" value="${bin.dir}/hibernate.cfg.xml" />
+		<call target="put-connection-settings-into-defined-app-config" />
 	</target>
 
 	<target name="verify-test-results">