[tools] Don't detect/resolve binding resource packages in mtouch/mmp/dotnet-linker. Fixes #19378. #19407

rolfbjarne · 2023-11-08T11:50:55Z

We currently detect/resolve binding resource packages (the sidecar) in two places:

The ResolveNativeReferences MSBuild task.
Inside mtouch/mmp/dotnet-linker.

Which means we end up passing every native library or framework twice to the native linker.

This is usually not a problem, the native linker will ignore duplicated
arguments, except when building remotely from Windows, in which case the build
process may end up with native libraries in different locations, because files
may end up in multiple places on the remote Mac if using absolute paths (see
#18997 for a thorough explanation).

So completely remove the logic to detect/resolve binding resource packages in
mtouch/mmp/dotnet-linker, which will avoid the issue completely.

A few mtouch tests also needed updating, since they're calling mtouch directly instead
of going through the msbuild targets.

Fixes #19378.

…dotnet-linker. Fixes dotnet#19378. We currently detect/resolve binding resource packages (the sidecar) in two places: * The ResolveNativeReferences MSBuild task. * Inside mtouch/mmp/dotnet-linker. Which means we end up passing every native library or framework twice to the native linker. This is usually not a problem, the native linker will ignore duplicated arguments, except when building remotely from Windows, in which case the build process may end up with native libraries in different locations, because files may end up in multiple places on the remote Mac if using absolute paths (see dotnet#18997 for a thorough explanation). So completely remove the logic to detect/resolve binding resource packages in mtouch/mmp/dotnet-linker, which will avoid the issue completely. Fixes dotnet#19378.

…ore launching mtouch.

…ereference-resolution

vs-mobiletools-engineering-service2 · 2023-11-09T11:35:44Z

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2023-11-09T11:38:39Z

💻 [CI Build] Windows Integration Tests passed 💻

✅ All Windows Integration Tests passed.

Pipeline on Agent
Hash: b4fcb53a363b80075a9eb500eb2237adaec346ee [PR build]

vs-mobiletools-engineering-service2 · 2023-11-09T11:43:09Z

💻 [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 · 2023-11-09T11:49:24Z

💻 [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 · 2023-11-09T12:13:18Z

✅ 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)

iOS: vsdrops gist (No breaking changes)
tvOS: vsdrops gist (No breaking changes)
watchOS: vsdrops gist (No breaking changes)
macOS: vsdrops gist (No breaking changes)

.NET (No breaking changes)

iOS: vsdrops gist (No breaking changes)
tvOS: vsdrops gist (No breaking changes)
MacCatalyst: vsdrops gist (No breaking changes)
macOS: vsdrops gist (No breaking changes)
Microsoft.iOS vs Microsoft.MacCatalyst: vsdrops gist

Legacy Xamarin (stable) vs .NET

iOS: vsdrops gist
tvOS: vsdrops gist
macOS: vsdrops gist

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: b4fcb53a363b80075a9eb500eb2237adaec346ee [PR build]

vs-mobiletools-engineering-service2 · 2023-11-09T19:00:14Z

🚀 [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 6 tests passed. Html Report (VSDrops) Download
✅ monotouch: All 41 tests passed. [attempt 3] 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: b4fcb53a363b80075a9eb500eb2237adaec346ee [PR build]

rolfbjarne · 2023-11-16T16:06:28Z

/sudo backport release/8.0.1xx

vs-mobiletools-engineering-service2 · 2023-11-16T16:07:04Z

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

vs-mobiletools-engineering-service2 · 2023-11-16T16:09:15Z

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

…ges in mtouch/mmp/dotnet-linker. Fixes dotnet#19378. (dotnet#19463) We currently detect/resolve binding resource packages (the sidecar) in two places: * The ResolveNativeReferences MSBuild task. * Inside mtouch/mmp/dotnet-linker. Which means we end up passing every native library or framework twice to the native linker. This is usually not a problem, the native linker will ignore duplicated arguments, except when building remotely from Windows, in which case the build process may end up with native libraries in different locations, because files may end up in multiple places on the remote Mac if using absolute paths (see dotnet#18997 for a thorough explanation). So completely remove the logic to detect/resolve binding resource packages in mtouch/mmp/dotnet-linker, which will avoid the issue completely. A few mtouch tests also needed updating, since they're calling mtouch directly instead of going through the msbuild targets. Fixes dotnet#19378. Backport of dotnet#19407 --------- Co-authored-by: Rolf Bjarne Kvinge <[email protected]>

rolfbjarne added 2 commits November 8, 2023 12:50

Skip any more processing for the assembly if there are huh?

a19b605

This comment has been minimized.

Sign in to view

rolfbjarne added 2 commits November 9, 2023 11:00

[tests] Adjust mtouch tests to do what we do in the MSBuild files bef…

8455728

…ore launching mtouch.

Merge remote-tracking branch 'origin/main' into avoid-duplicate-nativ…

b4fcb53

…ereference-resolution

This comment has been minimized.

Sign in to view

rolfbjarne marked this pull request as ready for review November 10, 2023 07:10

rolfbjarne added the regression The issue or pull request is a regression label Nov 10, 2023

dalexsoto approved these changes Nov 10, 2023

View reviewed changes

rolfbjarne merged commit f4d6a7e into dotnet:main Nov 13, 2023

rolfbjarne deleted the avoid-duplicate-nativereference-resolution branch November 13, 2023 15:38

vs-mobiletools-engineering-service2 mentioned this pull request Nov 16, 2023

[release/8.0.1xx] [tools] Don't detect/resolve binding resource packages in mtouch/mmp/dotnet-linker. Fixes #19378. #19463

Merged

[tools] Don't detect/resolve binding resource packages in mtouch/mmp/dotnet-linker. Fixes #19378. #19407

[tools] Don't detect/resolve binding resource packages in mtouch/mmp/dotnet-linker. Fixes #19378. #19407

Uh oh!

Conversation

rolfbjarne commented Nov 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

vs-mobiletools-engineering-service2 commented Nov 9, 2023

📚 [PR Build] Artifacts 📚

Packages generated

Uh oh!

vs-mobiletools-engineering-service2 commented Nov 9, 2023

💻 [CI Build] Windows Integration Tests passed 💻

Uh oh!

vs-mobiletools-engineering-service2 commented Nov 9, 2023

💻 [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) passed 💻

Uh oh!

vs-mobiletools-engineering-service2 commented Nov 9, 2023

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

Uh oh!

vs-mobiletools-engineering-service2 commented Nov 9, 2023

✅ API diff for current PR / commit

✅ API diff vs stable

ℹ️ Generator diff

Uh oh!

This comment has been minimized.

This comment has been minimized.

vs-mobiletools-engineering-service2 commented Nov 9, 2023

🚀 [CI Build] Test results 🚀

Test results

Tests counts

Uh oh!

rolfbjarne commented Nov 16, 2023

Uh oh!

vs-mobiletools-engineering-service2 commented Nov 16, 2023

Uh oh!

vs-mobiletools-engineering-service2 commented Nov 16, 2023

Uh oh!

Uh oh!

rolfbjarne commented Nov 8, 2023 •

edited

Loading