diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-28 08:47:48 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-28 08:47:48 -0800 |
| commit | 000414580de0378533cb6bb7846c8201717bc041 (patch) | |
| tree | d8227975238e4413118111794febbc1a27e0ff42 | |
| parent | 3d1f8affe066a360aea95c9c98470f41be99aa12 (diff) | |
| download | DotNetOpenAuth-000414580de0378533cb6bb7846c8201717bc041.zip DotNetOpenAuth-000414580de0378533cb6bb7846c8201717bc041.tar.gz DotNetOpenAuth-000414580de0378533cb6bb7846c8201717bc041.tar.bz2 | |
Removed warning when building in TeamCity.
| -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-- | src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs | 4 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.Versioning.targets | 4 |
4 files changed, 3 insertions, 5 deletions
diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll Binary files differindex ab1454c..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 8dc1628..b27ee26 100644 --- a/lib/DotNetOpenAuth.BuildTasks.pdb +++ b/lib/DotNetOpenAuth.BuildTasks.pdb diff --git a/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs b/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs index b4de743..48b5d5c 100644 --- a/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs +++ b/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs @@ -63,10 +63,6 @@ namespace DotNetOpenAuth.BuildTasks { } catch (DirectoryNotFoundException) { } - if (string.IsNullOrEmpty(headContent)) { - Log.LogWarning("Unable to determine the git HEAD commit ID to use for informational version number."); - } - return headContent.Trim(); } diff --git a/tools/DotNetOpenAuth.Versioning.targets b/tools/DotNetOpenAuth.Versioning.targets index 52149c7..5047f3a 100644 --- a/tools/DotNetOpenAuth.Versioning.targets +++ b/tools/DotNetOpenAuth.Versioning.targets @@ -29,7 +29,9 @@ <!-- 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> - <Message Text="Building version $(BuildVersion) from commit $(AssemblyInformationalVersion)"/> + <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"> |