I was able to get the packaging working using the following two solutions:
<AppxBundle>Never</AppxBundle>
<GenerateAppxPackageOnBuild>false</GenerateAppxPackageOnBuild>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
This stopped generating the separate package for UWP.
<AppxPackageName>NameOfApp_$(CustomVersion)</AppxPackageName>
and then passed the custom version while calling the build script.