Merge xcode9 into master #2707
Merged
Merge xcode9 into master #2707
Conversation
This file contains 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
…eta4 (fix unit test)
There's no header change to mention `init` is not allowed but it's not clear how this default initializer could be used. Also make public some other API to construct this type (outside of XM). It's not clear why there were `internal` as they are (at least now) part of the header files.
…ll (to avoid ambiguous API) (xamarin#2360) Adding a strongly typed `PHLivePhotoEditingOption` (a strongly typed version of an `NSDictionary`) can cause a `CS0121` (call is ambiguous) since using a `null` argument is common (only one option exist so far). This PR adds overloads that makes the code nicer in such case, e.g. before Xcode9: > // null is used when no options are given > _foo.SaveLivePhoto (output, null, completion); current (Xcode 9) > // casting required to remove ambiguity with PHLivePhotoEditingOption > _foo.SaveLivePhoto (output, (NSDictionary)null, completion); with this PR > // no option, no argument > _foo.SaveLivePhoto (output, completion); The same applies to `PrepareLivePhotoForPlayback`.
…ates Those tests were not added to validate xOS so just keep the parts that helps us (without constantly checking back the new break flavor)
Bump to Xcode 9 beta 4
Note: WKWindowFeatures.h is not compiled (part of the framework umbrella) and the `@interface WKWindowFeatures (WKPrivate)` sounds like it should not have been exposed (it's all fields starting with `_`)
[mapkit] Update for beta 4
[coredata] Update for beta 4
[wkwebkit] Update for beta 4
[corelocation] Update for beta 4
This reverts commit fed2249.
…s-tests-58348 [tests] Disable watchOS from harness only. Workaround #58348
…arin#2376) This fix is needed by PDFKit because it is a remapped framework[0], the current code generates incorrect FieldAttribute on smart enums because it uses `fa.LibraryName` as first option and this causes remmaped frameworks have incorrect LibraryName generated for example if a Field uses `+CoreImage` as `LibraryName` the following incorrect code is generated: ``` [Field ("First", "+CoreImage")] internal unsafe static IntPtr First { get { fixed (IntPtr *storage = &values [0]) return Dlfcn.CachePointer (Libraries.+CoreImage.Handle, "First", storage); } } ``` [0]: https://github.com/xamarin/xamarin-macios/blob/f5956d6cc1eb5dfa7bab16628cf282d40237f64e/src/generator.cs#L5985
spouliot
requested review from
dalexsoto,
emaf,
jstedfast,
kzu,
mandel-macaque,
rolfbjarne,
timrisi and
VincentDondain
as code owners
jstedfast
approved these changes
Sep 15, 2017
chamons
approved these changes
Sep 15, 2017
dalexsoto
approved these changes
Sep 15, 2017
rolfbjarne
requested changes
Sep 15, 2017
Make.config
Outdated
| @@ -30,28 +31,31 @@ PACKAGE_HEAD_REV=$(shell git rev-parse HEAD) | |||
| # on wrench, because wrench technically builds hashes, not branches) | |||
| # | |||
| # | |||
| PACKAGE_HEAD_BRANCH=master | |||
There was a problem hiding this comment.
This shouldn’t be merged in master.
Make.config
Outdated
| IOS_PRODUCT=Xamarin.iOS | ||
| IOS_PACKAGE_NAME=Xamarin.iOS | ||
| IOS_PACKAGE_NAME_LOWER=$(shell echo $(IOS_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]") | ||
| # NEVER customize IOS_PACKAGE_VERSION itself, other parts (mtouch, web updater) are using the IOS_PACKAGE_VERSION_* variables | ||
| IOS_PACKAGE_VERSION=10.15.0.$(IOS_COMMIT_DISTANCE) | ||
| IOS_PACKAGE_VERSION=11.5.$(PACKAGE_VERSION_REV).$(IOS_COMMIT_DISTANCE) |
There was a problem hiding this comment.
Why?
xcode9 (d15.3/stable) -> 11.0
d15-4-xi -> 11.2
d15-5 -> 11.4
master -> 11.5
There was a problem hiding this comment.
@rolfbjarne the final will like @VincentDondain mentioned
but yes I skipped a step ;-) since d15-5 (11.4) will be branched after the merge
Make.config
Outdated
| XCODE_VERSION=8.3 | ||
| XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_8.3.xip | ||
| XCODE_DEVELOPER_ROOT=/Applications/Xcode83.app/Contents/Developer | ||
| # Xcode 9 beta 6 |
There was a problem hiding this comment.
Minor but comment is wrong :P
VincentDondain
approved these changes
Sep 15, 2017
emaf
approved these changes
Sep 15, 2017
timrisi
approved these changes
Sep 15, 2017
- branch name was still pointing to `xcode9`, not `master` - version was 11.5, half true since we need to re-branch 15.5 (11.4), so down to 11.3 to be temporarily correct - remove useless comment about xcode version, both the path and download link include the version
|
Build failure |
1 similar comment
|
Build failure |
|
Build failure |
|
Build failure |
|
watchOS failure (no mono.security) -> https://bugzilla.xamarin.com/show_bug.cgi?id=57529 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.