Wix v4: Shortcut element working directory behavior

[jcasale]

Hi,
In Wix v3 I used to be able to set the Shortcut WorkingDirectory attribute to a literal string as follows:

<Property Id="HomeDrivePath" Value="%HOMEDRIVE%%HOMEPATH%" />

<DirectoryRef Id="DesktopFolder">
  <Component Id="DesktopShortcutsComponent" Guid="*">
    <Shortcut Id="..."
                Name="..."
                Description="...."
                Target="[INSTALLDIR]program.exe"
                WorkingDirectory="HomeDrivePath" />
</DirectoryRef>

This now results in the following error in Wix v4:

error WIX0094: The identifier 'Directory:HomeDrivePath' could not be found.
Ensure you have typed the reference correctly and that all the necessary inputs are provided to the linker.

According to the documentation at https://wixtoolset.org/docs/schema/wxs/shortcut the value must be a directory identifier or a property that refers to one.

Converting the property to a directory looks correct inside Orca (the directory table contains the two environment variables, but the installation is not correct and the value gets substituted with incorrect ones (C:\C:\Users\jcasale\) when installed:

<Fragment>
  <Directory Id="HomeDrivePath" Name="%HOMEDRIVE%%HOMEPATH%" />
</Fragment>

Any idea how to resolve this?

Thanks.