diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-09-02 14:36:37 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-09-02 14:38:25 -0400 |
| commit | 2d71bd9f4379a1605347581c7cdd271315cd94f7 (patch) | |
| tree | 407aa68b9af459c493bc1f783b4210103a55f955 /src/wixlib | |
| parent | d02ccdc0bd962289d59d83497e19a31b974c9631 (diff) | |
| download | wix-2d71bd9f4379a1605347581c7cdd271315cd94f7.tar.gz wix-2d71bd9f4379a1605347581c7cdd271315cd94f7.tar.bz2 wix-2d71bd9f4379a1605347581c7cdd271315cd94f7.zip | |
Fix Condition authoring.
Diffstat (limited to 'src/wixlib')
| -rw-r--r-- | src/wixlib/DirectXExtension.wxs | 7 | ||||
| -rw-r--r-- | src/wixlib/directx.wixproj | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/wixlib/DirectXExtension.wxs b/src/wixlib/DirectXExtension.wxs index 12a8bbb6..2e7ff31a 100644 --- a/src/wixlib/DirectXExtension.wxs +++ b/src/wixlib/DirectXExtension.wxs | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 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 | <!-- 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 | 2 | ||
| 4 | 3 | ||
| 5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| @@ -14,11 +13,11 @@ | |||
| 14 | <CustomAction Id="WixQueryDirectXCaps" BinaryKey="DirectXCA" DllEntry="WixQueryDirectXCaps" Return="ignore" /> | 13 | <CustomAction Id="WixQueryDirectXCaps" BinaryKey="DirectXCA" DllEntry="WixQueryDirectXCaps" Return="ignore" /> |
| 15 | 14 | ||
| 16 | <InstallUISequence> | 15 | <InstallUISequence> |
| 17 | <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes">VersionNT > 400</Custom> | 16 | <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes" Condition="VersionNT > 400" /> |
| 18 | </InstallUISequence> | 17 | </InstallUISequence> |
| 19 | 18 | ||
| 20 | <InstallExecuteSequence> | 19 | <InstallExecuteSequence> |
| 21 | <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes">VersionNT > 400</Custom> | 20 | <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes" Condition="VersionNT > 400" /> |
| 22 | </InstallExecuteSequence> | 21 | </InstallExecuteSequence> |
| 23 | </Fragment> | 22 | </Fragment> |
| 24 | 23 | ||
diff --git a/src/wixlib/directx.wixproj b/src/wixlib/directx.wixproj index 60e3215a..bdad24a4 100644 --- a/src/wixlib/directx.wixproj +++ b/src/wixlib/directx.wixproj | |||
| @@ -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. --> | 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"> | 2 | <Project Sdk="WixToolset.Sdk" ToolsVersion="4.0"> |
| 3 | |||
| 4 | <PropertyGroup> | 3 | <PropertyGroup> |
| 5 | <OutputType>Library</OutputType> | 4 | <OutputType>Library</OutputType> |
| 6 | <BindFiles>true</BindFiles> | 5 | <BindFiles>true</BindFiles> |
| 7 | </PropertyGroup> | 6 | </PropertyGroup> |
| 8 | |||
| 9 | <ItemGroup> | 7 | <ItemGroup> |
| 10 | <ProjectReference Include="..\ca\directxca.vcxproj" /> | 8 | <ProjectReference Include="..\ca\directxca.vcxproj" /> |
| 11 | </ItemGroup> | 9 | </ItemGroup> |
| 12 | |||
| 13 | <ItemGroup> | 10 | <ItemGroup> |
| 14 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> | 11 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> |
| 15 | </ItemGroup> | 12 | </ItemGroup> |
| 16 | 13 | </Project> \ No newline at end of file | |
| 17 | </Project> | ||