Reverting some changes to make VSTS build

Author: renemadsen

eFormAPI/Installation/Bundle/InstallBundle.wixproj

@@ -9,9 +9,9 @@
     <OutputName>Eform Angular Frontend</OutputName>
     <OutputType>Bundle</OutputType>
     <Name>InstallBundle</Name>
-	<WixToolPath>$(ProjectDir)..\wix\3.11\</WixToolPath>
+	<!--<WixToolPath>$(ProjectDir)..\wix\3.11\</WixToolPath>
 	<WixTargetsPath>$(WixToolPath)\wix.targets</WixTargetsPath>
-	<WixTasksPath>wixtasks.dll</WixTasksPath>
+	<WixTasksPath>wixtasks.dll</WixTasksPath>-->
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>..\AllowMultipleVersionsBundle\Resources\</OutputPath>
@@ -58,6 +58,11 @@
     <Content Include="requestRouter_amd64.msi" />
     <Content Include="rewrite_amd64.msi" />
   </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
   <ItemGroup>
     <EmbeddedResource Include="HyperlinkTheme.wxl" />
   </ItemGroup>

eFormAPI/Installation/CustomActions/CustomActions.csproj

@@ -12,8 +12,9 @@
     <AssemblyName>CustomActions</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-	<WixToolPath>$(ProjectDir)..\wix\3.11\sdk\</WixToolPath>
-    <WixCATargetsPath>$(WixToolPath)wix.ca.targets</WixCATargetsPath>
+    <WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">..\wix\3.11\sdk\wix.ca.targets</WixCATargetsPath>
+	<!--<WixToolPath>$(ProjectDir)..\wix\3.11\sdk\</WixToolPath>
+    <WixCATargetsPath>$(WixToolPath)wix.ca.targets</WixCATargetsPath>-->
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>

eFormAPI/Installation/MainInstaller/MainInstaller.wixproj

@@ -8,9 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>maininstaller</OutputName>
     <OutputType>Package</OutputType>
-	<WixToolPath>$(ProjectDir)..\wix\3.11\</WixToolPath>
+	<!--<WixToolPath>$(ProjectDir)..\wix\3.11\</WixToolPath>
 	<WixTargetsPath>$(WixToolPath)\wix.targets</WixTargetsPath>
-	<WixTasksPath>wixtasks.dll</WixTasksPath>
+	<WixTasksPath>wixtasks.dll</WixTasksPath>-->
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>..\Bundle\</OutputPath>
@@ -76,7 +76,13 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(WixTargetsPath)"/>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+
+  <!--<Import Project="$(WixTargetsPath)"/>-->
   <PropertyGroup>
     <DefineConstants>ClientPath=..\..\..\eform-client; ApiPath=..\..\eformapi; LetsEncryptPath=..\..\..\eFormAPI\Installation\letsencrypt</DefineConstants>
   </PropertyGroup>