[Xcode12.3] [watchOS] Add x86_64 simulator support (#10059)#10196
Merged
dalexsoto merged 3 commits intodotnet:xcode12.3from Dec 8, 2020
Merged
[Xcode12.3] [watchOS] Add x86_64 simulator support (#10059)#10196dalexsoto merged 3 commits intodotnet:xcode12.3from
dalexsoto merged 3 commits intodotnet:xcode12.3from
Conversation
* Bumps mono binaries to include x86_64 watchOS support * Build runtime/registrar x86_64 slices * Produce a 64 bit version of Xamarin.WatchOS.dll * Allow building x86_64 for watch simulators in mtouch * Let xharness know about x86_64 * [tests] Add x86_64 arch to test-libraries * Make dotnet package aware of x64 * [ObjCRuntime] Fix computing if we're calling a stret function or not in a 64-bit watchOS simulator. * [xharness] Re-enable some watchOS tests. Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com> New commits in mono/mono: * mono/mono@ac596375c76 Add support for OP_FCONV_TO_I to mini-arm64.c. (dotnet#20548) * mono/mono@392fe5b87b2 [2020-02][watchOS] Add simwatch64 support (dotnet#20552) * mono/mono@a22ed3f094e Fix potential crash for Encoder.Convert (dotnet#20522) * mono/mono@970783731fc Bump to F# 5.0 (dotnet#20511) * mono/mono@32ab5066f72 Bump msbuild to fix a build issue * mono/mono@93a7fe77e8e Ensure special static slots respect alignment. (dotnet#20506) * mono/mono@3db5b358413 [debugger] Switch to GC Unsafe in signal handler callbacks (dotnet#20495) * mono/mono@af315f44c40 [2020-02][corlib] ThreadAbortException protection for ArraySortHelper (dotnet#20468) * mono/mono@ca11fb0fd81 [2020-02] Bump ikvm-fork to include mono/ikvm-fork#20 (dotnet#20452) Diff: https://github.com/mono/mono/compare/be2226b5a1c57df065efc4c1cf008d581e5cec7d..ac596375c762c6b8dbe3c802f0ce626004eab51c
…bit variant of Xamarin.WatchOS.dll. (dotnet#10136) * [src] Don't generate a reference assembly for both the 32-bit and 64-bit variant of Xamarin.WatchOS.dll. We only need one version, and in any case the code would write both the same file, causing corruption and random build problems later. Fixes this problem while building .NET packages: /Users/builder/jenkins/workspace/xamarin-macios/xamarin-macios/dotnet/package/common.csproj(75,5): error : Classification matches no files: Xamarin.WatchOS.dll [/Users/builder/jenkins/workspace/xamarin-macios/xamarin-macios/dotnet/package/Microsoft.watchOS.Ref/package.csproj] make[1]: *** [nupkgs/Microsoft.watchOS.Ref.7.1.100-ci.main.35+sha.a4a1fea86.nupkg] Error 1 * Fix the make rule too so that it doesn't claim it can generate the reference assembly.
spouliot
approved these changes
Dec 3, 2020
Contributor
|
Build failure Test results6 tests failed, 131 tests passed.Failed tests
|
rolfbjarne
approved these changes
Dec 3, 2020
Member
rolfbjarne
left a comment
There was a problem hiding this comment.
Could we get the failing tests ignored as well?
tj-devel709
approved these changes
Dec 3, 2020
spouliot
approved these changes
Dec 8, 2020
Contributor
|
Build failure Test results1 tests failed, 136 tests passed.Failed tests
|
Member
Author
|
Known failure |
5 tasks
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
5 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.
Backport of #10059
Fixes #9949
Bumps mono binaries to include x86_64 watchOS support
Build runtime/registrar x86_64 slices
Produce a 64 bit version of Xamarin.WatchOS.dll
Allow building x86_64 for watch simulators in mtouch
Let xharness know about x86_64
[tests] Add x86_64 arch to test-libraries
Make dotnet package aware of x64
[ObjCRuntime] Fix computing if we're calling a stret function or not in a 64-bit watchOS simulator.
[xharness] Re-enable some watchOS tests.
Co-authored-by: Rolf Bjarne Kvinge rolf@xamarin.com
New commits in mono/mono:
Diff: https://github.com/mono/mono/compare/be2226b5a1c57df065efc4c1cf008d581e5cec7d..ac596375c762c6b8dbe3c802f0ce626004eab51c