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.

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

[dotnet] Make relase builds for desktop universal by default. Fixes #15620. #15769

Merged

Conversation

rolfbjarne
Copy link
Member

ARM64-based macOS machines are becoming more and more common, and as such it
makes sense to include ARM64 builds in the app bundle when building for
release.

Universal builds are much slower than single-architecture builds, which is why
we don't make debug builds universal.

Fixes #15620.

…amarin#15620.

ARM64-based macOS machines are becoming more and more common, and as such it
makes sense to include ARM64 builds in the app bundle when building for
release.

Universal builds are much slower than single-architecture builds, which is why
we don't make debug builds universal.

Fixes xamarin#15620.
@rolfbjarne rolfbjarne added the not-notes-worthy Ignore for release notes label Aug 25, 2022
@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@rolfbjarne
Copy link
Member Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

…Inference.targets anymore.

.NET changed their logic so that
Microsoft.NET.RuntimeIdentifierInference.targets is now included after our
default RuntimeIdentifier computation logic.

However, we need to still set SelfContained=true for app extensions, but limit
it to when there's a RuntimeIdentifier (i.e. not a universal app). For
Universal apps it will still be set for the build for each RuntimeIdentifier.
@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

We have a test that expects 'link all' to be single-arch:

    NoFatCorlib: /Users/builder/azdo/_work/2/s/xamarin-macios/tests/xharness/tmp-test-dir/link all93/bin/Release/net7.0-macos/link all.app/Contents/MonoBundle/.xamarin/osx-x64/System.Private.CoreLib.dll
    Expected: String ending with "link all.app/Contents/MonoBundle/System.Private.CoreLib.dll"
    But was: "/Users/builder/azdo/_work/2/s/xamarin-macios/tests/xharness/tmp-test-dir/link all93/bin/Release/net7.0-macos/link all.app/Contents/MonoBundle/.xamarin/osx-x64/System.Private.CoreLib.dll"
@vs-mobiletools-engineering-service2
Copy link
Collaborator

🔥 [PR Build] Build failed 🔥

Build failed for the job 'Detect API changes'

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🔥 Unable to find the contents for the comment: D:\a\1\s\change-detection\results\gh-comment.md does not exist :fire

Pipeline on Agent
Hash: 876f0dbab54135eedc6640cf7d82f1d018328236 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMBOT-1107.Monterey
Hash: 876f0dbab54135eedc6640cf7d82f1d018328236 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [PR Build] Tests on macOS Mac Catalina (10.15) passed 💻

All tests on macOS Mac Catalina (10.15) passed.

Pipeline on Agent
Hash: 876f0dbab54135eedc6640cf7d82f1d018328236 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) failed ❌

Failed tests are:

  • introspection
  • monotouch-test

Pipeline on Agent
Hash: 876f0dbab54135eedc6640cf7d82f1d018328236 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: simulator tests.

🎉 All 223 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 23 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]

@rolfbjarne rolfbjarne marked this pull request as ready for review August 31, 2022 14:44
@rolfbjarne rolfbjarne merged commit 2ddb7a6 into xamarin:net7.0 Aug 31, 2022
@rolfbjarne rolfbjarne deleted the dotnet-desktop-default-universal-apps branch August 31, 2022 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
not-notes-worthy Ignore for release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants