Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[msbuild] Fix ILStripping of resource assemblies on Windows. #18508

Merged
merged 1 commit into from
Jun 29, 2023
Merged

[msbuild] Fix ILStripping of resource assemblies on Windows. #18508

merged 1 commit into from
Jun 29, 2023

Conversation

rolfbjarne
Copy link
Member

Any assembly that's not already on the Mac must be copied there, so do that.
We detect if an assembly exist on the Mac by checking the file size of the
file on Windows: a 0-length file is an output file from an assembly that exist
on the Mac, otherwise it doesn't and must be copied.

Fixes #17009.
Fixes #14841.
Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1817898.

@rolfbjarne
[msbuild] Fix ILStripping of resource assemblies on Windows.
5727bef 
Any assembly that's not already on the Mac must be copied there, so do that.
We detect if an assembly exist on the Mac by checking the file size of the
file on Windows: a 0-length file is an output file from an assembly that exist
on the Mac, otherwise it doesn't and must be copied.

Fixes xamarin#17009.
Fixes xamarin#14841.
Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1817898.
@rolfbjarne rolfbjarne requested review from emaf and mauroa as code owners June 28, 2023 18:15
@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build] Windows Integration Tests passed 💻

✅ All Windows Integration Tests passed.

Pipeline on Agent
Hash: 5727bef29f579d714b751616f99610303f872d4b [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [PR Build] Tests on macOS M1 - Mac Ventura (13.0) passed 💻

✅ All tests on macOS M1 - Mac Ventura (13.0) passed.

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [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
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)
  • iOS (no change detected)
  • tvOS (no change detected)
  • watchOS (no change detected)
  • macOS (no change detected)
NET (empty diffs)
  • iOS: (empty diff detected)
  • tvOS: (empty diff detected)
  • MacCatalyst: (empty diff detected)
  • macOS: (empty diff detected)

✅ API diff vs stable

Legacy Xamarin (No breaking changes)
.NET (No breaking changes)
Legacy Xamarin (stable) vs .NET

✅ Generator diff

Generator diff is empty

Pipeline on Agent
Hash: 5727bef29f579d714b751616f99610303f872d4b [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2
Copy link
Collaborator

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: simulator tests.

🎉 All 235 tests passed 🎉

Tests counts

✅ bcl: All 69 tests passed. Html Report (VSDrops) Download
✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 7 tests passed. Html Report (VSDrops) Download
✅ install_source: All 1 tests passed. Html Report (VSDrops) Download
✅ introspection: All 8 tests passed. Html Report (VSDrops) Download
✅ linker: All 65 tests passed. Html Report (VSDrops) Download
✅ mac_binding_project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 12 tests passed. Html Report (VSDrops) Download
✅ monotouch: All 35 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 5727bef29f579d714b751616f99610303f872d4b [PR build]

@rolfbjarne rolfbjarne merged commit c7fa7ab into xamarin:main Jun 29, 2023
@rolfbjarne rolfbjarne deleted the issue-17009 branch June 29, 2023 09:04
@rolfbjarne
Copy link
Member Author

/sudo backport release/7.0.3xx

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Backport Job to branch release/7.0.3xx Created! The magic is happening here

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Oh no! Backport failed! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=7997700 for more details.

@rolfbjarne rolfbjarne mentioned this pull request Jun 29, 2023
Merged
rolfbjarne added a commit to rolfbjarne/xamarin-macios that referenced this pull request Jun 29, 2023
@rolfbjarne
[release/7.0.3xx] [msbuild] Fix ILStripping of resource assemblies on…
7e27252 
… Windows.

Any assembly that's not already on the Mac must be copied there, so do that.
We detect if an assembly exist on the Mac by checking the file size of the
file on Windows: a 0-length file is an output file from an assembly that exist
on the Mac, otherwise it doesn't and must be copied.

Fixes xamarin#17009.
Fixes xamarin#14841.
Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1817898.

Backport of xamarin#18508.
@rolfbjarne rolfbjarne mentioned this pull request Jun 30, 2023
Closed
dalexsoto pushed a commit that referenced this pull request Jun 30, 2023
@rolfbjarne
[release/7.0.3xx] [msbuild] Fix ILStripping of resource assemblies on…
43ae6c7 
… Windows. (#18511)

Any assembly that's not already on the Mac must be copied there, so do
that.
We detect if an assembly exist on the Mac by checking the file size of
the
file on Windows: a 0-length file is an output file from an assembly that
exist
on the Mac, otherwise it doesn't and must be copied.

Fixes #17009.
Fixes #14841.
Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1817898.

Backport of #18508.
@dalexsoto
Copy link
Member

/sudo backport release/8.0.1xx-preview6

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Backport Job to branch release/8.0.1xx-preview6 Created! The magic is happening here

Closed
@vs-mobiletools-engineering-service2
Copy link
Collaborator

Hooray! Backport succeeded! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=8004741 for more details.

dalexsoto added a commit that referenced this pull request Jul 23, 2023
@dalexsoto
Revert "[msbuild] Fix ILStripping of resource assemblies on Windows. (#…
4a91c83 
…18508)"

This reverts commit c7fa7ab.
@rolfbjarne rolfbjarne mentioned this pull request Jan 26, 2024
Open
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@haritha-mohan haritha-mohan haritha-mohan approved these changes

@emaf emaf emaf approved these changes

@dalexsoto dalexsoto dalexsoto approved these changes

@mauroa mauroa Awaiting requested review from mauroa mauroa is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@rolfbjarne @vs-mobiletools-engineering-service2 @dalexsoto @emaf @haritha-mohan