Fix CustomActionData names.

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

Also:

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

3 files changed, 5 insertions, 19 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 @@
-#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/NetFx/ca/netfxca.cpp b/src/ext/NetFx/ca/netfxca.cpp
index cd086c53..57eb96b1 100644
--- a/src/ext/NetFx/ca/netfxca.cpp
+++ b/src/ext/NetFx/ca/netfxca.cpp
@@ -795,24 +795,23 @@ extern "C" UINT __stdcall SchedNetFx(
     // Schedule the install custom action
     if (pwzInstallCustomActionData && *pwzInstallCustomActionData)
     {
-        hr = WcaSetProperty(L"NetFxExecuteNativeImageInstall", pwzInstallCustomActionData);
+        hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"NetFxExecuteNativeImageInstall"), pwzInstallCustomActionData);
         ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageInstall action");
 
-        hr = WcaSetProperty(L"NetFxExecuteNativeImageCommitInstall", pwzInstallCustomActionData);
+        hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"NetFxExecuteNativeImageCommitInstall"), pwzInstallCustomActionData);
         ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageCommitInstall action");
     }
 
     // Schedule the uninstall custom action
     if (pwzUninstallCustomActionData && *pwzUninstallCustomActionData)
     {
-        hr = WcaSetProperty(L"NetFxExecuteNativeImageUninstall", pwzUninstallCustomActionData);
+        hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"NetFxExecuteNativeImageUninstall"), pwzUninstallCustomActionData);
         ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageUninstall action");
 
-        hr = WcaSetProperty(L"NetFxExecuteNativeImageCommitUninstall", pwzUninstallCustomActionData);
+        hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"NetFxExecuteNativeImageCommitUninstall"), pwzUninstallCustomActionData);
         ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageCommitUninstall action");
     }
 
-
 LExit:
     ReleaseStr(pwzInstallCustomActionData);
     ReleaseStr(pwzUninstallCustomActionData);
diff --git a/src/ext/NetFx/ca/precomp.h b/src/ext/NetFx/ca/precomp.h
index db618bce..aa90be4f 100644
--- a/src/ext/NetFx/ca/precomp.h
+++ b/src/ext/NetFx/ca/precomp.h
@@ -14,5 +14,5 @@
 #include "dirutil.h"
 #include "guidutil.h"
 
-#include "caDecor.h"
+#include "..\..\caDecor.h"
 #include "cost.h"