Fixed build break that appears when the .git directory is not found a…

…nd removed warning when building in TeamCity.
DotNetOpenAuth · Dec 28, 2009 · 6890ef9 · 6890ef9
1 parent 9d4fc13
commit 6890ef9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll
diff --git a/lib/DotNetOpenAuth.BuildTasks.pdb b/lib/DotNetOpenAuth.BuildTasks.pdb
diff --git a/tools/DotNetOpenAuth.Versioning.targets b/tools/DotNetOpenAuth.Versioning.targets
@@ -18,7 +18,13 @@
 			<Output TaskParameter="Version" PropertyName="BuildVersion" />
 			<Output TaskParameter="GitCommitId" PropertyName="AssemblyInformationalVersion" />
 		</GetBuildVersion>
-		<Message Text="Building version $(BuildVersion) from commit $(AssemblyInformationalVersion)"/>
+		<PropertyGroup>
+			<!-- In TeamCity, the build agent doesn't get the .git directory, but the commit id is available by other means. -->
+			<AssemblyInformationalVersion Condition=" '$(AssemblyInformationalVersion)' == '' ">$(BUILD_VCS_NUMBER)</AssemblyInformationalVersion>
+		</PropertyGroup>
+		<Warning Condition=" '$(AssemblyInformationalVersion)' == '' " Text="Unable to determine the git HEAD commit ID to use for informational version number." />
+		<Message Condition=" '$(AssemblyInformationalVersion)' != '' " Text="Building version $(BuildVersion) from commit $(AssemblyInformationalVersion)"/>
+		<Message Condition=" '$(AssemblyInformationalVersion)' == '' " Text="Building version $(BuildVersion)"/>
 	</Target>
 
 	<Target Name="BeforeBuild" DependsOnTargets="GetBuildVersion">