mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 15:02:35 +01:00
Minor fixes for UpdateAssemblyInfo/Program.cs (now works too if git not installed)
This commit is contained in:
parent
1eae4682e6
commit
f4465b1c59
@ -27,7 +27,7 @@ namespace UpdateAssemblyInfo
|
||||
return false;
|
||||
}
|
||||
p.BeginOutputReadLine(); // Async reading of output to prevent deadlock
|
||||
if (p.WaitForExit(9000))
|
||||
if (p.WaitForExit(5000))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -57,8 +57,7 @@ namespace UpdateAssemblyInfo
|
||||
var clrHash = new CommandLineRunner();
|
||||
var rcGitHash = clrHash.RunCommandAndGetOutput(GetGitPath(), "rev-parse --verify HEAD", workingFolder);
|
||||
var clrTags = new CommandLineRunner();
|
||||
var rcGitTags = clrTags.RunCommandAndGetOutput(GetGitPath(), "describe --tags", workingFolder);
|
||||
if (rcGitHash && rcGitTags)
|
||||
if (rcGitHash && clrTags.RunCommandAndGetOutput(GetGitPath(), "describe --tags", workingFolder))
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -78,7 +77,7 @@ namespace UpdateAssemblyInfo
|
||||
{
|
||||
// allow for compile without git
|
||||
DoUpdateAssembly("[GITHASH]", string.Empty, template, target);
|
||||
DoUpdateAssembly("[REVNO]", "0", template, target);
|
||||
DoUpdateAssembly("[REVNO]", "0", target, target);
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user