Merge pull request #1420 from adamralph/msbuild-finding

avoid unecessary MSBuild finding
FakeItEasy · Sep 2, 2018 · e335d55 · e335d55
2 parents b47f50f + 08295f6
commit e335d55
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/tools/FakeItEasy.Build/Program.cs b/tools/FakeItEasy.Build/Program.cs
@@ -56,7 +56,7 @@ public class Program
 
         private static readonly string OutputDirectory = Path.GetFullPath("artifacts/output");
 
-        private static readonly string MsBuild = $"{GetVSLocation()}/MSBuild/15.0/Bin/MSBuild.exe";
+        private static string msBuild = null;
 
         public static void Main(string[] args)
         {
@@ -68,11 +68,13 @@ public static void Main(string[] args)
 
             Target("testsDirectory", () => Directory.CreateDirectory(TestsDirectory));
 
-            Target("build", DependsOn("clean", "restore", "versionInfoFile"), () => RunMsBuild("Build"));
+            Target("find-msbuild", () => msBuild = $"{GetVSLocation()}/MSBuild/15.0/Bin/MSBuild.exe");
+
+            Target("build", DependsOn("clean", "restore", "versionInfoFile", "find-msbuild"), () => RunMsBuild("Build"));
 
             Target("versionInfoFile", () => Run(ToolPaths.GitVersion, $"/updateAssemblyInfo {VersionInfoFile} /ensureAssemblyInfo"));
 
-            Target("clean", DependsOn("logsDirectory"), () => RunMsBuild("Clean"));
+            Target("clean", DependsOn("logsDirectory", "find-msbuild"), () => RunMsBuild("Clean"));
 
             Target(
                 "restore",
@@ -124,7 +126,7 @@ public static void Main(string[] args)
         private static void RunMsBuild(string target)
         {
             Run(
-                MsBuild,
+                msBuild,
                 $"{Solution} /target:{target} /p:configuration=Release /maxcpucount /nr:false /verbosity:minimal /nologo /bl:artifacts/logs/{target}.binlog");
         }