[msbuild/dotnet] Automatically link with Swift's system libraries if a binding project has the IsSwift=true property. #20546

rolfbjarne · 2024-05-01T08:24:58Z

Add support for the LinkWithSwiftSystemLibraries metadata to specify whether a native library is a Swift library, in which case we'll automatically set the LinkWithSwiftSystemLibraries MSBuild property to true.

Also add a test.

…a binding project has the IsSwift=true property. Add support for the IsSwift metadata to specify whether a native library is a Swift library, in which case we'll automatically set LinkWithSwiftSystemLibraries=true.

dalexsoto

Minor question I am also fine with current IsSwift but I think there are frameworks that can mix both objc and swift hence RequiresSwift

dalexsoto · 2024-05-02T02:45:39Z

tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/CreateBindingResourceTaskTests.cs

@@ -139,6 +141,7 @@ void AssertResourceDirectory (string directory, bool symlinks)
 <ForceLoad></ForceLoad>
 <Frameworks></Frameworks>
 <IsCxx></IsCxx>


What do you think about RequiresSwift instead of IsSwift?

@dalexsoto

That's not a bad idea.

Other ideas: ContainsSwift, UsesSwift, ReferencesSwift, or even LinkWithSwiftSystemLibraries to match the msbuild property.

I think they all sound equally good (or bad), so I'm fine with any of these options.

I think ‘LinkWithSwiftSystemLibraries’ is the winner for me, it is totally self explanatory / sef documenting on what it’s going on.

…ameworks. The code incorrectly assumed that the contents of a compressed xcframework would always be a framework, but this is incorrect (it can be a dynamic library (.dylib), static library (.a) or a framework (.framework). Fix this by: * Change variable and parameter names to clearly indicate that the output from an xcframework is a native library. * Unify code to handle metadata for native libraries from xcframeworks, so that the code isn't duplicated (or even worse, different) between compressed and non-compressed xcframeworks. The latter point fixes a problem where we'd compute the incorrect path to the static library inside a compressed xcframework.

vs-mobiletools-engineering-service2 · 2024-05-07T16:53:12Z

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

✅ All tests on macOS M1 - Mac Big Sur (11) passed.

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2024-05-07T16:53:13Z

💻 [PR Build] Tests on macOS M1 - Mac Monterey (12) passed 💻

✅ All tests on macOS M1 - Mac Monterey (12) passed.

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2024-05-07T16:54:07Z

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

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

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2024-05-07T16:55:34Z

💻 [PR Build] Tests on macOS X64 - Mac Sonoma (14) passed 💻

✅ All tests on macOS X64 - Mac Sonoma (14) passed.

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2024-05-07T17:03:38Z

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2024-05-07T17:25:33Z

✅ API diff for current PR / commit

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)

✅ 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: 1d08e0ce6358a66968cbc4492cf6b3a2f42340c5 [PR build]

vs-mobiletools-engineering-service2 · 2024-05-07T18:30:43Z

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 170 tests passed 🎉

Tests counts

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ install-source: All 1 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 7 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 (iOS): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 7 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 8 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (watchOS): All 4 tests passed. 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: [PR build]

vs-mobiletools-engineering-service2 · 2024-05-08T08:34:39Z

💻 [CI Build] Windows Integration Tests passed 💻

✅ All Windows Integration Tests passed.

Pipeline on Agent
Hash: 1d08e0ce6358a66968cbc4492cf6b3a2f42340c5 [PR build]

…ameworks. The code incorrectly assumed that the contents of a compressed xcframework would always be a framework, but this is incorrect (it can be a dynamic library (.dylib), static library (.a) or a framework (.framework). Fix this by: * Change variable and parameter names to clearly indicate that the output from an xcframework is a native library. * Unify code to handle metadata for native libraries from xcframeworks, so that the code isn't duplicated (or even worse, different) between compressed and non-compressed xcframeworks. The latter point fixes a problem where we'd compute the incorrect path to the static library inside a compressed xcframework. PR xamarin#20546 contains a test case that triggers this.

dalexsoto

Re-approve after my suggestion was addressed 👍

…ameworks. (#20585) The code incorrectly assumed that the contents of a compressed xcframework would always be a framework, but this is incorrect (it can be a dynamic library (.dylib), static library (.a) or a framework (.framework). Fix this by: * Change variable and parameter names to clearly indicate that the output from an xcframework is a native library. * Unify code to handle metadata for native libraries from xcframeworks, so that the code isn't duplicated (or even worse, different) between compressed and non-compressed xcframeworks. The latter point fixes a problem where we'd compute the incorrect path to the static library inside a compressed xcframework. PR #20546 contains a test case that triggers this. Co-authored-by: Manuel de la Pena <[email protected]>

rolfbjarne added 4 commits May 1, 2024 10:22

[runtime] Add support for compiling Swift code.

3ce8d70

[tests] Add swift test library.

bc097cc

[tests] Add test case.

10cbe37

rolfbjarne requested review from emaf and mauroa as code owners May 1, 2024 08:24

This comment has been minimized.

Sign in to view

mandel-macaque approved these changes May 1, 2024

View reviewed changes

dalexsoto approved these changes May 2, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

Rename IsSwift -> LinkWithSwiftSystemLibraries

2d7b5cb

This comment has been minimized.

Sign in to view

emaf approved these changes May 6, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

Fix expected output.

1d08e0c

rolfbjarne mentioned this pull request May 8, 2024

[msbuild] Fix issue referencing static libraries from compressed xcframeworks. #20585

Merged

dalexsoto approved these changes May 9, 2024

View reviewed changes

[msbuild/dotnet] Automatically link with Swift's system libraries if a binding project has the IsSwift=true property. #20546

Are you sure you want to change the base?

[msbuild/dotnet] Automatically link with Swift's system libraries if a binding project has the IsSwift=true property. #20546

Conversation

rolfbjarne commented May 1, 2024 • edited

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

dalexsoto left a comment

Choose a reason for hiding this comment

dalexsoto May 2, 2024

Choose a reason for hiding this comment

rolfbjarne May 3, 2024

Choose a reason for hiding this comment

dalexsoto May 3, 2024

Choose a reason for hiding this comment

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.

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.

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 May 7, 2024

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

vs-mobiletools-engineering-service2 commented May 7, 2024

💻 [PR Build] Tests on macOS M1 - Mac Monterey (12) passed 💻

vs-mobiletools-engineering-service2 commented May 7, 2024

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

vs-mobiletools-engineering-service2 commented May 7, 2024

💻 [PR Build] Tests on macOS X64 - Mac Sonoma (14) passed 💻

vs-mobiletools-engineering-service2 commented May 7, 2024

📚 [PR Build] Artifacts 📚

Packages generated

vs-mobiletools-engineering-service2 commented May 7, 2024

✅ API diff for current PR / commit

✅ API diff vs stable

ℹ️ Generator diff

vs-mobiletools-engineering-service2 commented May 7, 2024

🚀 [CI Build] Test results 🚀

Test results

Tests counts

vs-mobiletools-engineering-service2 commented May 8, 2024

💻 [CI Build] Windows Integration Tests passed 💻

dalexsoto left a comment

Choose a reason for hiding this comment

rolfbjarne commented May 1, 2024 •

edited