WixToolset.Heat (5.0.2) - Duplicate components for files in different subdirectories and same filename

[kuch3n]

Hi,
a .NET project depends on a NuGet which copies native library assets with following structure into the output directory

.nuget\packages\package\version\ref\win-x86\native\library.dll --> Win32/library.dll
.nuget\packages\package\version\ref\win-x86\native\library.pdb -->Win32/library.pdb
.nuget\packages\package\version\ref\win-x64\native\library.dll -->x64/library.dll
.nuget\packages\package\version\ref\win-x64\native\library.dll -->x64/library.pdb

Now HarvestProject generates a .wxs with dupplicated Components:

<Fragment>
        <ComponentGroup Id="Project.Content">
            <ComponentRef Id="Project.Content.library.dll" />
            <ComponentRef Id="Project.Content.library.pdb" />
            <ComponentRef Id="Project.Content.library.dll" />
            <ComponentRef Id="Project.Content.library.pdb" />
        </ComponentGroup>
    </Fragment>

Renaming library.dll to library_x86.dll and library_x64.dll isn't possible, since the dll filename for DLLImport must be known at compile time. To load either dll at runtime, set the dll search directory (PInvoke.SetDllDirectory(Path.Combine(Environment.CurrentDirectory, "x64"));

Is there a way to avoid duplicated component entries like above?