diff options
| -rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.dll | bin | 61440 -> 61440 bytes | |||
| -rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.pdb | bin | 155136 -> 155136 bytes | |||
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj | 4 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs | 11 |
4 files changed, 10 insertions, 5 deletions
diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll Binary files differindex ec96016..ee2c15a 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 0dcdf1a..8a18598 100644 --- a/lib/DotNetOpenAuth.BuildTasks.pdb +++ b/lib/DotNetOpenAuth.BuildTasks.pdb diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj index 02244a8..b8cff51 100644 --- a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj +++ b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj @@ -63,7 +63,9 @@ <Reference Include="Microsoft.Build.Utilities.v3.5"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> - <Reference Include="Microsoft.Contracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL" /> + <Reference Include="Microsoft.Contracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL"> + <Private>False</Private> + </Reference> <Reference Include="Microsoft.Web.Administration, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>$(SystemRoot)\System32\inetsrv\Microsoft.Web.Administration.dll</HintPath> diff --git a/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs b/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs index a3adfcb..23db9a6 100644 --- a/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs +++ b/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs @@ -64,13 +64,16 @@ namespace DotNetOpenAuth.BuildTasks { psi.RedirectStandardOutput = true; psi.UseShellExecute = false; Process git = Process.Start(psi); - commitId = git.StandardOutput.ReadLine().Trim(); + commitId = git.StandardOutput.ReadLine(); git.WaitForExit(); if (git.ExitCode != 0) { - commitId = null; + commitId = string.Empty; } - if (commitId != null && commitId.Length == 40) { - return commitId; + if (commitId != null) { + commitId = commitId.Trim(); + if (commitId.Length == 40) { + return commitId; + } } } catch (InvalidOperationException) { } catch (Win32Exception) { |