aboutsummaryrefslogtreecommitdiff
path: root/src/ext/DirectX
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-12-19 12:09:04 -0800
committerRob Mensching <rob@firegiant.com>2021-12-30 12:51:23 -0800
commit0aee408e0b07b92d90ede67800616f7f278a3dc4 (patch)
tree33eba852b65ba11392898bc3f2f4114b12964e01 /src/ext/DirectX
parent91259637be1eccd149093eb49c7ff68826d1d331 (diff)
downloadwix-0aee408e0b07b92d90ede67800616f7f278a3dc4.tar.gz
wix-0aee408e0b07b92d90ede67800616f7f278a3dc4.tar.bz2
wix-0aee408e0b07b92d90ede67800616f7f278a3dc4.zip
Simplify and normalize ext projects
Now that wix.targets is more compatible with MS.Common.targets the extension projects can be simplified. Also made their project files more consistent with each other.
Diffstat (limited to 'src/ext/DirectX')
-rw-r--r--src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
index 4a5a398e..94a3f400 100644
--- a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
+++ b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
@@ -7,21 +7,19 @@
7 <RootNamespace>WixToolset.DirectX</RootNamespace> 7 <RootNamespace>WixToolset.DirectX</RootNamespace>
8 <Description>WiX Toolset DirectX Extension</Description> 8 <Description>WiX Toolset DirectX Extension</Description>
9 <Title>WiX Toolset DirectX Extension</Title> 9 <Title>WiX Toolset DirectX Extension</Title>
10 <IsTool>true</IsTool> 10 <DebugType>embedded</DebugType>
11 <ContentTargetFolders>build</ContentTargetFolders> 11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="$(MSBuildThisFileName).targets" />
16 <EmbeddedResource Include="$(OutputPath)..\directx.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\directx.wixlib" />
17 </ItemGroup> 16 </ItemGroup>
18 17
19 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
20 <PackageReference Include="WixToolset.Data" PrivateAssets="All" /> 19 <ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" />
22 </ItemGroup> 20 </ItemGroup>
23 21
24 <ItemGroup> 22 <ItemGroup>
25 <ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
26 </ItemGroup> 24 </ItemGroup>
27</Project> 25</Project>