diff options
| author | Bob Arnson <bob@firegiant.com> | 2023-02-01 20:22:50 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2023-02-01 21:27:12 -0500 |
| commit | 77b1f6715534192ab143dd9109aacc50fc78e52a (patch) | |
| tree | bffa59d3206d56f683274be3ad6bad30f0731097 /src/ext/NetFx/ca/caDecor.h | |
| parent | 92d6c3255a72d14f40b25b4c94fa88e563a7092d (diff) | |
| download | wix-77b1f6715534192ab143dd9109aacc50fc78e52a.tar.gz wix-77b1f6715534192ab143dd9109aacc50fc78e52a.tar.bz2 wix-77b1f6715534192ab143dd9109aacc50fc78e52a.zip | |
Fix CustomActionData names.
Fixes https://github.com/wixtoolset/issues/issues/7189.
Also:
- Clean up duplicate caDecor.h.
- Clean up use of CUSTOM_ACTION_DECORATION.
Diffstat (limited to 'src/ext/NetFx/ca/caDecor.h')
| -rw-r--r-- | src/ext/NetFx/ca/caDecor.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/ext/NetFx/ca/caDecor.h b/src/ext/NetFx/ca/caDecor.h deleted file mode 100644 index da274650..00000000 --- a/src/ext/NetFx/ca/caDecor.h +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | #pragma once | ||
| 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 | #if defined(_M_ARM64) | ||
| 6 | #define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_A64" | ||
| 7 | #elif defined(_M_AMD64) | ||
| 8 | #define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X64" | ||
| 9 | #elif defined(_M_ARM) | ||
| 10 | #define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_ARM" | ||
| 11 | #else | ||
| 12 | #define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X86" | ||
| 13 | #endif | ||