diff options
| author | Bob Arnson <bob@firegiant.com> | 2022-02-10 00:38:43 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2022-02-10 13:17:31 -0500 |
| commit | 091573d459d6ab4947bd39bd3bc8faee3d18b4fc (patch) | |
| tree | 88bf9f32b63ad7173189ced351129d41596dd043 /src/ext/NetFx | |
| parent | 652719fc9d4a6afc9fb016d2d379a04c0bf40e04 (diff) | |
| download | wix-091573d459d6ab4947bd39bd3bc8faee3d18b4fc.tar.gz wix-091573d459d6ab4947bd39bd3bc8faee3d18b4fc.tar.bz2 wix-091573d459d6ab4947bd39bd3bc8faee3d18b4fc.zip | |
Central caDecor and caErr.
Diffstat (limited to 'src/ext/NetFx')
| -rw-r--r-- | src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi | 3 | ||||
| -rw-r--r-- | src/ext/NetFx/wixlib/caDecor.wxi | 39 |
2 files changed, 1 insertions, 41 deletions
diff --git a/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi b/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi index 7bd727c5..f607c72d 100644 --- a/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi +++ b/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi | |||
| @@ -2,8 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 5 | 5 | <?include ..\..\caDecor.wxi ?> | |
| 6 | <?include caDecor.wxi ?> | ||
| 7 | 6 | ||
| 8 | <Fragment> | 7 | <Fragment> |
| 9 | <CustomAction Id="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" DllEntry="SchedNetFx" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" /> | 8 | <CustomAction Id="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" DllEntry="SchedNetFx" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" /> |
diff --git a/src/ext/NetFx/wixlib/caDecor.wxi b/src/ext/NetFx/wixlib/caDecor.wxi deleted file mode 100644 index b1711518..00000000 --- a/src/ext/NetFx/wixlib/caDecor.wxi +++ /dev/null | |||
| @@ -1,39 +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 | <?ifdef Prefix ?> | ||
| 6 | <?undef Prefix ?> | ||
| 7 | <?endif?> | ||
| 8 | |||
| 9 | <?define Prefix="Wix4" ?> | ||
| 10 | |||
| 11 | <?ifndef platform ?> | ||
| 12 | <?define platform="x86" ?> | ||
| 13 | <?endif?> | ||
| 14 | |||
| 15 | <?if $(var.platform)="" ?> | ||
| 16 | <?undef platform ?> | ||
| 17 | <?define platform="x86" ?> | ||
| 18 | <?endif?> | ||
| 19 | |||
| 20 | <?ifdef Suffix ?> | ||
| 21 | <?undef Suffix ?> | ||
| 22 | <?endif?> | ||
| 23 | |||
| 24 | <?if $(var.platform)~="x86" ?> | ||
| 25 | <?define Suffix="_X86" ?> | ||
| 26 | <?endif?> | ||
| 27 | |||
| 28 | <?if $(var.platform)~="x64" ?> | ||
| 29 | <?define Suffix="_X64" ?> | ||
| 30 | <?endif?> | ||
| 31 | |||
| 32 | <?if $(var.platform)~="arm" ?> | ||
| 33 | <?define Suffix="_A32" ?> | ||
| 34 | <?endif?> | ||
| 35 | |||
| 36 | <?if $(var.platform)~="arm64" ?> | ||
| 37 | <?define Suffix="_A64" ?> | ||
| 38 | <?endif?> | ||
| 39 | </Include> | ||