Modified build:

(1) SharedBuildAssemblyInfo.cs is added to git and reverted after build or fail
(2) Added git.exe to tools for reverting target
(3) Echoed build.version to teamcity according to ninject2

Ninject.build

@@ -6,15 +6,18 @@
 	<property name="path.bin.tests" value="${path.bin}/tests"/>
 	<property name="path.lib" value="${path.base}/lib"/>
 	<property name="path.dist" value="${path.base}/dist"/>
+	<property name="path.build.assemblyinfo" value="${path.src}/${build.asminfo}" dynamic="true"/>
 	<property name="path.src" value="${path.base}/src"/>
 	<property name="path.tools" value="${path.base}/tools"/>
 	<property name="path.tools.nunit" value="${path.tools}/nunit"/>
+	<property name="path.tools.git" value="${path.tools}/git"/>
 
 	<property name="version" value="1.5.0.0" overwrite="false"/>
 	<property name="version.major" value="${version::get-major(version::parse(version))}" dynamic="true"/>
 	<property name="version.minor" value="${version::get-minor(version::parse(version))}" dynamic="true"/>
 	<property name="version.build" value="${version::get-build(version::parse(version))}" dynamic="true"/>
-	<property name="version.revision" value="${version::get-revision(version::parse(version))}" dynamic="true"/>
+	<property name="version.revision" value="${version::get-revision(version::parse(version))}" dynamic="true" unless="${environment::variable-exists('BUILD_NUMBER')}"/>
+	<property name="version.revision" value="${environment::get-variable('BUILD_NUMBER')}" dynamic="true" if="${environment::variable-exists('BUILD_NUMBER')}"/>
 	<property name="build.version" value="${version.major}.${version.minor}.${version.build}.${version.revision}" dynamic="true"/>
 
 	<property name="package" value="false" readonly="false" overwrite="false"/>
@@ -69,7 +72,8 @@
 	</target>
 
 	<target name="create-assembly-info">
-		<asminfo output="${path.src}/${build.asminfo}" language="CSharp">
+		<echo message="##teamcity[buildNumber '${build.version}']" />
+		<asminfo output="${path.build.assemblyinfo}" language="CSharp">
 			<imports>
 				<import namespace="System"/>
 				<import namespace="System.Reflection"/>
@@ -78,7 +82,7 @@
 			<attributes>
 				<attribute type="AssemblyProductAttribute" value="Ninject: Dependency Injector for .NET"/>
 				<attribute type="AssemblyCompanyAttribute" value="Enkari, Ltd. and contributors"/>
-				<attribute type="AssemblyCopyrightAttribute" value="Copyright ©2007-2009, Enkari, Ltd. and contributors"/>
+				<attribute type="AssemblyCopyrightAttribute" value="Copyright ©2007-2010, Enkari, Ltd. and contributors"/>
 				<attribute type="AssemblyVersionAttribute" value="${build.version}"/>
 				<attribute type="ComVisibleAttribute" value="false"/>
 				<attribute type="CLSCompliantAttribute" value="true"/>
@@ -706,5 +710,13 @@
 			</fileset>
 		</zip>
 	</target>
+
+	<target name="revert">
+		<echo message="Reverting version info"/>
+		<exec
+			program="${path.tools.git}/git.exe"
+			commandline='checkout "${path.build.assemblyinfo}"'
+			failonerror="false"/>
+	</target>
 
 </project>

build.cmd

@@ -1,2 +1,21 @@
-@echo off
-tools\nant\nant.exe -buildfile:ninject.build %1 %2 %3 %4 %5 %6 %7 %8
+@echo off
+set nantfile=Ninject.build
+set nantexe=tools\nant\nant.exe
+
+%nantexe% -buildfile:%nantfile% %1 %2 %3 %4 %5 %6 %7 %8
+IF ERRORLEVEL 1 GOTO Failed
+
+%nantexe% -buildfile:%nantfile% -q -nologo revert
+IF ERRORLEVEL 1 GOTO Failed
+
+echo "Release build completed."
+GOTO End
+
+:Failed
+%nantexe% -buildfile:%nantfile% -q -nologo revert
+echo "============================================================"
+echo "BUILD FAILED"
+echo "============================================================"
+
+:End
+pause

src/SharedBuildAssemblyInfo.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+[assembly: AssemblyProductAttribute("Ninject: Dependency Injector for .NET")]
+[assembly: AssemblyCompanyAttribute("Enkari, Ltd. and contributors")]
+[assembly: AssemblyCopyrightAttribute("Copyright ©2007-2010, Enkari, Ltd. and contributors")]
+[assembly: AssemblyVersionAttribute("1.5.0.0")]
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(true)]
+