Skip to content

[dotnet] Remove Runtime.Arch and ObjCRuntime.Arch from Mac Catalyst. Fixes #10312.#13562

Merged
rolfbjarne merged 4 commits intodotnet:mainfrom
rolfbjarne:maccatalyst-remove-runtime-arch
Dec 15, 2021
Merged

[dotnet] Remove Runtime.Arch and ObjCRuntime.Arch from Mac Catalyst. Fixes #10312.#13562
rolfbjarne merged 4 commits intodotnet:mainfrom
rolfbjarne:maccatalyst-remove-runtime-arch

Conversation

@rolfbjarne
Copy link
Member

Remove Runtime.Arch and ObjCRuntime.Arch from Mac Catalyst, because they don't
apply for a Mac Catalyst app (which is neither a simulator environment, nor a
device environment).

This means that code using these APIs will have to be re-evaluated to
determine what's the correct behavior for Mac Catalyst.

Also update our tests accordingly.

Fixes #10312.

…atalyst.

* In most cases use helper asserts/functions in the TestRuntime code instead of
  calling Runtime.Arch.
* In the remaining cases adjust #if code to have the same logic for Mac Catalyst
  as macOS already has.
@rolfbjarne rolfbjarne added not-notes-worthy Ignore for release notes run-all-tests Run all our tests. skip-device-tests Skip device tests run-dotnet-tests Run all the .NET tests breaking-change If an issue or a pull request represents a breaking change labels Dec 14, 2021
@mandel-macaque
Copy link
Contributor

@rolfbjarne we need to check this by hand, device tests are not working atm until I can work on them post-vacation.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff
View dotnet API diff
View dotnet legacy API diff
View dotnet iOS-MacCatalayst API diff

API & Generator diff

ℹ️ API Diff (from PR only) (please review changes)
Generator Diff (no change)

GitHub pages

Results can be found in the following github pages (it might take some time to publish):

Test results

3 tests failed, 216 tests passed.

Failed tests

  • dont link/Mac Catalyst [dotnet]/Debug [dotnet]: TimedOut (Execution timed out after 1200 seconds.
    No test log file was produced)
  • link all/Mac [dotnet]/Debug [dotnet]: Failed (Test run failed.
    Tests run: 87 Passed: 75 Inconclusive: 0 Failed: 1 Ignored: 11)
  • link all/Mac [dotnet]/Release [dotnet]: Failed (Test run failed.
    Tests run: 87 Passed: 75 Inconclusive: 0 Failed: 1 Ignored: 11)

Pipeline on Agent XAMBOT-1094.BigSur'
Merge 3e16d54 into bb2572f

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff
View dotnet API diff
View dotnet legacy API diff
View dotnet iOS-MacCatalayst API diff

API Current PR diff

ℹ️ API Diff (from PR only) (please review changes)

View API diff
View dotnet API diff
View dotnet legacy API diff
View dotnet iOS-MacCatalayst API diff

Generator diff

Generator Diff (no change)

GitHub pages

Results can be found in the following github pages (it might take some time to publish):

Test results

1 tests failed, 234 tests passed.

Failed tests

  • trimmode copy/Mac Catalyst [dotnet]/Release [dotnet]: TimedOut (Execution timed out after 1200 seconds.
    No test log file was produced)

Pipeline on Agent XAMBOT-1096.BigSur'
Merge 2766d23 into 69015b3

@rolfbjarne
Copy link
Member Author

Test failure is unrelated (https://github.com/xamarin/maccore/issues/2414).

@rolfbjarne
Copy link
Member Author

@rolfbjarne we need to check this by hand, device tests are not working atm until I can work on them post-vacation.

I ran the device tests locally, and didn't run into any problems.

@rolfbjarne rolfbjarne merged commit b169c80 into dotnet:main Dec 15, 2021
@rolfbjarne rolfbjarne deleted the maccatalyst-remove-runtime-arch branch December 15, 2021 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

breaking-change If an issue or a pull request represents a breaking change not-notes-worthy Ignore for release notes run-all-tests Run all our tests. run-dotnet-tests Run all the .NET tests skip-device-tests Skip device tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Mac Catalyst: should we have Runtime.Arch? If so, what should it return?

3 participants