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

xamarin · Oct 25, 2018 · 36209e5 · 36209e5
1 parent 2755245
commit 36209e5
Show file tree

Hide file tree

Showing 60 changed files with 506 additions and 877 deletions.
diff --git a/src/AVFoundation/AVCaptureVideoPreviewLayer.cs b/src/AVFoundation/AVCaptureVideoPreviewLayer.cs
@@ -12,7 +12,7 @@ public partial class AVCaptureVideoPreviewLayer {
 
 		public enum InitMode {
 			WithConnection,
-			[iOS (8,0), Mac (10,7)]
+			[iOS (8,0)]
 			WithNoConnection,
 		}
 

diff --git a/src/AVFoundation/AVTypes.cs b/src/AVFoundation/AVTypes.cs
@@ -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);

diff --git a/src/AVFoundation/Enums.cs b/src/AVFoundation/Enums.cs
@@ -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 {
@@ -694,7 +692,6 @@ public enum AVMovieWritingOptions : ulong
 	}
 
 	[NoiOS][NoTV][NoWatch]
-	[Mac (10,7)]
 	[Native]
 	public enum AVContentAuthorizationStatus : long {
 		Unknown,

diff --git a/src/AppKit/Enums.cs b/src/AppKit/Enums.cs
@@ -1995,13 +1995,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 {
@@ -2013,10 +2013,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,
@@ -2058,7 +2058,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)]
@@ -2097,7 +2097,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
 	}
@@ -2406,7 +2406,6 @@ public enum NSWindowAnimationBehavior : long {
 		Default = 0, None = 2, DocumentWindow, UtilityWindow, AlertPanel
 	}
 
-	[Mac (10, 7)]
 	[Native]
 	public enum NSTextFinderAction : long {
 		ShowFindInterface = 1,

diff --git a/src/AppKit/NSAccessibility.cs b/src/AppKit/NSAccessibility.cs
@@ -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);
 

diff --git a/src/AppKit/NSColor.cs b/src/AppKit/NSColor.cs
@@ -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;

diff --git a/src/AppKit/NSStringAttributes.cs b/src/AppKit/NSStringAttributes.cs
@@ -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); }
@@ -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); }

diff --git a/src/AppKit/XEnums.cs b/src/AppKit/XEnums.cs
@@ -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,
@@ -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,
@@ -59,7 +55,6 @@ public enum NSCorrectionResponse : long {
 		Reverted
 	}
 
-	[Mac (10, 7)]
 	[Native]
 	public enum NSTextFinderMatchingType : long {
 		Contains = 0,

diff --git a/src/AudioToolbox/AudioQueue.cs b/src/AudioToolbox/AudioQueue.cs
@@ -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);

diff --git a/src/CoreFoundation/CFProxySupport.cs b/src/CoreFoundation/CFProxySupport.cs
@@ -254,7 +254,6 @@ public NSObject AutoConfigurationHTTPResponse {
 		}
 #endif
 
-		[Mac (10,7)]
 		public NSString AutoConfigurationJavaScript {
 			get {
 				if (AutoConfigurationJavaScriptKey == null)

diff --git a/src/CoreGraphics/CGPath.cs b/src/CoreGraphics/CGPath.cs
@@ -73,7 +73,6 @@ public CGPath ()
 			handle = CGPathCreateMutable ();
 		}
 
-		[Mac(10,7)]
 		public CGPath (CGPath reference, CGAffineTransform transform)
 		{
 			if (reference == null)
@@ -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);
@@ -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));
@@ -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));
@@ -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));

diff --git a/src/CoreMedia/CMBlockBuffer.cs b/src/CoreMedia/CMBlockBuffer.cs
@@ -40,7 +40,6 @@ public enum CMBlockBufferFlags : uint {
 		PermitEmptyReference	= (1<<3)
 	}
 
