Fix CustomActionData names.

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

Also:

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

1 files changed, 4 insertions, 5 deletions

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);