Merge branch 'feature/improved-exception-handling'

Author: JakeGinnivan

GitVersion.sln.DotSettings

@@ -569,6 +569,7 @@ II.2.12 <HandlesEvent />
 	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>

GitVersionCore.Tests/Helpers/GitTestExtensions.cs

@@ -15,13 +15,24 @@ public static void DumpGraph(this IRepository repository)
     {
         var output = new StringBuilder();
 
-        ProcessHelper.Run(
-            o => output.AppendLine(o),
-            e => output.AppendLineFormat("ERROR: {0}", e),
-            null,
-            "git",
-            @"log --graph --abbrev-commit --decorate --date=relative --all --remotes=*",
-            repository.Info.Path);
+        try
+        {
+            ProcessHelper.Run(
+                o => output.AppendLine(o),
+                e => output.AppendLineFormat("ERROR: {0}", e),
+                null,
+                "git",
+                @"log --graph --abbrev-commit --decorate --date=relative --all --remotes=*",
+                repository.Info.Path);
+        }
+        catch (FileNotFoundException exception)
+        {
+            if (exception.FileName != "git")
+                throw;
+
+            output.AppendLine("Could not execute 'git log' due to the following error:");
+            output.AppendLine(exception.ToString());
+        }
 
         Trace.Write(output.ToString());
     }

GitVersionCore/Helpers/ProcessHelper.cs

@@ -2,6 +2,7 @@ namespace GitVersion.Helpers
 {
     using System;
     using System.Collections.Generic;
+    using System.ComponentModel;
     using System.Diagnostics;
     using System.IO;
     using System.Runtime.InteropServices;
@@ -20,8 +21,24 @@ public static Process Start(ProcessStartInfo startInfo)
             {
                 using (new ChangeErrorMode(ErrorModes.FailCriticalErrors | ErrorModes.NoGpFaultErrorBox))
                 {
-                    process = Process.Start(startInfo);
-                    process.PriorityClass = ProcessPriorityClass.Idle;
+                    try
+                    {
+                        process = Process.Start(startInfo);
+                        process.PriorityClass = ProcessPriorityClass.Idle;
+                    }
+                    catch (Win32Exception exception)
+                    {
+                        // NOTE: https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396 @asbjornu
+                        if (exception.NativeErrorCode == 2)
+                        {
+                            throw new FileNotFoundException(String.Format("The executable file '{0}' could not be found.",
+                                                                          startInfo.FileName),
+                                                            startInfo.FileName,
+                                                            exception);
+                        }
+                        
+                        throw;
+                    }
                 }
             }
 
@@ -32,10 +49,12 @@ public static Process Start(ProcessStartInfo startInfo)
         public static int Run(Action<string> output, Action<string> errorOutput, TextReader input, string exe, string args, string workingDirectory, params KeyValuePair<string, string>[] environmentalVariables)
         {
             if (String.IsNullOrEmpty(exe))
-                throw new FileNotFoundException();
+                throw new ArgumentNullException("exe");
             if (output == null)
                 throw new ArgumentNullException("output");
 
+            workingDirectory = workingDirectory ?? Environment.CurrentDirectory;
+
             var psi = new ProcessStartInfo
             {
                 UseShellExecute = false,
@@ -45,7 +64,7 @@ public static int Run(Action<string> output, Action<string> errorOutput, TextRea
                 WindowStyle = ProcessWindowStyle.Hidden,
                 CreateNoWindow = true,
                 ErrorDialog = false,
-                WorkingDirectory = workingDirectory ?? Environment.CurrentDirectory,
+                WorkingDirectory = workingDirectory,
                 FileName = exe,
                 Arguments = args
             };
@@ -57,7 +76,7 @@ public static int Run(Action<string> output, Action<string> errorOutput, TextRea
                     psi.EnvironmentVariables.Remove(environmentalVariable.Key);
             }
 
-            using (var process = Process.Start(psi))
+            using (var process = Start(psi))
             using (var mreOut = new ManualResetEvent(false))
             using (var mreErr = new ManualResetEvent(false))
             {
@@ -120,5 +139,4 @@ public ChangeErrorMode(ErrorModes mode)
             static extern int SetErrorMode(int newMode);
         }
     }
-
 }

GitVersionTask/NugetAssets/GitVersionTask.targets

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)..\</SolutionDir>
     <IntermediateOutputPath Condition="$(IntermediateOutputPath) == '' Or $(IntermediateOutputPath) == '*Undefined*'">$(MSBuildProjectDirectory)obj\$(Configuration)\</IntermediateOutputPath>
+    <GitVersionNoFetchEnabled Condition="$(GitVersionNoFetchEnabled) == ''">false</GitVersionNoFetchEnabled>
   </PropertyGroup>
 
   <UsingTask
@@ -35,7 +36,7 @@
     </ItemGroup>
 
 
-    <GetVersion SolutionDirectory="$(SolutionDir)">
+    <GetVersion SolutionDirectory="$(SolutionDir)" NoFetch="$(GitVersionNoFetchEnabled)">
       <Output TaskParameter="Major" PropertyName="GfvMajor" />
       <Output TaskParameter="Minor" PropertyName="GfvMinor" />
       <Output TaskParameter="Patch" PropertyName="GfvPatch" />