Fix CustomActionData names.

Fixes https://github.com/wixtoolset/issues/issues/7189.

Also:

- Clean up duplicate caDecor.h.
- Clean up use of CUSTOM_ACTION_DECORATION.

2 files changed, 1 insertions, 14 deletions

diff --git a/src/ext/Sql/ca/caDecor.h b/src/ext/Sql/ca/caDecor.h
deleted file mode 100644
index da274650..00000000
--- a/src/ext/Sql/ca/caDecor.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-// 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.
-
-
-#if defined(_M_ARM64)
-#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_A64"
-#elif defined(_M_AMD64)
-#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X64"
-#elif defined(_M_ARM)
-#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_ARM"
-#else
-#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X86"
-#endif
diff --git a/src/ext/Sql/ca/precomp.h b/src/ext/Sql/ca/precomp.h
index e92abdc5..c18d3624 100644
--- a/src/ext/Sql/ca/precomp.h
+++ b/src/ext/Sql/ca/precomp.h
@@ -23,4 +23,4 @@
 #include "scacost.h"
 #include "scasqlstr.h"
 
-#include "caDecor.h"
+#include "..\..\caDecor.h"