Revert "explore use of nuget for wix build dependency"

This reverts commit 31065883df8a3a17e0e6112ecb1a04697c1c3805.

diff --git a/w32/Setup/Setup.2015.wixproj b/w32/Setup/Setup.2015.wixproj
index 1d8563b35340e06d515af9f1acf2a075c7230f33..7dcf416bf7e51e78eca9ddf8332903d507780fdc 100644 (file)
--- a/w32/Setup/Setup.2015.wixproj
+++ b/w32/Setup/Setup.2015.wixproj
@@ -61,13 +61,7 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <Content Include="filter.xslt" />\r
-    <Content Include="packages.config" />\r
   </ItemGroup>\r
-  <PropertyGroup>\r
-    <WixToolPath>$(SolutionDir)packages\WiX.Toolset.2015.3.10.0.1503\tools\wix\</WixToolPath>\r
-    <WixTargetsPath>$(WixToolPath)wix.targets</WixTargetsPath>\r
-    <WixTasksPath>$(WixToolPath)WixTasks.dll</WixTasksPath>\r
-  </PropertyGroup>\r
   <Import Project="$(WixTargetsPath)" />\r
   <PropertyGroup>\r
     <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"\r
@@ -82,4 +76,4 @@
        <Target Name="AfterBuild">\r
        </Target>\r
        -->\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/w32/Setup/packages.config b/w32/Setup/packages.config
deleted file mode 100644 (file)
index 1479e99..0000000
--- a/w32/Setup/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<packages>\r
-  <package id="WiX.Toolset.2015" version="3.10.0.1503" />\r
-</packages>
\ No newline at end of file