Additional build fixes

Fixed dependency issues introduced with library and merge module. Also moved to using $(WIX) environment variable to account for differing WiX installation locations.

Author: markgalvan-intel

IntelPresentMon/PMInstallerExtension/PMInstallerExtension.csproj

@@ -40,7 +40,7 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="wix">
-      <HintPath>C:\Program Files (x86)\WiX Toolset v3.11\bin\wix.dll</HintPath>
+      <HintPath>$(WIX)bin\wix.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj

@@ -8,23 +8,34 @@
     <!-- Point these at YOUR WiX 3.x install -->
     <WixToolPath>$(WIX)bin\</WixToolPath>
     <WixTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-    <!-- Define the two variables your .wxs uses -->
-    <DefineConstants>
-      PresentMonService.TargetFileName=PresentMonService.exe;
-      PresentMonService.TargetPath=$(SolutionDir)build\$(Configuration)\PresentMonService.exe;
-      PresentMonAPI2.TargetFileName=PresentMonAPI2.dll;
-      PresentMonAPI2.TargetPath=$(SolutionDir)build\$(Configuration)\PresentMonAPI2.dll
-    </DefineConstants>
     <!-- Optional: ask lit.exe to embed files into the .wixlib -->
     <BindFiles>true</BindFiles>
     <ProjectGuid>{6478f2f6-92ad-4b1c-a13e-c8cea9125152}</ProjectGuid>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Library.wxs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PresentMonAPI2\PresentMonAPI2.vcxproj">
+      <Name>PresentMonAPI2</Name>
+      <Project>{5ddba061-53a0-4835-8aaf-943f403f924f}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\PresentMonService\PresentMonService.vcxproj">
+      <Name>PresentMonService</Name>
+      <Project>{3a848e5b-a376-4a22-bbac-e9b3c01bd385}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
   <!-- Add WiX extensions here only if you actually use them in Library.wxs -->
   <!-- <ItemGroup>
     <WixExtension Include="WixUtilExtension" />
   </ItemGroup> -->
   <Import Project="$(WixTargetsPath)" />
-</Project>
+</Project>

PresentMon.sln

@@ -107,7 +107,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KernelProcess", "IntelPrese
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PMInstallerLib", "IntelPresentMon\PMInstallerLib\PMInstallerLib.wixproj", "{6478F2F6-92AD-4B1C-A13E-C8CEA9125152}"
 EndProject
-Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "ServiceMergeModule", "IntelPresentMon\ServiceMergeModule\ServiceMergeModule.wixproj", "{DC72C6B9-CA78-46C4-9962-E927B7A8D607}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ServiceMergeModule", "IntelPresentMon\ServiceMergeModule\ServiceMergeModule.wixproj", "{DC72C6B9-CA78-46C4-9962-E927B7A8D607}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -456,7 +456,6 @@ Global
 		{8524C555-B172-46EF-BE42-7B7B7BB102E4}.Release-EDSS-MSI|x64.ActiveCfg = Release|x64
 		{8524C555-B172-46EF-BE42-7B7B7BB102E4}.Release-EDSS-MSI|x86.ActiveCfg = Release|x64
 		{6478F2F6-92AD-4B1C-A13E-C8CEA9125152}.Debug|x64.ActiveCfg = Debug|x86
-		{6478F2F6-92AD-4B1C-A13E-C8CEA9125152}.Debug|x64.Build.0 = Debug|x86
 		{6478F2F6-92AD-4B1C-A13E-C8CEA9125152}.Debug|x86.ActiveCfg = Debug|x86
 		{6478F2F6-92AD-4B1C-A13E-C8CEA9125152}.Debug|x86.Build.0 = Debug|x86
 		{6478F2F6-92AD-4B1C-A13E-C8CEA9125152}.Release|x64.ActiveCfg = Release|x86
@@ -472,7 +471,6 @@ Global
 		{6478F2F6-92AD-4B1C-A13E-C8CEA9125152}.Release-EDSS-MSI|x86.ActiveCfg = Release|x86
 		{6478F2F6-92AD-4B1C-A13E-C8CEA9125152}.Release-EDSS-MSI|x86.Build.0 = Release|x86
 		{DC72C6B9-CA78-46C4-9962-E927B7A8D607}.Debug|x64.ActiveCfg = Debug|x86
-		{DC72C6B9-CA78-46C4-9962-E927B7A8D607}.Debug|x64.Build.0 = Debug|x86
 		{DC72C6B9-CA78-46C4-9962-E927B7A8D607}.Debug|x86.ActiveCfg = Debug|x86
 		{DC72C6B9-CA78-46C4-9962-E927B7A8D607}.Debug|x86.Build.0 = Debug|x86
 		{DC72C6B9-CA78-46C4-9962-E927B7A8D607}.Release|x64.ActiveCfg = Release|x86