diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-14 08:55:55 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-14 08:55:55 -0800 |
| commit | 7a116a02e3193bf0de1f59f4a0b7b1fff850a255 (patch) | |
| tree | 8715524febf99d48304e0438154abb32a1651128 /src | |
| parent | 3ab3290535a987d8e466448e29bce16be443a2d7 (diff) | |
| parent | ba92d01ee3a93341f2f65a150b401ca63adf28e7 (diff) | |
| download | DotNetOpenAuth-7a116a02e3193bf0de1f59f4a0b7b1fff850a255.zip DotNetOpenAuth-7a116a02e3193bf0de1f59f4a0b7b1fff850a255.tar.gz DotNetOpenAuth-7a116a02e3193bf0de1f59f4a0b7b1fff850a255.tar.bz2 | |
Merge branch 'v3.3' into v3.4v3.4.0.10015
Conflicts:
lib/DotNetOpenAuth.BuildTasks.dll
lib/DotNetOpenAuth.BuildTasks.pdb
Diffstat (limited to 'src')
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj | 4 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs | 11 |
2 files changed, 10 insertions, 5 deletions
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) { |