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

[release/7.0.3xx-multi-targeting] [dotnet] Add support for multi-targeting. #18896

Merged
merged 5 commits into from
Sep 5, 2023
Merged

[release/7.0.3xx-multi-targeting] [dotnet] Add support for multi-targeting. #18896

merged 5 commits into from
Sep 5, 2023

Conversation

rolfbjarne
Copy link
Member

Multi targetting is described here: https://github.com/xamarin/xamarin-macios/blob/main/docs/multi-target-framework.md

This PR implements support building using the latest .NET 7 packages we're
shipping, by specifying the OS version in the target framework.

It does so by:

  • Renaming the ref, sdk and runtime packs to contain the target framework and
    the target platfrom version, so the packages will now be named:

    • iOS

      • Microsoft.iOS.Sdk.net7.0_16.4
      • Microsoft.iOS.Ref.net7.0_16.4
      • Microsoft.iOS.Runtime.ios-arm64.net7.0_16.4
      • Microsoft.iOS.Runtime.iossimulator-arm64.net7.0_16.4
      • Microsoft.iOS.Runtime.iossimulator-x64.net7.0_16.4

    • tvOS

      • Microsoft.tvOS.Sdk.net7.0_16.4
      • Microsoft.tvOS.Ref.net7.0_16.4
      • Microsoft.tvOS.Runtime.ios-arm64.net7.0_16.4
      • Microsoft.tvOS.Runtime.iossimulator-arm64.net7.0_16.4
      • Microsoft.tvOS.Runtime.iossimulator-x64.net7.0_16.4

    • Mac Catalyst

      • Microsoft.MacCatalyst.Sdk.net7.0_16.4
      • Microsoft.MacCatalyst.Ref.net7.0_16.4
      • Microsoft.MacCatalyst.Runtime.maccatalyst-x64.net7.0_16.4
      • Microsoft.MacCatalyst.Runtime.maccatalyst-arm64.net7.0_16.4

    • macOS

      • Microsoft.macOS.Sdk.net7.0_13.3
      • Microsoft.macOS.Ref.net7.0_13.3
      • Microsoft.macOS.Runtime.osx-x64.net7.0_13.3
      • Microsoft.macOS.Runtime.osx-arm64.net7.0_13.3

  • Note that the workloads are also updated in this PR.

Contributes towards:

This PR is best reviewed commit-by-commit.

@rolfbjarne
[release/7.0.3xx] [dotnet] Parameterize the pack names.
c7095a9 
We're going to change the pack names to support multi-targeting, so ahead
of the pack name change I'm changing the existing logic to use a variable
for the pack name in most places (this will make the rename much easier and
simpler).

These changes should have no effect by themselves.

Backport of #18732.
@rolfbjarne
[release/7.0.3xx] [dotnet] Rename packs to contain target framework.
3bfad42
@rolfbjarne
[dotnet] Set _AppleSdkLoaded=true when loaded to ease logic in later …
2f0141b 
…sdks to determine the sdk to load.
@rolfbjarne
[tests/xharness] Add support for setting test configuration using env…
64f24bc 
…ironment variables.

Setting test configuration variables using the environment is useful
when running tests on a Windows machine (easier than having to deal with
make).

Also refactor the code a bit to not use constants, and more consistent
naming.

Backport of #18738.
@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build] Windows Integration Tests passed 💻

✅ All Windows Integration Tests passed.

Pipeline on Agent
Hash: 5f545076ec37884c3199bc77ed8cafe1381dcdbf [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ API diff for current PR / commit

NET (empty diffs)
  • iOS: (empty diff detected)
  • tvOS: (empty diff detected)
  • MacCatalyst: (empty diff detected)
  • macOS: (empty diff detected)

✅ API diff vs stable

.NET (No breaking changes)

✅ Generator diff

Generator diff is empty

Pipeline on Agent
Hash: 5f545076ec37884c3199bc77ed8cafe1381dcdbf [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: 5f545076ec37884c3199bc77ed8cafe1381dcdbf [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: 5f545076ec37884c3199bc77ed8cafe1381dcdbf [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMMINI-013.Ventura
Hash: 5f545076ec37884c3199bc77ed8cafe1381dcdbf [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 79 tests passed 🎉

Tests counts

⚠️ bcl: No tests selected. [attempt 2] Html Report (VSDrops) Download
✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 4 tests passed. Html Report (VSDrops) Download
✅ framework: All 4 tests passed. Html Report (VSDrops) Download
✅ generator: All 1 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 4 tests passed. Html Report (VSDrops) Download
⚠️ install_source: No tests selected. Html Report (VSDrops) Download
✅ introspection: All 4 tests passed. Html Report (VSDrops) Download
✅ linker: All 40 tests passed. Html Report (VSDrops) Download
⚠️ mac_binding_project: No tests selected. Html Report (VSDrops) Download
⚠️ mmp: No tests selected. Html Report (VSDrops) Download
⚠️ mononative: No tests selected. Html Report (VSDrops) Download
✅ monotouch: All 13 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
⚠️ mtouch: No tests selected. Html Report (VSDrops) Download
⚠️ xammac: No tests selected. Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 5f545076ec37884c3199bc77ed8cafe1381dcdbf [PR build]

@rolfbjarne rolfbjarne merged commit 7d700a4 into release/7.0.3xx-multi-targeting Sep 5, 2023
152 of 162 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dalexsoto dalexsoto dalexsoto approved these changes

@mandel-macaque mandel-macaque mandel-macaque approved these changes

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

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rolfbjarne @vs-mobiletools-engineering-service2 @dalexsoto @mandel-macaque @haritha-mohan