Skip to content

Commit

Permalink
Merge pull request #4596 from xamarin/mono-2018-08
Browse files Browse the repository at this point in the history
* Bump to mono:2018-06

* Bump mono

* Updates compression to work with the public span

* Bump mono

* Fixes pointer check logic in Deflater

* Bump mono

* Fixes pointer check logic in Deflater

* Bump mono

* Bump Mono

* [runtime] always use `mono_jit_set_aot_mode` (#4491)

`mono_jit_set_aot_only` is deprecated and accidentally broke with
mono/mono#7887

This should fix device tests with `mono-2018-06`

* Testing with Zoltan's patch

* Include libmono-system-native on Xamarin.Mac

* Bump Mono

Commit list for mono/mono:

* mono/mono@7bcda192a06 Bump llvm to release_60/fc854b8ec5873d294b80afa3e6cf6a88c5c48886. (#9786). (#9804)
* mono/mono@23e95ec7ad7 Apply F# portable pdb debug fix for pinvokes & bump (#9797)
* mono/mono@295f6d32afd [2018-06] [MacOS] On Mac, use the copyfile API to copy files (#9696)

Diff: mono/mono@7d5f4b6...7bcda19

* Revert 4bacab3, it doesn't fix the ios aot problems.

* Bump mono

* [tests] Adjust the MT0137 test for mcs change in behavior.

Starting with mono 5.16 mcs will now add assembly references when the assembly
is only used in attributes (this was already the case for csc in both 5.14 and
5.16, so it seems to be a compatibility change).

Adjust the MT0137 test accordingly.

* [msbuild] Fix parsing of json parser errors to handle trailing periods in the error message.

Fixes this test:

    1) Test Failure : Xamarin.iOS.Tasks.Bug60536.TestACToolTaskCatchesJsonException
         ColumnNumber
      Expected: 2
      But was:  0

* Bump mono

* [builds] Install the old llvm binaries into the LLVM36 directory and make the 32 bit builds use that.

* Bump mono

* Bump to mono:2018-08

* Initialize Dependency Injector.

* Fix typo

* Fix llvm build

* Reflect latest X509CertificateImpl changes

* Use same compile flags also for link

Linking can fail if the minimum versions are different

* Bump mono

* Bump mono

* Assembly.LoadFile accepts only absolute path

* Bump mono

* [jenkins] Don't give VSTS a fake branch. (#4667)

Something in VSTS changed, and now fake branch names don't work anymore.

So instead use real branch names (and for pull requests I've created a
'pull-request' branch we can use).

* Assembly.LoadFile accepts only absolute path

* [linker] Add new Facade (System.Threading.Tasks.Extensions).

Fixes these MTouch test failures:

    1. Xamarin.Linker.SdkTest.iOS_Unified :   Facades
      Expected:
      But was:  < "System.Threading.Tasks.Extensions" >

    2. Xamarin.Linker.SdkTest.tvOS :   Facades
      Expected:
      But was:  < "System.Threading.Tasks.Extensions" >

    3. Xamarin.Linker.SdkTest.watchOS :   Facades
      Expected:
      But was:  < "System.Threading.Tasks.Extensions" >

* [linker] Add new Facade (System.Threading.Tasks.Extensions).

Fixes these MTouch test failures:

    1. Xamarin.Linker.SdkTest.iOS_Unified :   Facades
      Expected:
      But was:  < "System.Threading.Tasks.Extensions" >

    2. Xamarin.Linker.SdkTest.tvOS :   Facades
      Expected:
      But was:  < "System.Threading.Tasks.Extensions" >

    3. Xamarin.Linker.SdkTest.watchOS :   Facades
      Expected:
      But was:  < "System.Threading.Tasks.Extensions" >

* [tests] Reference GuiUnit_Net_4_5 using a project reference.

This makes sure GuiUnit is built when the main project is built.

* [mono-sdks] Necessary changes to unify the LLVM provisioning for both iOS and Android. (#4732)

* Bump Mono

* [mtouch] add mixed-mode support (#4751)

* [mtouch] add --interp-mixed option

When enabling this option, mtouch will AOT compile `mscorlib.dll`.  At
runtime that means every method that wasn't AOT'd will be executed by
the runtime interpreter.

* [mtouch] Add support to --interpreter to list the assemblies to (not) interpret.

* [msbuild] Simplify interpreter code to use a single variable.

* Fix whitespace.

* [mtouch] Move mtouch-specific code to mtouch-specific file.

* [msbuild] An empty string is a valid value for 'Interpreter', so make it a non-required property.

* [mtouch] Add sanity check for aot-compiling interpreted assemblies.

* Bump Mono

* [linker] Updates SDKs facades list

* Bump mono

* [msbuild] Adds facades which might override default nuget version to framework list

The collision resolver task reads them from here https://github.com/dotnet/sdk/blob/master/src/Tasks/Common/ConflictResolution/FrameworkListReader.cs

* Bump mono to pick up hybrid suspend fixes

Pick up the 2018-08 backport (mono/mono#10551)
of mono/mono#10545

This should fix GC hangs when managed code runs on a GCD threadpool worker
thread.

* [builds] Fix target name in llvm36 provisioning

package-llvm-llvm36-32 isn't defined in external/mono/sdks/builds/llvm.mk,
but package-llvm36-llvm32 is.

* Revert "[builds] Fix target name in llvm36 provisioning"

This reverts commit b233837.

* Revert "Fix llvm build"

This reverts commit f668561.

* [mono-sdks] Necessary changes to unify the LLVM provisioning for both iOS and Android. (#4732)

* Bump mono

* Bump mono

* Revert "Use same compile flags also for link"

This reverts commit cf20539.

* Bump mono to pick up mono/mono@1a309a7

* [mmptest] System.Core doesn't depend on Mono.Posix in 2018-08

System.Core doesn't depend on Mono.Posix anymore since it's using the corefx
implementation of pipes now mono/mono@0f0e318

* Bump mono and minimum system mono

* [security]: Make `SecCertificate` work with the latest runtime code.

* Fix the `NATIVE_APPLE_CERTIFICATE` logic; it should only be defined when
  using `XAMARIN_APPLETLS` and not on watch.

* It is no longer allowed to construct `X509Certificate` from a native pointer,
  the `X509Certificate(IntPtr)` and `X509Certificate2(IntPtr)` constructors now
  throw an exception.  Use `X509CertificateImplAppl` directly instead.

* Bump mono

* Bump VSmac min version to 7.7.0.1373

To pick up the fix for https://devdiv.visualstudio.com/DevDiv/_workitems/edit/658916/
Should fix the XM classic build failures

* Revert "Bump VSmac min version to 7.7.0.1373"

This reverts commit b2686bb.

* Bump to a VSfM version that can build XM Classic projects.

* Bump mono system dependency

* Bump mono

Pick up mono/mono@1644a1a0 - fix for mono/mono#10743

* Bump mono

* Bump mono

* [monotouch-test] Disable X509Certificate(byte[]) tests on watchOS (#4942)

* [monotouch-test] Disable X509Certificate(byte[]) tests on watchOS

* [tests] Add TestRuntime.AssertNotWatchOS()

* fixup WatchOS build

* Bump mono

* Bump mono

* [tests] Disable link-preserve-calendar-1 until we can upgrade it to be a Unified test.

See #4596 (comment)
for reference: mono's desktop API changed, the linker behavior the test is
verifying is only expected when using XM's Mobile profile.

* Bump mono

* Revert "[monotouch-test] Disable X509Certificate(byte[]) tests on watchOS (#4942)"

This reverts commit d003a9b.

* Bump Mono.

* [security]: `NATIVE_APPLE_CERTIFICATE` should now be defined on watchOS as well.

* Mono 2018-08 requires macOS 10.9+, so Xamarin.Mac must as well.

* Bump min mono version for XM system apps.

Using a system mono < 5.18 results in a TypeLoadException:

    Could not resolve type with token 01000032 from typeref (expected class 'Mono.ISystemDependencyProvider' in assembly 'mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089')

* Bump guiunit to get updated min macOS version.

Commit list for mono/guiunit:

* mono/guiunit@9f67042 Bump min macOS version to 10.9.
* mono/guiunit@0c3159a [Harness] Fix exit code of 0 being reported in case of exceptions in the harness
* mono/guiunit@9b7497c Merge pull request #15 from mono/fix-more-warnings
* mono/guiunit@a264470 Fix more warnings
* mono/guiunit@dd094e7 Merge pull request #14 from mono/fix-warnings
* mono/guiunit@b3afede Fix build warnings

Diff: mono/guiunit@1306b0d...9f67042

* [tests] More min macOS version setting to 10.9.

* Remove 10.7 & 10.8 availability attributes, since they're redundant now.

* Bump mono

* [2018-08][watchos] Use mono_dangerous_add_raw_internal_call for watchOS icalls (#5030)

* Add optional mono_dangerous_add_raw_internal_call to exports.t4

* Use mono_dangerous_add_raw_internal_call on watchOS for icall registration

Internal calls added with mono_dangerous_add_raw_internal_call run in GC Unsafe
mode under cooperative and hybrid suspend, whereas internal calls added with
mono_add_internal_call run in GC Safe mode since
mono/mono@5756ba4 in order for hybrid suspend
to be a transparent replacement for preemptive suspend (the old default).  The
icalls in GC Unsafe mode have a responsibility not to block indefinitely
without manually performing a thread state transition to GC Safe mode, and in
return they avoid a thread state transition when the icall is invoked from a
managed method.

* [mmptest] Less hardcoding.

* Bump minimum mono one that has 'mono_dangerous_add_raw_internal_call'.

* Bump mono

* Bump system mono dependency

* Fixes building mono tests

* [ImageCaptureCore] Remove redundant availability attribute.

* [mtouch] Clear the MONO_THREADS_SUSPEND environment variable before calling the AOT compiler. Works around mono/mono#11765.

Visual Studio for Mac may set MONO_THREADS_SUSPEND, and this ends up confusing
the AOT compiler when compiling for watchOS.

So unset the environment variable before calling the AOT compiler.

Works around mono/mono#11765.
  • Loading branch information
spouliot authored Dec 6, 2018
2 parents b88fb70 + 4e3dec7 commit 7b83195
Show file tree
Hide file tree
Showing 166 changed files with 773 additions and 1,046 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[submodule "external/mono"]
path = external/mono
url = ../../mono/mono.git
branch = 2018-06
branch = 2018-08
[submodule "external/opentk"]
path = external/opentk
url = ../../mono/opentk.git
Expand Down
12 changes: 6 additions & 6 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ XCODE94_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_9.4.xip
XCODE94_DEVELOPER_ROOT=/Applications/Xcode94.app/Contents/Developer

# Minimum Mono version for building XI/XM
MIN_MONO_VERSION=5.16.0.5
MAX_MONO_VERSION=5.16.99
MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-06/7/7627a5f9eeba0fd846731ad0c498556f55be1a34/MonoFramework-MDK-5.16.0.5.macos10.xamarin.universal.pkg
MIN_MONO_VERSION=5.18.0.185
MAX_MONO_VERSION=5.18.99
MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-08/149/ea740d2bc8d58d9c0ee44ef0ba15ccddeafbe227/MonoFramework-MDK-5.18.0.185.macos10.xamarin.universal.pkg

# Minimum Mono version for Xamarin.Mac apps using the system mono
MIN_XM_MONO_VERSION=5.14.0.136
MIN_XM_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-04/111/07c8f25fe536dbb7e244f965aa3f9a871f41e953/MonoFramework-MDK-5.14.0.136.macos10.xamarin.universal.pkg
MIN_XM_MONO_VERSION=5.18.0.185
MIN_XM_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-08/149/ea740d2bc8d58d9c0ee44ef0ba15ccddeafbe227/MonoFramework-MDK-5.18.0.185.macos10.xamarin.universal.pkg

# Minimum Visual Studio version
MIN_VISUAL_STUDIO_URL=https://bosstoragemirror.azureedge.net/vsmac/7a/7aff2dc1f28d711d11d63d79b2a4c49cda217189/VisualStudioForMac-Preview-7.7.0.1470.dmg
Expand Down Expand Up @@ -83,7 +83,7 @@ TVOS_SDK_VERSION=12.1

# Minimum OS versions for running XI/XM apps.
MIN_IOS_SDK_VERSION=6.0
MIN_OSX_SDK_VERSION=10.7
MIN_OSX_SDK_VERSION=10.9
MIN_WATCHOS_SDK_VERSION=2.0
MIN_WATCH_OS_VERSION=1.0
MIN_TVOS_SDK_VERSION=9.0
Expand Down
2 changes: 0 additions & 2 deletions Versions-mac.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
<dict>
<key>macOS</key>
<array>
<string>10.7</string>
<string>10.8</string>
<string>10.9</string>
<string>10.10</string>
<string>10.11</string>
Expand Down
2 changes: 1 addition & 1 deletion external/mono
Submodule mono updated 1623 files
5 changes: 5 additions & 0 deletions runtime/exports.t4
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,11 @@
"const void *", "method"
),

new Export (true, "void", "mono_dangerous_add_raw_internal_call",
"const char *", "name",
"const void *", "method"
),

new Export ("MonoMethodSignature *", "mono_method_signature",
"MonoMethod *", "method"
),
Expand Down
25 changes: 22 additions & 3 deletions runtime/runtime.m
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,25 @@
uint8_t flags;
};

static void
xamarin_add_internal_call (const char *name, const void *method)
{
/* COOP: With cooperative GC, icalls will run, like manageed methods,
* in GC Unsafe mode, avoiding a thread state trandition. In return
* the icalls must guarantee that they won't block, or run indefinitely
* without a safepoint, by manually performing a transition to GC Safe
* mode. With backward-compatible hybrid GC, icalls run in GC Safe
* mode and the Mono API functions take care of thread state
* transitions, so don't need to perform GC thread state transitions
* themselves.
*
*/
if (xamarin_is_gc_coop)
mono_dangerous_add_raw_internal_call (name, method);
else
mono_add_internal_call (name, method);
}

id
xamarin_get_nsobject_handle (MonoObject *obj)
{
Expand Down Expand Up @@ -881,7 +900,7 @@ -(void) xamarinSetGCHandle: (int) gc_handle;

mono_gc_toggleref_register_callback (gc_toggleref_callback);

mono_add_internal_call (xamarin_use_new_assemblies ? "Foundation.NSObject::RegisterToggleRef" : PRODUCT_COMPAT_NAMESPACE ".Foundation.NSObject::RegisterToggleRef", (const void *) gc_register_toggleref);
xamarin_add_internal_call (xamarin_use_new_assemblies ? "Foundation.NSObject::RegisterToggleRef" : PRODUCT_COMPAT_NAMESPACE ".Foundation.NSObject::RegisterToggleRef", (const void *) gc_register_toggleref);
mono_profiler_install ((MonoProfiler *) prof, NULL);
mono_profiler_install_gc (gc_event_callback, NULL);
}
Expand Down Expand Up @@ -1359,8 +1378,8 @@ -(void) xamarinSetGCHandle: (int) gc_handle;
nsvalue_class = get_class_from_name (platform_image, foundation, "NSValue", true);
nsstring_class = get_class_from_name (platform_image, foundation, "NSString", true);

mono_add_internal_call (xamarin_use_new_assemblies ? "Foundation.NSObject::xamarin_release_managed_ref" : PRODUCT_COMPAT_NAMESPACE ".Foundation.NSObject::xamarin_release_managed_ref", (const void *) xamarin_release_managed_ref);
mono_add_internal_call (xamarin_use_new_assemblies ? "Foundation.NSObject::xamarin_create_managed_ref" : PRODUCT_COMPAT_NAMESPACE ".Foundation.NSObject::xamarin_create_managed_ref", (const void *) xamarin_create_managed_ref);
xamarin_add_internal_call (xamarin_use_new_assemblies ? "Foundation.NSObject::xamarin_release_managed_ref" : PRODUCT_COMPAT_NAMESPACE ".Foundation.NSObject::xamarin_release_managed_ref", (const void *) xamarin_release_managed_ref);
xamarin_add_internal_call (xamarin_use_new_assemblies ? "Foundation.NSObject::xamarin_create_managed_ref" : PRODUCT_COMPAT_NAMESPACE ".Foundation.NSObject::xamarin_create_managed_ref", (const void *) xamarin_create_managed_ref);

runtime_initialize = mono_class_get_method_from_name (runtime_class, "Initialize", 1);

Expand Down
2 changes: 1 addition & 1 deletion src/AVFoundation/AVCaptureVideoPreviewLayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public partial class AVCaptureVideoPreviewLayer {

public enum InitMode {
WithConnection,
[iOS (8,0), Mac (10,7)]
[iOS (8,0)]
WithNoConnection,
}

Expand Down
1 change: 0 additions & 1 deletion src/AVFoundation/AVTypes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,6 @@ public static class AVUtilities {
[DllImport (Constants.AVFoundationLibrary)]
static extern /* CGRect */ RectangleF AVMakeRectWithAspectRatioInsideRect (/* CGSize */ SizeF aspectRatio, /* CGRect */ RectangleF boundingRect);

[Mac (10,7)]
public static RectangleF WithAspectRatio (this RectangleF self, SizeF aspectRatio)
{
return AVMakeRectWithAspectRatioInsideRect (aspectRatio, self);
Expand Down
3 changes: 0 additions & 3 deletions src/AVFoundation/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -310,15 +310,13 @@ public enum AVAssetImageGeneratorResult : long {

#if !XAMCORE_3_0 || MONOMAC
[NoTV]
[Mac (10,7)] // N/A in iOS
[Native]
// NSInteger - AVCaptureDevice.h
public enum AVCaptureDeviceTransportControlsPlaybackMode : long {
NotPlaying, Playing
}

[NoTV, NoWatch]
[Mac (10,7)] // N/A in iOS
[Native]
// NSInteger - AVCaptureSession.h
public enum AVVideoFieldMode : long {
Expand Down Expand Up @@ -694,7 +692,6 @@ public enum AVMovieWritingOptions : ulong
}

[NoiOS][NoTV][NoWatch]
[Mac (10,7)]
[Native]
public enum AVContentAuthorizationStatus : long {
Unknown,
Expand Down
23 changes: 11 additions & 12 deletions src/AppKit/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1994,13 +1994,13 @@ public enum NSOpenGLContextParameter : ulong {
SurfaceOrder = 235,
SurfaceOpacity = 236,

[Mac (10, 7)] SurfaceBackingSize = 304,
[Mac (10, 7)] ReclaimResources = 308,
[Mac (10, 7)] CurrentRendererID = 309,
[Mac (10, 7)] GpuVertexProcessing = 310,
[Mac (10, 7)] GpuFragmentProcessing = 311,
[Mac (10, 7)] HasDrawable = 314,
[Mac (10, 7)] MpsSwapsInFlight = 315
SurfaceBackingSize = 304,
ReclaimResources = 308,
CurrentRendererID = 309,
GpuVertexProcessing = 310,
GpuFragmentProcessing = 311,
HasDrawable = 314,
MpsSwapsInFlight = 315
}

public enum NSSurfaceOrder {
Expand All @@ -2012,10 +2012,10 @@ public enum NSSurfaceOrder {
public enum NSOpenGLPixelFormatAttribute : uint { // uint32_t NSOpenGLPixelFormatAttribute
AllRenderers = 1,
DoubleBuffer = 5,
[Mac (10, 7)] TripleBuffer = 3,
TripleBuffer = 3,
#if !XAMCORE_4_0
[Obsolete ("Use 'TripleBuffer' instead.")]
[Mac (10, 7)] TrippleBuffer = TripleBuffer,
TrippleBuffer = TripleBuffer,
#endif
Stereo = 6,
AuxBuffers = 7,
Expand Down Expand Up @@ -2057,7 +2057,7 @@ public enum NSOpenGLPixelFormatAttribute : uint { // uint32_t NSOpenGLPixelForma
AcceleratedCompute = 97,

// Specify the profile
[Mac (10, 7)] OpenGLProfile = 99,
OpenGLProfile = 99,
VirtualScreenCount = 128,

[Deprecated (PlatformName.MacOSX, 10, 5)]
Expand Down Expand Up @@ -2096,7 +2096,7 @@ public enum NSOpenGLGlobalOption : uint {
FormatCacheSize = 501,
ClearFormatCache = 502,
RetainRenderers = 503,
[Mac (10, 7)] UseBuildCache = 506,
UseBuildCache = 506,
[Deprecated (PlatformName.MacOSX, 10, 4)]
ResetLibrary = 504
}
Expand Down Expand Up @@ -2405,7 +2405,6 @@ public enum NSWindowAnimationBehavior : long {
Default = 0, None = 2, DocumentWindow, UtilityWindow, AlertPanel
}

[Mac (10, 7)]
[Native]
public enum NSTextFinderAction : long {
ShowFindInterface = 1,
Expand Down
1 change: 0 additions & 1 deletion src/AppKit/NSAccessibility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ public static CGPoint GetPointInView (NSView parentView, CGPoint point)
return NSAccessibilityPointInView (parentView, point);
}

[Mac (10,7)]
[DllImport (Constants.AppKitLibrary)]
static extern void NSAccessibilityPostNotificationWithUserInfo (IntPtr element, IntPtr notification, IntPtr userInfo);

Expand Down
2 changes: 1 addition & 1 deletion src/AppKit/NSColor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ public override string ToString ()
}
}

[Mac (10, 8)][Obsolete ("Use 'UnderPageBackgroundColor' instead.")]
[Obsolete ("Use 'UnderPageBackgroundColor' instead.")]
public static NSColor UnderPageBackground {
get {
return UnderPageBackgroundColor;
Expand Down
4 changes: 0 additions & 4 deletions src/AppKit/NSStringAttributes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -362,13 +362,11 @@ public bool? MarkedClauseSegment {
set { Set (NSStringAttributeKey.MarkedClauseSegment, value); }
}

[Mac (10, 7)]
public NSTextLayoutOrientation? VerticalGlyphForm {
get { return (NSTextLayoutOrientation?)GetInt32Value (NSStringAttributeKey.VerticalGlyphForm); }
set { SetNumberValue (NSStringAttributeKey.VerticalGlyphForm, (int?)value); }
}

[Mac (10, 8)]
public NSTextAlternatives TextAlternatives {
get { return Get (NSStringAttributeKey.TextAlternatives, handle => new NSTextAlternatives (handle)); }
set { SetNativeValue (NSStringAttributeKey.TextAlternatives, value); }
Expand Down Expand Up @@ -520,13 +518,11 @@ public bool? MarkedClauseSegment {
set { Set (NSAttributedString.MarkedClauseSegmentAttributeName, value); }
}

[Mac (10, 7)]
public NSTextLayoutOrientation? VerticalGlyphForm {
get { return (NSTextLayoutOrientation?)GetInt32Value (NSAttributedString.VerticalGlyphFormAttributeName); }
set { SetNumberValue (NSAttributedString.VerticalGlyphFormAttributeName, (int?)value); }
}

[Mac (10, 8)]
public NSTextAlternatives TextAlternatives {
get { return Get (NSAttributedString.TextAlternativesAttributeName, handle => new NSTextAlternatives (handle)); }
set { SetNativeValue (NSAttributedString.TextAlternativesAttributeName, value); }
Expand Down
7 changes: 1 addition & 6 deletions src/AppKit/XEnums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@

namespace AppKit {

[Mac (10, 7)]
[Native]
public enum NSTextLayoutOrientation : long {
Horizontal,
Vertical
}

#if !XAMCORE_2_0
[Mac (10, 7), Flags]
[Flags]
[Native]
public enum NSTableViewAnimationOptions : ulong {
EffectFade = 0x1,
Expand All @@ -33,22 +32,19 @@ public enum NSTableViewAnimationOptions : ulong {
}
#endif

[Mac (10, 7)]
[Native]
public enum NSPrintRenderingQuality : long {
Best,
Responsive
}

[Mac (10, 7)]
[Native]
public enum NSCorrectionIndicatorType : long {
Default = 0,
Reversion,
Guesses
}

[Mac (10, 7)]
[Native]
public enum NSCorrectionResponse : long {
None,
Expand All @@ -59,7 +55,6 @@ public enum NSCorrectionResponse : long {
Reverted
}

[Mac (10, 7)]
[Native]
public enum NSTextFinderMatchingType : long {
Contains = 0,
Expand Down
2 changes: 0 additions & 2 deletions src/AudioToolbox/AudioQueue.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1296,11 +1296,9 @@ public AudioQueueStatus GetSourceAudio (uint numberOfFrames, ref AudioTimeStamp
out flags, out parentNumberOfFrames, (IntPtr) data);
}

[Mac (10,8)]
[DllImport (Constants.AudioToolboxLibrary)]
extern static AudioQueueStatus AudioQueueProcessingTapGetQueueTime (IntPtr inAQTap, out double outQueueSampleTime, out uint outQueueFrameCount);

[Mac (10,8)]
public AudioQueueStatus GetQueueTime (out double sampleTime, out uint frameCount)
{
return AudioQueueProcessingTapGetQueueTime (TapHandle, out sampleTime, out frameCount);
Expand Down
1 change: 0 additions & 1 deletion src/CoreFoundation/CFProxySupport.cs
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ public NSObject AutoConfigurationHTTPResponse {
}
#endif

[Mac (10,7)]
public NSString AutoConfigurationJavaScript {
get {
if (AutoConfigurationJavaScriptKey == null)
Expand Down
11 changes: 0 additions & 11 deletions src/CoreGraphics/CGPath.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ public CGPath ()
handle = CGPathCreateMutable ();
}

[Mac(10,7)]
public CGPath (CGPath reference, CGAffineTransform transform)
{
if (reference == null)
Expand Down Expand Up @@ -571,25 +570,21 @@ extern unsafe static IntPtr CGPathCreateCopyByDashingPath (
/* CGFloat */ nfloat [] lengths,
/* size_t */ nint count);

[Mac(10,7)]
public CGPath CopyByDashingPath (CGAffineTransform transform, nfloat [] lengths)
{
return CopyByDashingPath (transform, lengths, 0);
}

[Mac(10,7)]
public unsafe CGPath CopyByDashingPath (CGAffineTransform transform, nfloat [] lengths, nfloat phase)
{
return MakeMutable (CGPathCreateCopyByDashingPath (handle, &transform, phase, lengths, lengths == null ? 0 : lengths.Length));
}

[Mac(10,7)]
public CGPath CopyByDashingPath (nfloat [] lengths)
{
return CopyByDashingPath (lengths, 0);
}

[Mac(10,7)]
public unsafe CGPath CopyByDashingPath (nfloat [] lengths, nfloat phase)
{
var path = CGPathCreateCopyByDashingPath (handle, null, phase, lengths, lengths == null ? 0 : lengths.Length);
Expand All @@ -604,13 +599,11 @@ public unsafe CGPath Copy ()
[DllImport (Constants.CoreGraphicsLibrary)]
unsafe extern static IntPtr CGPathCreateCopyByStrokingPath (/* CGPathRef */ IntPtr path, CGAffineTransform *transform, nfloat lineWidth, CGLineCap lineCap, CGLineJoin lineJoin, /* CGFloat */ nfloat miterLimit);

[Mac(10,7)]
public unsafe CGPath CopyByStrokingPath (CGAffineTransform transform, nfloat lineWidth, CGLineCap lineCap, CGLineJoin lineJoin, nfloat miterLimit)
{
return MakeMutable (CGPathCreateCopyByStrokingPath (handle, &transform, lineWidth, lineCap, lineJoin, miterLimit));
}

[Mac(10,7)]
public unsafe CGPath CopyByStrokingPath (nfloat lineWidth, CGLineCap lineCap, CGLineJoin lineJoin, nfloat miterLimit)
{
return MakeMutable (CGPathCreateCopyByStrokingPath (handle, null, lineWidth, lineCap, lineJoin, miterLimit));
Expand All @@ -630,13 +623,11 @@ public CGPath CopyByTransformingPath (CGAffineTransform transform)
[DllImport (Constants.CoreGraphicsLibrary)]
unsafe extern static IntPtr CGPathCreateWithEllipseInRect (CGRect boundingRect, CGAffineTransform *transform);

[Mac(10,7)]
static public unsafe CGPath EllipseFromRect (CGRect boundingRect, CGAffineTransform transform)
{
return MakeMutable (CGPathCreateWithEllipseInRect (boundingRect, &transform));
}

[Mac(10,7)]
static public unsafe CGPath EllipseFromRect (CGRect boundingRect)
{
return MakeMutable (CGPathCreateWithEllipseInRect (boundingRect, null));
Expand All @@ -645,13 +636,11 @@ static public unsafe CGPath EllipseFromRect (CGRect boundingRect)
[DllImport (Constants.CoreGraphicsLibrary)]
unsafe extern static IntPtr CGPathCreateWithRect (CGRect boundingRect, CGAffineTransform *transform);

[Mac(10,7)]
static public unsafe CGPath FromRect (CGRect rectangle, CGAffineTransform transform)
{
return MakeMutable (CGPathCreateWithRect (rectangle, &transform));
}

[Mac(10,7)]
static public unsafe CGPath FromRect (CGRect rectangle)
{
return MakeMutable (CGPathCreateWithRect (rectangle, null));
Expand Down
Loading

3 comments on commit 7b83195

@xamarin-release-manager
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥 Jenkins job (on internal Jenkins) failed in stage(s) 'Test run' 🔥

Build succeeded
API Diff (from stable)
🔥 Failed to compare API and create generator diff 🔥
🔥 Test run failed 🔥

Test results

1 tests failed, 0 tests skipped, 283 tests passed.

Failed tests

  • System.ServiceModel/watchOS - simulator/Debug: Crashed

@dalexsoto
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test failures are unrelated:

  • System.ServiceModel/watchOS: https://github.com/xamarin/maccore/issues/581
  • generator diff requires rebuilding the previous commit so that’s tricky with large changes and mono bumps, will monitor in further commits to see if this issue persists.

@dalexsoto
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setting state to success where context is continuous-integration/jenkins/branch.

No blocking issues found

Please sign in to comment.