* Revive #48505

Revive https://github.com/dotnet/runtime/pull/48505 and try to find out why the change caused official builds to break.

* Use OutputRid when creating .nupkgs, instead of PackageRID
Co-authored-by: NAdeel Mujahid <3840695+am11@users.noreply.github.com>