Skip to content

[build] Fix installing the arm64 version of .NET.#21396

Merged
rolfbjarne merged 1 commit intomainfrom
dev/rolf/fix-detecting-architecture
Oct 9, 2024
Merged

[build] Fix installing the arm64 version of .NET.#21396
rolfbjarne merged 1 commit intomainfrom
dev/rolf/fix-detecting-architecture

Conversation

@rolfbjarne
Copy link
Copy Markdown
Member

On the bots we're executing with Rosetta, and 'arch' returns 'i386' under
Rosetta, so detect when we're executing under Rosetta, and install the arm64
version of .NET in that case as well.

Also fix a bug in the same area in our tests.

On the bots we're executing with Rosetta, and 'arch' returns 'i386' under
Rosetta, so detect when we're executing under Rosetta, and install the arm64
version of .NET in that case as well.

Also fix a bug in the same area in our tests.
@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

💻 [CI Build] Windows Integration Tests passed 💻

All Windows Integration Tests passed.

Pipeline on Agent
Hash: bb0d88db7d749bb6468ab3fdf53a24b224689f62 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
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: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: bb0d88db7d749bb6468ab3fdf53a24b224689f62 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

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

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

Pipeline on Agent
Hash: bb0d88db7d749bb6468ab3fdf53a24b224689f62 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

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

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

Pipeline on Agent
Hash: bb0d88db7d749bb6468ab3fdf53a24b224689f62 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

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

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

Pipeline on Agent
Hash: bb0d88db7d749bb6468ab3fdf53a24b224689f62 [PR build]

@rolfbjarne
Copy link
Copy Markdown
Member Author

/sudo backport net9.0

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

Backport Job to branch net9.0 Created! The magic is happening here

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

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

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 99 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 2 tests passed. Html Report (VSDrops) Download
✅ fsharp: 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
✅ introspection: All 4 tests passed. Html Report (VSDrops) Download
✅ linker: All 40 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 7 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 8 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 9 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 7 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. 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: bb0d88db7d749bb6468ab3fdf53a24b224689f62 [PR build]

@rolfbjarne rolfbjarne merged commit e860f53 into main Oct 9, 2024
@rolfbjarne rolfbjarne deleted the dev/rolf/fix-detecting-architecture branch October 9, 2024 14:57
@rolfbjarne
Copy link
Copy Markdown
Member Author

/sudo backport release/8.0.1xx-xcode16.0

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

Backport Job to branch release/8.0.1xx-xcode16.0 Created! The magic is happening here

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

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

rolfbjarne added a commit that referenced this pull request Oct 10, 2024
On the bots we're executing with Rosetta, and 'arch' returns 'i386'
under Rosetta, so detect when we're executing under Rosetta, and install the
arm64 version of .NET in that case as well.

Also fix a bug in the same area in our tests.

Backport of #21396

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
rolfbjarne added a commit that referenced this pull request Oct 10, 2024
…of .NET. (#21401)

On the bots we're executing with Rosetta, and 'arch' returns 'i386' under
Rosetta, so detect when we're executing under Rosetta, and install the arm64
version of .NET in that case as well.

Also fix a bug in the same area in our tests.

Backport of #21396

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants