Merge pull request #956 from xavierzwirtz/path-cache-bust

Script path cache bust

Author: forki

src/app/FakeLib/EnvironmentHelper.fs

@@ -25,6 +25,10 @@ let inline combinePathsNoTrim path1 path2 = Path.Combine(path1, path2)
 let inline (@@) path1 path2 = combinePaths path1 path2
 let inline (</>) path1 path2 = combinePathsNoTrim path1 path2
 
+// Normalizes path for different OS
+let inline normalizePath (path : string) = 
+    path.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar)
+
 /// Retrieves all environment variables from the given target
 let environVars target = 
     [ for e in Environment.GetEnvironmentVariables target -> 

src/app/FakeLib/FSIHelper.fs

@@ -70,8 +70,10 @@ let rec getAllScripts scriptPath : seq<Script> =
 
 let getScriptHash pathsAndContents =
     let fullContents = getAllScriptContents pathsAndContents |> String.concat "\n"
+    let paths = pathsAndContents |> Seq.map(fun x -> x.Location |> EnvironmentHelper.normalizePath) |> String.concat "\n"
+    
     let hasher = HashLib.HashFactory.Checksum.CreateCRC32a()
-    hasher.ComputeString(fullContents).ToString()
+    hasher.ComputeString(fullContents + paths).ToString()
 
 module private Cache =
     let xname name = XName.Get(name)

src/app/FakeLib/Globbing/Globbing.fs

@@ -1,6 +1,7 @@
 /// This module contains a file pattern globbing implementation.
 module Fake.Globbing
 
+open Fake.EnvironmentHelper
 open System
 open System.Collections.Generic
 open System.IO
@@ -58,8 +59,6 @@ let private isDrive =
     let regex = Regex(@"^[A-Za-z]:$", RegexOptions.Compiled)
     fun dir -> regex.IsMatch dir
 
-let inline private normalizePath (p : string) = 
-    p.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar)
 let inline private normalizeOutputPath (p : string) = 
     p.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar)
      .TrimEnd(Path.DirectorySeparatorChar)

src/test/Test.FAKECore/ChangeWatcherSpecs.cs

@@ -16,8 +16,8 @@ public class when_calculating_directories_to_watch
                 var dirsToWatch = ChangeWatcher.calcDirsToWatch(fileIncludes);
 
                 dirsToWatch.Length.ShouldEqual(2);
-                dirsToWatch.ShouldContain(Fake.Globbing.normalizePath(@"C:\Project\test1\bin"));
-                dirsToWatch.ShouldContain(Fake.Globbing.normalizePath(@"C:\Project\test2\bin"));
+                dirsToWatch.ShouldContain(Fake.EnvironmentHelper.normalizePath(@"C:\Project\test1\bin"));
+                dirsToWatch.ShouldContain(Fake.EnvironmentHelper.normalizePath(@"C:\Project\test2\bin"));
             };
 
         It should_only_take_the_most_root_path_when_multiple_directories_share_a_root =
@@ -29,7 +29,7 @@ public class when_calculating_directories_to_watch
                 var dirsToWatch = ChangeWatcher.calcDirsToWatch(fileIncludes);
 
                 dirsToWatch.Length.ShouldEqual(1);
-                dirsToWatch.ShouldContain(Fake.Globbing.normalizePath(@"C:\Project\tests"));
+                dirsToWatch.ShouldContain(Fake.EnvironmentHelper.normalizePath(@"C:\Project\tests"));
             };
     }
 }