diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-28 08:55:14 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-28 08:55:14 -0800 |
| commit | 42cafdaa6f9e8101bb799f593f82e62125f73ace (patch) | |
| tree | 7cf67542da9f0c96646721ee3a809aa03ebe05ea | |
| parent | 572f421e05be6c15f8dacda73b536c1043585eca (diff) | |
| parent | 6890ef98c4541d6043f93504408bacfed257298f (diff) | |
| download | DotNetOpenAuth-42cafdaa6f9e8101bb799f593f82e62125f73ace.zip DotNetOpenAuth-42cafdaa6f9e8101bb799f593f82e62125f73ace.tar.gz DotNetOpenAuth-42cafdaa6f9e8101bb799f593f82e62125f73ace.tar.bz2 | |
Merge branch 'v3.0' into v3.1
| -rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.dll | bin | 57856 -> 57856 bytes | |||
| -rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.pdb | bin | 144896 -> 144896 bytes | |||
| -rw-r--r-- | tools/DotNetOpenAuth.Versioning.targets | 8 |
3 files changed, 7 insertions, 1 deletions
diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll Binary files differindex a35c306..9dfd63e 100644 --- a/lib/DotNetOpenAuth.BuildTasks.dll +++ b/lib/DotNetOpenAuth.BuildTasks.dll diff --git a/lib/DotNetOpenAuth.BuildTasks.pdb b/lib/DotNetOpenAuth.BuildTasks.pdb Binary files differindex d818880..b27ee26 100644 --- a/lib/DotNetOpenAuth.BuildTasks.pdb +++ b/lib/DotNetOpenAuth.BuildTasks.pdb diff --git a/tools/DotNetOpenAuth.Versioning.targets b/tools/DotNetOpenAuth.Versioning.targets index 282cf86..9ba295d 100644 --- 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"> |