Merge pull request #1164 from DigitalFlow/bugfix/SpacesInWiX

Fixed bug in WiXDir function, that would set plain directory name as id
fsprojects · Mar 3, 2016 · 0388027 · 0388027
2 parents 04cbee9 + 676f983
commit 0388027
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/app/FakeLib/WiXHelper.fs b/src/app/FakeLib/WiXHelper.fs
@@ -577,11 +577,11 @@ let rec wixDir fileFilter asSubDir (directoryInfo : DirectoryInfo) =
         if files = "" then ""
         else 
             split '\n' files
-            |> Seq.map(fun f -> sprintf "<Component Id=\"%s\" Guid=\"%s\">\r\n%s\r\n</Component>\r\n" (compName directoryInfo.Name) "*" f)
+            |> Seq.map(fun f -> sprintf "<Component Id=\"%s\" Guid=\"%s\">\r\n%s\r\n</Component>\r\n" (compName (directoryInfo.Name.GetHashCode().ToString("x8"))) "*" f)
             |> toLines
-    
+
     if asSubDir then 
-        sprintf "<Directory Id=\"%s\" Name=\"%s\">\r\n%s%s\r\n</Directory>\r\n" (dirName directoryInfo.Name) 
+        sprintf "<Directory Id=\"%s\" Name=\"%s\">\r\n%s%s\r\n</Directory>\r\n" (dirName (directoryInfo.Name.GetHashCode().ToString("x8"))) 
             directoryInfo.Name dirs compo
     else sprintf "%s%s" dirs compo