Skip to content

Commit 90a4629

Browse files
authored
fix installer lib not loading in ide (#643)
1 parent 32d9e82 commit 90a4629

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ PresentData/PresentData.args.json
4747
# Make sure internal source isn't unintentionally committed to public repositories
4848
IntelPresentMon/PresentMonAPI2/Internal.h
4949

50+
# PMInstallerLib heat output (see PMInstallerLib.wixproj GenerateUciDistFragment)
51+
IntelPresentMon/PMInstallerLib/Generated/
52+
5053
# Reflector Tool
5154
Reflector/bin/**
5255
Reflector/obj/**
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
dist/
22
external/
3+
external-off/

‎IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4+
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
35
<!-- WiX 3.x library output -->
46
<OutputType>Library</OutputType>
57
<OutputName>PMInstallerLib</OutputName>
@@ -14,10 +16,12 @@
1416
<!-- Optional: ask lit.exe to embed files into the .wixlib -->
1517
<BindFiles>true</BindFiles>
1618
<ProjectGuid>{6478f2f6-92ad-4b1c-a13e-c8cea9125152}</ProjectGuid>
19+
<!-- Keep generated authoring under the project dir so Visual Studio can load the wixproj. -->
20+
<UciDistFragmentPath>Generated\UciDist.wxs</UciDistFragmentPath>
1721
</PropertyGroup>
1822
<ItemGroup>
1923
<Compile Include="Library.wxs" />
20-
<Compile Include="$(IntermediateOutputPath)\UciDist.wxs" />
24+
<Compile Include="$(UciDistFragmentPath)" />
2125
</ItemGroup>
2226
<ItemGroup>
2327
<ProjectReference Include="..\PresentMonAPI2\PresentMonAPI2.vcxproj">
@@ -38,8 +42,8 @@
3842
</ProjectReference>
3943
</ItemGroup>
4044
<Target Name="GenerateUciDistFragment" BeforeTargets="Compile">
41-
<MakeDir Directories="$(IntermediateOutputPath)" />
42-
<Exec Command="powershell -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\wix-uci-dist.ps1&quot; -UciSdkDir &quot;$(UciSdkDir)&quot; -OutPath &quot;$(IntermediateOutputPath)\UciDist.wxs&quot;" />
45+
<MakeDir Directories="$(MSBuildProjectDirectory)\Generated" />
46+
<Exec Command="powershell -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\wix-uci-dist.ps1&quot; -UciSdkDir &quot;$(UciSdkDir)&quot; -OutPath &quot;$(MSBuildProjectDirectory)\$(UciDistFragmentPath)&quot;" />
4347
</Target>
4448
<Import Project="$(WixTargetsPath)" />
4549
</Project>

0 commit comments

Comments
 (0)