WiX: Preserve on major upgrade, remove on uninstall

I have defined a component to cleanup a generated (not installed) file on uninstall but leave intact on a major upgrade after reading this post

<Component Id="C_RemoveOnUninstall" Guid="XXX">
  <RemoveFile Id="DeleteGeneratedFile" Name="ProgramGeneratedFile" On="uninstall"/>
  <Condition>REMOVE="ALL" AND NOT UPGRADINGPRODUCTCODE</Condition>
</Component>

With condition above, the file is left behind for both upgrade and uninstall. Without the condition, the file is deleted for both upgrade an开发者_C百科d uinstall.

I have tried RemoveFile for each of On="install/uninstall/both" but it does not seem to matter. Have read this post but I am hoping to make component conditions work and avoid writing custom action for this.

Does this code look correct? Any solutions or work around?

This approach assumes the RemoveFiles action ignores an item in the RemoveFile table when the property DirProperty referrers to has a value of null. The property DirProperty referrers to will be set during uninstall though not during an upgrade.

Conditionally set the property:

<SetProperty Id="prop_GeneratedFileDir" Value="[GeneratedFileDir]" After="InstallInitialize" Sequence="execute">
  REMOVE="ALL" AND NOT UPGRADINGPRODUCTCODE
</SetProperty>

Define an element for the RemoveFile table:

<Component Id="C_RemoveOnUninstall" Guid="XXX">
  <RemoveFile Id="DeleteGeneratedFile" Property="prop_GeneratedFileDir" Name="ProgramGeneratedFile" On="uninstall"/>
  <CreateFolder/>
</Component>

Some helpful links: wix-users, RemoveFile Table, RemoveFile Element, RemoveFolderEx Element