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.

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

[Mac] Update numerous availability tags from 10.12.1 to 10.12.2 #1672

Merged
merged 3 commits into from
Apr 11, 2017
Merged

[Mac] Update numerous availability tags from 10.12.1 to 10.12.2 #1672

merged 3 commits into from
Apr 11, 2017

Conversation

timrisi
Copy link
Contributor

@timrisi timrisi commented Feb 10, 2017

From a 10.12.2 beta diff that was never implemented.

We're waiting to merge after the xcode8.3 branch has been merged back into master to try to avoid making that merge any harder than it has to be.

@timrisi timrisi added the do-not-merge Do not merge this pull request label Feb 10, 2017
@monojenkins
Copy link
Collaborator

Build failure

@spouliot spouliot removed the do-not-merge Do not merge this pull request label Mar 29, 2017
@spouliot
Copy link
Contributor

This can now be merged (without causing conflicts with xcode8.3)

@timrisi
Copy link
Contributor Author

timrisi commented Apr 5, 2017

Build

@monojenkins
Copy link
Collaborator

Build success

@monojenkins
Copy link
Collaborator

Build failure

@timrisi
Copy link
Contributor Author

timrisi commented Apr 5, 2017

Build

@monojenkins
Copy link
Collaborator

Build failure

@timrisi
Copy link
Contributor Author

timrisi commented Apr 7, 2017

Build

@monojenkins
Copy link
Collaborator

Build failure

@timrisi
Copy link
Contributor Author

timrisi commented Apr 10, 2017

Build

@monojenkins
Copy link
Collaborator

Build failure

@spouliot
Copy link
Contributor

@timrisi the build fails with

17:19:42 /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/src/appkit.cs(13683,0): error CS1028: Unexpected processor directive (no #if for this #else)
17:19:42 /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/src/appkit.cs(13685,0): error CS1028: Unexpected processor directive (no #if for this #endif)
17:19:43 /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/src/appkit.cs(13683,0): error CS1028: Unexpected processor directive (no #if for this #else)
17:19:43 /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/src/appkit.cs(13685,0): error CS1028: Unexpected processor directive (no #if for this #endif)

Please always review logs on failures (before asking bots to build again) and file bugs (or fix) as appropriate.

@timrisi
Copy link
Contributor Author

timrisi commented Apr 10, 2017

Yah I saw that in the last build. There were several that failed with git issues before hand.

@monojenkins
Copy link
Collaborator

Build success

@timrisi timrisi merged commit 41fa74f into xamarin:master Apr 11, 2017
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.

6 participants