From 1e88b785c37fde9cbd633da329092dedb2e190de Mon Sep 17 00:00:00 2001 From: Denis Brodbeck Date: Fri, 11 Dec 2015 07:46:55 +0100 Subject: [PATCH] Replace hard reference on gacutil path with automatic search for latest gacutil.exe The existing path "Microsoft SDKs/Windows/v8.0A/bin/NETFX 4.0 Tools/gacutil.exe" doesn't exist on a Win 10 + Visual Studio 2015 dev environment. RegAsmHelper solves a similar problem by searching for the latest regasm tools path (using EnvironmentHelper). This patch solves this analogously. --- src/app/FakeLib/GACHelper.fs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/FakeLib/GACHelper.fs b/src/app/FakeLib/GACHelper.fs index 79e5dfdf82f..e3feb70bd0e 100644 --- a/src/app/FakeLib/GACHelper.fs +++ b/src/app/FakeLib/GACHelper.fs @@ -3,6 +3,10 @@ module Fake.GACHelper open System +/// Path to newest `gacutil.exe` +let gacutilToolPath = !! (sdkBasePath + "/**/gacutil.exe") + |> getNewestTool + /// GAC parameters type GACParams = { /// (Required) Path to the gacutil @@ -13,8 +17,7 @@ type GACParams = WorkingDir : string } let mutable GACUtil = - if isMono then "gacutil" else - ProgramFilesX86 @@ "Microsoft SDKs/Windows/v8.0A/bin/NETFX 4.0 Tools/gacutil.exe" + if isMono then "gacutil" else gacutilToolPath /// GACutil default parameters let GACDefaults =