From 31065883df8a3a17e0e6112ecb1a04697c1c3805 Mon Sep 17 00:00:00 2001 From: Jeff Lenk <jeff@jefflenk.com> Date: Mon, 7 Sep 2015 18:14:42 -0500 Subject: [PATCH] explore use of nuget for wix build dependency --- w32/Setup/Setup.2015.wixproj | 8 +++++++- w32/Setup/packages.config | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 w32/Setup/packages.config diff --git a/w32/Setup/Setup.2015.wixproj b/w32/Setup/Setup.2015.wixproj index 7dcf416bf7..1d8563b353 100644 --- a/w32/Setup/Setup.2015.wixproj +++ b/w32/Setup/Setup.2015.wixproj @@ -61,7 +61,13 @@ </ItemGroup> <ItemGroup> <Content Include="filter.xslt" /> + <Content Include="packages.config" /> </ItemGroup> + <PropertyGroup> + <WixToolPath>$(SolutionDir)packages\WiX.Toolset.2015.3.10.0.1503\tools\wix\</WixToolPath> + <WixTargetsPath>$(WixToolPath)wix.targets</WixTargetsPath> + <WixTasksPath>$(WixToolPath)WixTasks.dll</WixTasksPath> + </PropertyGroup> <Import Project="$(WixTargetsPath)" /> <PropertyGroup> <PreBuildEvent>"$(WixToolPath)\heat.exe" dir "$(ProjectDir)..\..\conf\vanilla" -cg FreeSWITCHConfFiles -gg -scom -sreg -sfrag -srd -dr CONFLOCATION -var var.FreeSWITCHConfFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHConfFiles.wxs" @@ -76,4 +82,4 @@ <Target Name="AfterBuild"> </Target> --> -</Project> +</Project> \ No newline at end of file diff --git a/w32/Setup/packages.config b/w32/Setup/packages.config new file mode 100644 index 0000000000..1479e99c37 --- /dev/null +++ b/w32/Setup/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="WiX.Toolset.2015" version="3.10.0.1503" /> +</packages> \ No newline at end of file