[msbuild] Copy files to be signed into the correct directory for Hot Restart. Fixes #19278. #19302
Conversation
…Restart. Fixes xamarin#19278. 1. Move the signing to after we copy files that must be signed into the app bundle that will be signed: we sign in the _CodesignHotRestartAppBundle target, so this means the targets _CopyHotRestartBundleResources and _CopyFilesToHotRestartSignedAppDirContents must execute first. 2. Try to clear up some confusion about the directories involved. The HotRestartSignedAppOutputDir property indicates the location of the _signed_ app bundle, which means no files should be added there. Instead files that should be signed (or present when the app launches) must be placed in the HotRestartAppBundlePath directory. 3. Document each property involved to try to avoid more mistakes in the future. Fixes xamarin#19278.
|
Thanks for documenting the properties, @rolfbjarne! |
| _CopyHotRestartBundleResources; | ||
| _CopyFilesToHotRestartSignedAppDirContents; | ||
| _CodesignHotRestartAppBundle; |
There was a problem hiding this comment.
I remember I had to change the order of that target because it was causing unwanted behaviors. I don't know if you checked that as part of this changes. There are more comments in my PR: 495ebc9
The related ones are:
- Ensure the _CodesignHotRestartAppBundle target is executed before the copy of the content files and not after: Hot Restart content files doesn't affect the code signing, so they don't need to be copied before the signing process. Copying the content files before the code sign was causing unwanted behaviors and errors since the code sign logic will try to clear the signing folder before the execution, to avoid mixing old and new content
There was a problem hiding this comment.
@mauroa I checked your changes, and now we're signing in the middle of copying files: files that must be signed are copied, then we sign, then content files are copied: https://github.com/rolfbjarne/xamarin-macios/blob/3a2860296c2fc742f16c3d3a42e3fc0e1ee6c7df/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.HotRestart.targets#L249-L253
That's the intention at least - but how do I test that your scenario still works?
There was a problem hiding this comment.
Right, I didn't realize the order was not exactly the same as the one before my changes. My bad I didn't add the bug link to my PR, I'll see If I can track it somehow
There was a problem hiding this comment.
@mauroa were you able to find the bug link?
| _CopyHotRestartBundleResources; | ||
| _CopyFilesToHotRestartSignedAppDirContents; | ||
| _CodesignHotRestartAppBundle; |
There was a problem hiding this comment.
Right, I didn't realize the order was not exactly the same as the one before my changes. My bad I didn't add the bug link to my PR, I'll see If I can track it somehow
💻 [PR Build] Tests on macOS M1 - Mac Ventura (13.0) passed 💻✅ All tests on macOS M1 - Mac Ventura (13.0) passed. Pipeline on Agent |
💻 [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) passed 💻✅ All tests on macOS M1 - Mac Big Sur (11.5) passed. Pipeline on Agent |
💻 [CI Build] Windows Integration Tests passed 💻✅ All Windows Integration Tests passed. Pipeline on Agent |
📚 [PR Build] Artifacts 📚Artifacts were not provided. Pipeline on Agent |
✅ API diff for current PR / commitLegacy Xamarin (No breaking changes)
NET (empty diffs)
✅ API diff vs stableLegacy Xamarin (No breaking changes).NET (No breaking changes)ℹ️ Generator diffGenerator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes) Pipeline on Agent |
This comment has been minimized.
This comment has been minimized.
🚀 [CI Build] Test results 🚀Test results✅ All tests passed on VSTS: simulator tests. 🎉 All 235 tests passed 🎉 Tests counts✅ bcl: All 69 tests passed. [attempt 2] Html Report (VSDrops) Download Pipeline on Agent |
📚 [PR Build] Artifacts 📚Packages generatedView packagesPipeline on Agent |
|
/sudo backport release/8.0.1xx |
|
Backport Job to branch release/8.0.1xx Created! The magic is happening here |
|
Hooray! Backport succeeded! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=8590474 for more details. |
…directory for Hot Restart. Fixes #19278. (#19335) 1. Move the signing to after we copy files that must be signed into the app bundle that will be signed: we sign in the _CodesignHotRestartAppBundle target, so this means the targets _CopyHotRestartBundleResources and _CopyFilesToHotRestartSignedAppDirContents must execute first. 2. Try to clear up some confusion about the directories involved. The HotRestartSignedAppOutputDir property indicates the location of the _signed_ app bundle, which means no files should be added there. Instead files that should be signed (or present when the app launches) must be placed in the HotRestartAppBundlePath directory. 3. Document each property involved to try to avoid more mistakes in the future. Fixes #19278. Backport of #19302 Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Move the signing to after we copy files that must be signed into the app bundle
that will be signed: we sign in the _CodesignHotRestartAppBundle target, so this
means the targets _CopyHotRestartBundleResources and _CopyFilesToHotRestartSignedAppDirContents
must execute first.
Try to clear up some confusion about the directories involved. The HotRestartSignedAppOutputDir
property indicates the location of the signed app bundle, which means no files
should be added there. Instead files that should be signed (or present when the
app launches) must be placed in the HotRestartAppBundlePath directory.
Document each property involved to try to avoid more mistakes in the future.
Fixes #19278.