From cbc23f4db8047a4d50b7c0ff54d38fb67a3ff994 Mon Sep 17 00:00:00 2001 From: Ken Rice Date: Fri, 11 Dec 2015 16:38:31 -0600 Subject: [PATCH] Revert "explore use of nuget for wix build dependency" This reverts commit 31065883df8a3a17e0e6112ecb1a04697c1c3805. --- w32/Setup/Setup.2015.wixproj | 8 +------- w32/Setup/packages.config | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 w32/Setup/packages.config diff --git a/w32/Setup/Setup.2015.wixproj b/w32/Setup/Setup.2015.wixproj index 1d8563b353..7dcf416bf7 100644 --- a/w32/Setup/Setup.2015.wixproj +++ b/w32/Setup/Setup.2015.wixproj @@ -61,13 +61,7 @@ - - - $(SolutionDir)packages\WiX.Toolset.2015.3.10.0.1503\tools\wix\ - $(WixToolPath)wix.targets - $(WixToolPath)WixTasks.dll - "$(WixToolPath)\heat.exe" dir "$(ProjectDir)..\..\conf\vanilla" -cg FreeSWITCHConfFiles -gg -scom -sreg -sfrag -srd -dr CONFLOCATION -var var.FreeSWITCHConfFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHConfFiles.wxs" @@ -82,4 +76,4 @@ --> - \ No newline at end of file + diff --git a/w32/Setup/packages.config b/w32/Setup/packages.config deleted file mode 100644 index 1479e99c37..0000000000 --- a/w32/Setup/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file