Simple fix: was only adding packages from the build plan, not from the core libraries list. Most of the annoyance in the patch is just dealing with the multiple PackageName and Version types.