pac solution unpack does not extract serviceplans properly

[iggsn]

Describe the bug
I am using the unpack feature in my Azure DevOps pipeline.
The solution is activated for AppSource and contains serviceplans.

The xml files for serviceplans are not properly processed and will not be able to be imported after unpack and repack.

To Reproduce
add serviceplans to solution
unpack with DevOps Task
pack with DevOps Task
Xml is broken after unpack via DevOps task

I need to readd manually the serviceplans

Expected behavior
solution pac is respecting the serviceplans

However after exporting the solution and using unpack in the pipeline, parts of the "ServicePlanAppModule.xml" gets removed.
It looks like the unpack does not yet support the extraction of the "appmoduleid".

The unpack adds them as attributes to the servicplanappmodules node.
However they have to become seperate subnodes.

unpack result:

expected result:

See discussion here: https://github.com/microsoft/powerplatform-build-tools/discussions?discussions_q=is%3Aopen+serviceplan