[msbuild/dotnet] Add support for NativeReference items. Fixes #11061.#11593
Merged
rolfbjarne merged 9 commits intodotnet:mainfrom May 21, 2021
Merged
[msbuild/dotnet] Add support for NativeReference items. Fixes #11061.#11593rolfbjarne merged 9 commits intodotnet:mainfrom
rolfbjarne merged 9 commits intodotnet:mainfrom
Conversation
…ble from elsewhere. Also rename it to LinkerOptions, and move the BuildNativeReferenceFlags method into the class as well.
…11061. * Pass any native references to the LinkNativeCode task so that they're linked with the main executable. * Copy frameworks and dynamic libraries to the app bundle (also add support for MSBuild metadata - the CopyToAppBundle property - to avoid copying a framework / dynamic library to the app bundle). * Add tests. Fixes dotnet#11061.
If there's a dynamic library in the -L path in addition to the static library, then the native linker will link with the dynamic library instead, which is not what we want. Instead just pass the full path to the static library to the linker.
spouliot
reviewed
May 18, 2021
| $(DOTNET6) build macOS/*.csproj /bl | ||
|
|
||
| run-mac: | ||
| /Users/rolf/work/maccore/whatever/xamarin-macios/tests/dotnet/NativeReferencesApp/macOS/bin/Debug/net6.0-macos/osx-x64/NativeReferences.app/Contents/MacOS/NativeReferences |
Contributor
There was a problem hiding this comment.
should be relative to $(TOP)
your's too far away, well beyond MAX_PATH ;-)
Member
Author
There was a problem hiding this comment.
your's too far away, well beyond
MAX_PATH;-)
🤦
emaf
approved these changes
May 18, 2021
Collaborator
❌ [PR Build] Tests failed on Build ❌Tests failed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) Test results1 tests failed, 106 tests passed.Failed tests
Pipeline on Agent XAMBOT-1100.BigSur' |
spouliot
suggested changes
May 18, 2021
Contributor
spouliot
left a comment
There was a problem hiding this comment.
This seems to cover xcframework but there's no associated tests ported (or added) to dotnet
| $(DOTNET6) build macOS/*.csproj /bl | ||
|
|
||
| run-mac: | ||
| /Users/rolf/work/maccore/whatever/xamarin-macios/tests/dotnet/NativeReferencesApp/macOS/bin/Debug/net6.0-macos/osx-x64/NativeReferences.app/Contents/MacOS/NativeReferences |
Member
Author
I've added a test case for xcframeworks as well (and as expected, it wasn't working at first, I had to fix something). |
Collaborator
❌ [PR Build] Tests failed on Build ❌Tests failed on Build. API diff✅ API Diff from stable View API diffTest results33 tests failed, 75 tests passed.Failed tests
|
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
❌ [PR Build] Tests failed on Build ❌Tests failed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) Test results1 tests failed, 107 tests passed.Failed tests
Pipeline on Agent XAMBOT-1104.BigSur' |
Collaborator
❌ [PR Build] Tests failed on Build ❌Tests failed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) Test results1 tests failed, 107 tests passed.Failed tests
Pipeline on Agent XAMBOT-1101.BigSur' |
Member
Author
|
Test failure is unrelated (https://github.com/xamarin/maccore/issues/2414). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
with the main executable.
for MSBuild metadata - the CopyToAppBundle property - to avoid copying a
framework / dynamic library to the app bundle).
LinkNativeCode task.
Fixes #11061.