Fix Condition authoring.
Bob Arnson committed
Sep 2, 2020 at 14:36 UTC
2d71bd9f4379a1605347581c7cdd271315cd94f7
4 files changed
+40
-28
DirectX.wixext.sln
+2
-2
@@ -1,7 +1,7 @@
1
2
Microsoft Visual Studio Solution File, Format Version 12.00
3
-# Visual Studio 15
4
-VisualStudioVersion = 15.0.28010.2016
3
+# Visual Studio Version 16
4
+VisualStudioVersion = 16.0.30204.135
5
MinimumVisualStudioVersion = 10.0.40219.1
6
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directxca", "src\ca\directxca.vcxproj", "{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}"
7
EndProject
src/ca/directxca.vcxproj
+33
-16
@@ -1,10 +1,9 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
-
3
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
<Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
5
<Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />
7
-
6
+
7
<ItemGroup Label="ProjectConfigurations">
8
<ProjectConfiguration Include="Debug|Win32">
9
<Configuration>Debug</Configuration>
@@ -14,43 +13,61 @@
13
<Configuration>Release</Configuration>
14
<Platform>Win32</Platform>
15
</ProjectConfiguration>
16
+ <ProjectConfiguration Include="Debug|x64">
17
+ <Configuration>Debug</Configuration>
18
+ <Platform>x64</Platform>
19
+ </ProjectConfiguration>
20
+ <ProjectConfiguration Include="Release|x64">
21
+ <Configuration>Release</Configuration>
22
+ <Platform>x64</Platform>
23
+ </ProjectConfiguration>
24
+ <ProjectConfiguration Include="Debug|ARM">
25
+ <Configuration>Debug</Configuration>
26
+ <Platform>ARM</Platform>
27
+ </ProjectConfiguration>
28
+ <ProjectConfiguration Include="Release|ARM">
29
+ <Configuration>Release</Configuration>
30
+ <Platform>ARM</Platform>
31
+ </ProjectConfiguration>
32
+ <ProjectConfiguration Include="Debug|ARM64">
33
+ <Configuration>Debug</Configuration>
34
+ <Platform>ARM64</Platform>
35
+ </ProjectConfiguration>
36
+ <ProjectConfiguration Include="Release|ARM64">
37
+ <Configuration>Release</Configuration>
38
+ <Platform>ARM64</Platform>
39
+ </ProjectConfiguration>
40
</ItemGroup>
18
-
41
+
42
<PropertyGroup Label="Globals">
43
<ProjectGuid>{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}</ProjectGuid>
44
<ConfigurationType>DynamicLibrary</ConfigurationType>
22
- <PlatformToolset>v141</PlatformToolset>
45
+ <PlatformToolset>v142</PlatformToolset>
46
<CharacterSet>Unicode</CharacterSet>
47
<TargetName>directxca</TargetName>
48
<ProjectModuleDefinitionFile>directx.def</ProjectModuleDefinitionFile>
49
<Description>WiX Toolset DirectX CustomAction</Description>
50
</PropertyGroup>
28
-
51
+
52
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
53
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31
-
54
+
55
<PropertyGroup>
56
<ProjectAdditionalLinkLibraries>d3d9.lib;msi.lib</ProjectAdditionalLinkLibraries>
57
</PropertyGroup>
35
-
58
+
59
<ItemGroup>
60
<ClCompile Include="directx.cpp" />
61
<ClCompile Include="dllmain.cpp">
62
<PrecompiledHeader>Create</PrecompiledHeader>
63
</ClCompile>
41
- </ItemGroup>
42
-
43
- <ItemGroup>
64
<ClInclude Include="precomp.h" />
45
- </ItemGroup>
46
-
47
- <ItemGroup>
65
<None Include="directx.def" />
66
<None Include="packages.config" />
67
</ItemGroup>
51
-
68
+
69
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
53
-
70
+
71
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
72
<PropertyGroup>
73
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
@@ -58,4 +75,4 @@
75
<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
76
<Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" />
77
</Target>
61
-</Project>
78
+</Project>
\ No newline at end of file
src/wixlib/DirectXExtension.wxs
+3
-4
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
1
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,11 +13,11 @@
13
<CustomAction Id="WixQueryDirectXCaps" BinaryKey="DirectXCA" DllEntry="WixQueryDirectXCaps" Return="ignore" />
14
15
<InstallUISequence>
17
- <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes">VersionNT > 400</Custom>
16
+ <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes" Condition="VersionNT > 400" />
17
</InstallUISequence>
18
19
<InstallExecuteSequence>
21
- <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes">VersionNT > 400</Custom>
20
+ <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes" Condition="VersionNT > 400" />
21
</InstallExecuteSequence>
22
</Fragment>
23
src/wixlib/directx.wixproj
+2
-6
@@ -1,17 +1,13 @@
1
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
-<Project Sdk="WixToolset.Sdk">
3
-
2
+<Project Sdk="WixToolset.Sdk" ToolsVersion="4.0">
3
<PropertyGroup>
4
<OutputType>Library</OutputType>
5
<BindFiles>true</BindFiles>
6
</PropertyGroup>
8
-
7
<ItemGroup>
8
<ProjectReference Include="..\ca\directxca.vcxproj" />
9
</ItemGroup>
12
-
10
<ItemGroup>
11
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
12
</ItemGroup>
16
-
17
-</Project>
13
+</Project>
\ No newline at end of file