From af60422f67809dfb10141d32f2930f59564ac6a9 Mon Sep 17 00:00:00 2001 From: Matthew Casperson Date: Wed, 19 Dec 2018 07:13:13 +1000 Subject: [PATCH 1/3] Embedded octodiff into the windows exe --- build.cake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.cake b/build.cake index e6c77cd3f..748cf135b 100644 --- a/build.cake +++ b/build.cake @@ -166,7 +166,8 @@ 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").Select(f => (FilePath) f) + .Union(System.IO.Directory.EnumerateFiles(inputFolder, "octodiff.exe").Select(f => (FilePath) f)), new ILRepackSettings { Internalize = true, Parallel = true, From ba1cfe99726b29231752a1a8f915570407f68fb6 Mon Sep 17 00:00:00 2001 From: Matthew Casperson Date: Wed, 19 Dec 2018 07:24:56 +1000 Subject: [PATCH 2/3] Made this change slightly less verbose --- build.cake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.cake b/build.cake index 748cf135b..0bb89f54c 100644 --- a/build.cake +++ b/build.cake @@ -166,8 +166,9 @@ Task("MergeOctoExe") ILRepack( $"{outputFolder}/Octo.exe", $"{inputFolder}/Octo.exe", - System.IO.Directory.EnumerateFiles(inputFolder, "*.dll").Select(f => (FilePath) f) - .Union(System.IO.Directory.EnumerateFiles(inputFolder, "octodiff.exe").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, From 42f8b38e96934e5a49f4f6a5ca3d9db826c7d546 Mon Sep 17 00:00:00 2001 From: Matthew Casperson Date: Wed, 19 Dec 2018 07:26:09 +1000 Subject: [PATCH 3/3] Missed a bracket --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index 0bb89f54c..e2b22cd71 100644 --- a/build.cake +++ b/build.cake @@ -167,7 +167,7 @@ Task("MergeOctoExe") $"{outputFolder}/Octo.exe", $"{inputFolder}/Octo.exe", System.IO.Directory.EnumerateFiles(inputFolder, "*.dll") - .Union(System.IO.Directory.EnumerateFiles(inputFolder, "octodiff.exe") + .Union(System.IO.Directory.EnumerateFiles(inputFolder, "octodiff.exe")) .Select(f => (FilePath) f), new ILRepackSettings { Internalize = true,