aboutsummaryrefslogtreecommitdiff
path: root/src/ext/DifxApp/wixlib
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2022-11-15 18:04:38 -0500
committerBob Arnson <github@bobs.org>2022-11-16 17:06:22 -0500
commit83d390b8fa44c9d064afa5a79c429505da34f834 (patch)
tree8121cf54967cc5436dad57a8e0f556d481cbc398 /src/ext/DifxApp/wixlib
parentd14c02d4ca6ee820b7111b789d9f904e0fd52804 (diff)
downloadwix-83d390b8fa44c9d064afa5a79c429505da34f834.tar.gz
wix-83d390b8fa44c9d064afa5a79c429505da34f834.tar.bz2
wix-83d390b8fa44c9d064afa5a79c429505da34f834.zip
Go back to separate .wixlibs for DifxApp.
Fixes https://github.com/wixtoolset/issues/issues/7015.
Diffstat (limited to 'src/ext/DifxApp/wixlib')
-rw-r--r--src/ext/DifxApp/wixlib/DifxAppExtension.wxs20
-rw-r--r--src/ext/DifxApp/wixlib/DifxAppExtension_Platform.wxi22
-rw-r--r--src/ext/DifxApp/wixlib/DifxAppExtension_x64.wxs8
-rw-r--r--src/ext/DifxApp/wixlib/DifxAppExtension_x86.wxs8
-rw-r--r--src/ext/DifxApp/wixlib/caSuffix.wxi28
-rw-r--r--src/ext/DifxApp/wixlib/difxapp.wixproj1
6 files changed, 21 insertions, 66 deletions
diff --git a/src/ext/DifxApp/wixlib/DifxAppExtension.wxs b/src/ext/DifxApp/wixlib/DifxAppExtension.wxs
new file mode 100644
index 00000000..430c604b
--- /dev/null
+++ b/src/ext/DifxApp/wixlib/DifxAppExtension.wxs
@@ -0,0 +1,20 @@
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">
5 <Fragment>
6 <InstallExecuteSequence>
7 <Custom Action="MsiProcessDrivers" After="InstallFiles" Condition="VersionNT &gt; 400" />
8 <Custom Action="MsiCleanupOnSuccess" After="InstallFinalize" Condition="VersionNT &gt; 400" />
9 </InstallExecuteSequence>
10
11 <Binary Id="DIFxApp$(var.Platform)" SourceFile="$(var.Platform)\DIFxApp.dll" />
12 <Binary Id="DIFxAppA$(var.Platform)" SourceFile="$(var.Platform)\DIFxAppA.dll" />
13
14 <CustomAction Id="MsiProcessDrivers" DllEntry="ProcessDriverPackages" SuppressModularization="yes" Execute="immediate" BinaryRef="DIFxApp$(var.Platform)" />
15 <CustomAction Id="MsiInstallDrivers" DllEntry="InstallDriverPackages" SuppressModularization="yes" Execute="deferred" Impersonate="no" BinaryRef="DIFxAppA$(var.Platform)" />
16 <CustomAction Id="MsiUninstallDrivers" DllEntry="UninstallDriverPackages" SuppressModularization="yes" Execute="deferred" Impersonate="no" BinaryRef="DIFxAppA$(var.Platform)" />
17 <CustomAction Id="MsiRollbackInstall" DllEntry="RollbackInstall" SuppressModularization="yes" Execute="rollback" Impersonate="no" BinaryRef="DIFxAppA$(var.Platform)" />
18 <CustomAction Id="MsiCleanupOnSuccess" DllEntry="CleanupOnSuccess" SuppressModularization="yes" Execute="immediate" BinaryRef="DIFxApp$(var.Platform)" />
19 </Fragment>
20</Wix>
diff --git a/src/ext/DifxApp/wixlib/DifxAppExtension_Platform.wxi b/src/ext/DifxApp/wixlib/DifxAppExtension_Platform.wxi
deleted file mode 100644
index b8d613c9..00000000
--- a/src/ext/DifxApp/wixlib/DifxAppExtension_Platform.wxi
+++ /dev/null
@@ -1,22 +0,0 @@
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<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include caSuffix.wxi ?>
6
7 <Fragment>
8 <InstallExecuteSequence>
9 <Custom Action="MsiProcessDrivers" After="InstallFiles" Condition="VersionNT &gt; 400" />
10 <Custom Action="MsiCleanupOnSuccess" After="InstallFinalize" Condition="VersionNT &gt; 400" />
11 </InstallExecuteSequence>
12
13 <Binary Id="DIFxApp.dll$(var.Suffix)" SourceFile="$(var.platform)\DIFxApp.dll" />
14 <Binary Id="DIFxAppA.dll$(var.Suffix)" SourceFile="$(var.platform)\DIFxAppA.dll" />
15
16 <CustomAction Id="MsiProcessDrivers$(var.Suffix)" DllEntry="ProcessDriverPackages" SuppressModularization="yes" Execute="immediate" BinaryRef="DIFxApp.dll$(var.Suffix)" />
17 <CustomAction Id="MsiInstallDrivers$(var.Suffix)" DllEntry="InstallDriverPackages" SuppressModularization="yes" Execute="deferred" Impersonate="no" BinaryRef="DIFxAppA.dll$(var.Suffix)" />
18 <CustomAction Id="MsiUninstallDrivers$(var.Suffix)" DllEntry="UninstallDriverPackages" SuppressModularization="yes" Execute="deferred" Impersonate="no" BinaryRef="DIFxAppA.dll$(var.Suffix)" />
19 <CustomAction Id="MsiRollbackInstall$(var.Suffix)" DllEntry="RollbackInstall" SuppressModularization="yes" Execute="rollback" Impersonate="no" BinaryRef="DIFxAppA.dll$(var.Suffix)" />
20 <CustomAction Id="MsiCleanupOnSuccess$(var.Suffix)" DllEntry="CleanupOnSuccess" SuppressModularization="yes" Execute="immediate" BinaryRef="DIFxApp.dll$(var.Suffix)" />
21 </Fragment>
22</Include>
diff --git a/src/ext/DifxApp/wixlib/DifxAppExtension_x64.wxs b/src/ext/DifxApp/wixlib/DifxAppExtension_x64.wxs
deleted file mode 100644
index 3c534363..00000000
--- a/src/ext/DifxApp/wixlib/DifxAppExtension_x64.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
1<?xml version="1.0"?>
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
4
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <?define platform=x64 ?>
7 <?include DifxAppExtension_Platform.wxi ?>
8</Wix>
diff --git a/src/ext/DifxApp/wixlib/DifxAppExtension_x86.wxs b/src/ext/DifxApp/wixlib/DifxAppExtension_x86.wxs
deleted file mode 100644
index d352a272..00000000
--- a/src/ext/DifxApp/wixlib/DifxAppExtension_x86.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
1<?xml version="1.0"?>
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
4
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <?define platform=x86 ?>
7 <?include DifxAppExtension_Platform.wxi ?>
8</Wix>
diff --git a/src/ext/DifxApp/wixlib/caSuffix.wxi b/src/ext/DifxApp/wixlib/caSuffix.wxi
deleted file mode 100644
index a56a2393..00000000
--- a/src/ext/DifxApp/wixlib/caSuffix.wxi
+++ /dev/null
@@ -1,28 +0,0 @@
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
4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?ifndef platform ?>
6 <?error Required value "platform" not defined in include caSuffix.wxi ?>
7 <?endif ?>
8
9 <?ifdef Suffix ?>
10 <?undef Suffix ?>
11 <?undef DeferredSuffix ?>
12 <?endif ?>
13
14 <?if $(var.platform)="x86" ?>
15 <?define Suffix="" ?>
16 <?define DeferredSuffix="" ?>
17 <?endif ?>
18
19 <?if $(var.platform)="x64" ?>
20 <?define Suffix="_x64" ?>
21 <?define DeferredSuffix="_64" ?>
22 <?endif ?>
23
24 <?if $(var.platform)="arm" ?>
25 <?define Suffix="_ARM" ?>
26 <?define DeferredSuffix="_ARM" ?>
27 <?endif ?>
28</Include>
diff --git a/src/ext/DifxApp/wixlib/difxapp.wixproj b/src/ext/DifxApp/wixlib/difxapp.wixproj
index 62e7cb3e..b32ceac5 100644
--- a/src/ext/DifxApp/wixlib/difxapp.wixproj
+++ b/src/ext/DifxApp/wixlib/difxapp.wixproj
@@ -1,6 +1,7 @@
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">
3 <PropertyGroup> 3 <PropertyGroup>
4 <OutputName>difxapp_$(Platform)</OutputName>
4 <OutputType>Library</OutputType> 5 <OutputType>Library</OutputType>
5 <BindFiles>true</BindFiles> 6 <BindFiles>true</BindFiles>
6 <Cultures>en-us</Cultures> 7 <Cultures>en-us</Cultures>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-11 06:19:07 +0000