-	[Mac (10,7)]
 	public class CMBlockBuffer : ICMAttachmentBearer, IDisposable {
 		internal IntPtr handle;
 		internal CMCustomBlockAllocator customAllocator;

diff --git a/src/CoreMedia/CMMemoryPool.cs b/src/CoreMedia/CMMemoryPool.cs
@@ -15,7 +15,7 @@
 
 namespace CoreMedia {
 
-	[iOS (6,0)][Mac (10,8)]
+	[iOS (6,0)]
 	public partial class CMMemoryPool : IDisposable, INativeObject
 	{
 		IntPtr handle;

diff --git a/src/CoreMedia/CMSync.cs b/src/CoreMedia/CMSync.cs
@@ -26,7 +26,7 @@ public enum CMClockError : int
 	}
 
 	// CMSync.h
-	[iOS (6,0)][Mac (10,8)]
+	[iOS (6,0)]
 	public class CMClock : CMClockOrTimebase
 	{
 		public CMClock (IntPtr handle) : base (handle)
@@ -122,7 +122,7 @@ public enum CMTimebaseError : int
 		ReadOnly					= -12757,
 	}
 
-	[iOS (6,0)][Mac (10,8)]
+	[iOS (6,0)]
 	public class CMTimebase : CMClockOrTimebase
 	{
 		public CMTimebase (IntPtr handle)
@@ -214,7 +214,6 @@ public double Rate {
 
 		[iOS (6, 0)]
 		[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'CopyMasterTimebase' instead.")]
-		[Mac (10, 8)]
 		[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'CopyMasterTimebase' instead.")]
 		public CMTimebase GetMasterTimebase ()
 		{
@@ -230,7 +229,6 @@ public CMTimebase GetMasterTimebase ()
 
 		[iOS (6, 0)]
 		[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'CopyMasterClock' instead.")]
-		[Mac (10, 8)]
 		[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'CopyMasterClock' instead.")]
 		public CMClock GetMasterClock ()
 		{
@@ -246,7 +244,6 @@ public CMClock GetMasterClock ()
 
 		[iOS (6, 0)]
 		[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'CopyMaster' instead.")]
-		[Mac (10, 8)]
 		[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'CopyMaster' instead.")]
 		public CMClockOrTimebase GetMaster ()
 		{
@@ -262,7 +259,6 @@ public CMClockOrTimebase GetMaster ()
 
 		[iOS (6, 0)]
 		[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'CopyUltimateMasterClock' instead.")]
-		[Mac (10, 8)]
 		[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'CopyUltimateMasterClock' instead.")]
 		public CMClock GetUltimateMasterClock ()
 		{
@@ -477,7 +473,7 @@ public enum CMSyncError : int {
 		RateMustBeNonZero			= -12755,
 	}
 
-	[iOS (6,0)][Mac (10,8)]
+	[iOS (6,0)]
 	public class CMClockOrTimebase : IDisposable, INativeObject
 	{
 		internal IntPtr handle;

diff --git a/src/CoreText/CTFont.cs b/src/CoreText/CTFont.cs
@@ -1993,11 +1993,11 @@ public CGRect GetBoundingRects (CTFontOrientation orientation, CGGlyph[] glyphs,
 			return CTFontGetBoundingRectsForGlyphs (handle, orientation, glyphs, boundingRects, count);
 		}
 
-		[iOS (6,0)][Mac (10,8)]
+		[iOS (6,0)]
 		[DllImport (Constants.CoreTextLibrary)]
 		static extern CGRect CTFontGetOpticalBoundsForGlyphs (IntPtr font, [In] CGGlyph[] glyphs, [Out] CGRect[] boundingRects, nint count, nuint options);
 
-		[iOS (6,0)][Mac (10,8)]
+		[iOS (6,0)]
 		public CGRect GetOpticalBounds (CGGlyph[] glyphs, CGRect[] boundingRects, nint count, CTFontOptions options = 0)
 		{
 			AssertCount (count);
@@ -2199,12 +2199,12 @@ public NSData GetFontTableData (CTFontTable table, CTFontTableOptions options)
 #endregion
 
 #region
-		[iOS (6,0)][Mac (10, 8)]
+		[iOS (6,0)]
 		[DllImport (Constants.CoreTextLibrary)]
 		extern static /* CFArrayRef __nullable */ IntPtr CTFontCopyDefaultCascadeListForLanguages (
 			/* CTFontRef __nonnull */ IntPtr font, /* CFArrayRef __nullable */ IntPtr languagePrefList);
 
-		[iOS (6,0)][Mac (10, 8)]
+		[iOS (6,0)]
 		public CTFontDescriptor [] GetDefaultCascadeList (string [] languages)
 		{
 			using (var arr = languages == null ? null : NSArray.FromStrings (languages)) {