Merge pull request #363 from OctopusDeploy/bug-5175

Embedded octodiff into the windows exe
OctopusDeploy · Dec 18, 2018 · e42283c · e42283c
2 parents 504c3ff + 42f8b38
commit e42283c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/build.cake b/build.cake
@@ -166,7 +166,9 @@ Task("MergeOctoExe")
         ILRepack(
             $"{outputFolder}/Octo.exe",
             $"{inputFolder}/Octo.exe",
-            System.IO.Directory.EnumerateFiles(inputFolder, "*.dll").Select(f => (FilePath) f),
+            System.IO.Directory.EnumerateFiles(inputFolder, "*.dll")
+				.Union(System.IO.Directory.EnumerateFiles(inputFolder, "octodiff.exe"))
+				.Select(f => (FilePath) f),
             new ILRepackSettings {
                 Internalize = true,
                 Parallel = true,