Merge branch 'main' into darc-main-38ef8300-a7b5-4ebc-9dd4-75e9ac8721ed

xamarin · Apr 17, 2021 · 50e7fcc · 50e7fcc · vs-mobiletools-engineering-service2 · Apr 17, 2021
2 parents c837f58 + dec81b6
commit 50e7fcc
Show file tree

Hide file tree

Showing 58 changed files with 668 additions and 29 deletions.
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets
@@ -81,7 +81,6 @@
                             RuntimePackNamePatterns="Microsoft.$(_PlatformName).Runtime.**RID**"
                             RuntimePackRuntimeIdentifiers="$(_RuntimePackRuntimeIdentifiers)"
                             Profile="$(_PlatformName)"
-                            IsTrimmable="true"
                             />
   </ItemGroup>
 

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -696,7 +696,7 @@
 			<ResolvedFileToPublish
 				Update="@(ResolvedFileToPublish)"
 				RelativePath="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory)$(PublishDir),$(_DylibPublishDir)))\%(Filename)%(Extension)"
-				Condition="'$(_SdkIsSimulator)' != 'false' And '%(Extension)' == '.dylib'" />
+				Condition="('$(_SdkIsSimulator)' != 'false' Or '$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst') And '%(Extension)' == '.dylib'" />
 			<ResolvedFileToPublish
 				Update="@(ResolvedFileToPublish)"
 				RelativePath="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory)$(PublishDir),$(_AssemblyPublishDir)))\%(Filename)%(Extension)"

diff --git a/src/AssemblyInfo.cs.in b/src/AssemblyInfo.cs.in
@@ -16,4 +16,6 @@ using System.Runtime.CompilerServices;
 // [assembly: AssemblyCopyright ("Copyright 2011-2014 Xamarin Inc.")]
 [assembly: AssemblyCompany ("Xamarin Inc.")]
 
+[assembly: AssemblyMetadata ("IsTrimmable", "True")]
+
 [assembly: InternalsVisibleTo ("System.Net.Http,PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
diff --git a/src/Compression/Compression.cs b/src/Compression/Compression.cs
@@ -16,7 +16,9 @@
 
 namespace Compression
 {
+#if !NET
 	[iOS (9,0), Mac (10,11)]
+#endif
 	public partial class CompressionStream : Stream
 	{
 		private const int DefaultBufferSize = 8192;

diff --git a/src/Compression/CompressionStreamStruct.cs b/src/Compression/CompressionStreamStruct.cs
@@ -6,8 +6,9 @@
 
 namespace Compression
 {
-
+#if !NET
 		[iOS (9,0), Mac (10,11)]
+#endif
 		[StructLayout(LayoutKind.Sequential)]
 		struct CompressionStreamStruct {
 			public IntPtr Destination; // uint8_t * dst_ptr

diff --git a/src/Compression/Enums.cs b/src/Compression/Enums.cs
@@ -4,8 +4,10 @@
 
 namespace Compression {
 
-	// this enum as per the headers is an int NOT an NSInterger
+	// this enum as per the headers is an int NOT an NSInteger
+#if !NET
 	[iOS (9,0), TV (9,0), Mac (10,11)]
+#endif
 	public enum CompressionAlgorithm {
 		LZ4 = 0x100,
 		LZ4Raw = 0x101,

diff --git a/src/CoreData/NSEntityDescription.cs b/src/CoreData/NSEntityDescription.cs
@@ -15,7 +15,9 @@ namespace CoreData
 {
 	public partial class NSEntityDescription
 	{
+#if !NET
 		[iOS (9,0), Mac (10,11)]
+#endif
 		public NSObject[][] UniquenessConstraints {
 			get { return NSArray.FromArrayOfArray (_UniquenessConstraints); }
 			set { _UniquenessConstraints = NSArray.From (value); }

diff --git a/src/CoreImage/CIContext.cs b/src/CoreImage/CIContext.cs
@@ -24,6 +24,9 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
+
+using System.Runtime.Versioning;
+
 using Foundation;
 using CoreGraphics;
 using CoreFoundation;
@@ -86,7 +89,9 @@ public int? CIImageFormat {
 			}
 		}
 
+#if !NET
 		[Mac (10,12)]
+#endif
 		public bool? PriorityRequestLow {
 			get {
 				return GetBoolValue (CIContext.PriorityRequestLow);
@@ -105,7 +110,9 @@ public bool? HighQualityDownsample {
 			}
 		}
 
+#if !NET
 		[iOS (7,0)]
+#endif
 		public bool? OutputPremultiplied {
 			get {
 				return GetBoolValue (CIContext.OutputPremultiplied);
@@ -115,7 +122,9 @@ public bool? OutputPremultiplied {
 			}
 		}
 
+#if !NET
 		[iOS (10,0)][Mac (10,12)]
+#endif
 		public bool? CacheIntermediates {
 			get {
 				return GetBoolValue (CIContext.CacheIntermediates);
@@ -125,7 +134,13 @@ public bool? CacheIntermediates {
 			}
 		}
 
+#if NET
+		[SupportedOSPlatform ("ios13.0")]
+		[SupportedOSPlatform ("tvos13.0")]
+		[SupportedOSPlatform ("macos10.15")]
+#else
 		[iOS (13,0)][TV (13,0)][Mac (10,15)]
+#endif
 		public bool? AllowLowPower {
 			get {
 				return GetBoolValue (CIContext.AllowLowPower);
@@ -135,7 +150,13 @@ public bool? AllowLowPower {
 			}
 		}
 
+#if NET
+		[SupportedOSPlatform ("ios14.0")]
+		[SupportedOSPlatform ("tvos14.0")]
+		[SupportedOSPlatform ("macos11.0")]
+#else
 		[iOS (14,0)][TV (14,0)][Mac (11,0)]
+#endif
 		public string? Name {
 			get {
 				return GetStringValue (CIContext.Name);
@@ -148,7 +169,9 @@ public string? Name {
 
 	public partial class CIContext {
 
+#if !NET
 		[iOS (8,0)]
+#endif
 		public CIContext (CIContextOptions options) :
 			this (options?.Dictionary)
 		{
@@ -183,7 +206,11 @@ public static CIContext FromMetalDevice (IMTLDevice device, CIContextOptions? op
 #endif
 
 #if MONOMAC
+#if NET
+		[UnsupportedOSPlatform ("macos10.11")]
+#else
 		[Deprecated (PlatformName.MacOSX, 10, 11)]
+#endif
 		public CGLayer? CreateCGLayer (CGSize size)
 		{
 			return CreateCGLayer (size, null);

diff --git a/src/CoreImage/CIDetectorOptions.cs b/src/CoreImage/CIDetectorOptions.cs
@@ -19,7 +19,9 @@ public partial class CIDetectorOptions  {
 		public FaceDetectorAccuracy? Accuracy { get; set; }
 		public float? MinFeatureSize { get; set; }
 
+#if !NET
 		[iOS (10,0)][Mac (10,12)]
+#endif
 		public int? MaxFeatureCount { get; set; }
 
 		public bool? TrackingEnabled { get; set; }

diff --git a/src/CoreImage/CIFilter.cs b/src/CoreImage/CIFilter.cs
@@ -119,7 +119,10 @@
 
 namespace CoreImage {
 	public partial class CIFilter {
+
+#if !NET
 		[iOS (8,0)]
+#endif
 		protected CIFilter () : base ()
 		{
 		}

diff --git a/src/CoreImage/CIImage.cs b/src/CoreImage/CIImage.cs
@@ -47,9 +47,13 @@ public class CIAutoAdjustmentFilterOptions {
 
 		public CIImageOrientation? ImageOrientation;
 
+#if !NET
 		[iOS (8,0)]
+#endif
 		public bool? AutoAdjustCrop;
+#if !NET
 		[iOS (8,0)]
+#endif
 		public bool? AutoAdjustLevel;
 
 		internal NSDictionary? ToDictionary ()

diff --git a/src/CoreImage/Enums.cs b/src/CoreImage/Enums.cs
@@ -22,6 +22,7 @@
 //
 
 using System;
+using System.Runtime.Versioning;
 using ObjCRuntime;
 
 #nullable enable
@@ -76,9 +77,14 @@ public enum CIFormat {
 		RGf = 22
 	}
 
+#if NET
+	[SupportedOSPlatform ("ios11.0")]
+	[SupportedOSPlatform ("tvos11.0")]
+#else
 	[iOS (11,0)]
 	[Mac (10,13)]
 	[TV (11,0)]
+#endif
 	[Native]
 	public enum CIQRCodeErrorCorrectionLevel : long {
 		L = 76,
@@ -87,9 +93,14 @@ public enum CIQRCodeErrorCorrectionLevel : long {
 		H = 72,
 	}
 
+#if NET
+	[SupportedOSPlatform ("ios11.0")]
+	[SupportedOSPlatform ("tvos11.0")]
+#else
 	[iOS (11,0)]
 	[Mac (10,13)]
 	[TV (11,0)]
+#endif
 	[Native]
 	public enum CIDataMatrixCodeEccVersion : long {
 		V000 = 0,
@@ -100,9 +111,14 @@ public enum CIDataMatrixCodeEccVersion : long {
 		V200 = 200,
 	}
 
+#if NET
+	[SupportedOSPlatform ("ios11.0")]
+	[SupportedOSPlatform ("tvos11.0")]
+#else
 	[iOS (11,0)]
 	[Mac (10,13)]
 	[TV (11,0)]
+#endif
 	[Native]
 	public enum CIRenderDestinationAlphaMode : ulong {
 		None = 0,

diff --git a/src/CoreMedia/CMBufferQueue.cs b/src/CoreMedia/CMBufferQueue.cs
@@ -26,7 +26,9 @@ namespace CoreMedia {
 	public delegate bool   CMBufferGetBool (INativeObject buffer);
 	public delegate int    CMBufferCompare (INativeObject first, INativeObject second);
 
+#if !NET
 	[iOS (7,1), Watch (6,0)]
+#endif
 	public delegate nint   CMBufferGetSize (INativeObject buffer);
 
 	public class CMBufferQueue : INativeObject
@@ -294,12 +296,16 @@ public CMTime Duration {
 			}
 		}
 
+#if !NET
 		[iOS (7,1)][Mac (10,10)]
+#endif
 		[DllImport(Constants.CoreMediaLibrary)]
 		extern static /* size_t */ nint CMBufferQueueGetTotalSize (/* CMBufferQueueRef */ IntPtr queue);
 
+#if !NET
 		[iOS (7,1)]
 		[Mac (10, 10)]
+#endif
 		public nint GetTotalSize ()
 		{
 			return CMBufferQueueGetTotalSize (handle);
@@ -367,7 +373,9 @@ static nint GetTotalSize (IntPtr buffer, IntPtr refcon)
 		}
 #endif // !COREBUILD
 
+#if !NET
 		[Watch (6,0)]
+#endif
 		public enum TriggerCondition {
 			WhenDurationBecomesLessThan = 1,
 			WhenDurationBecomesLessThanOrEqualTo = 2,

diff --git a/src/CoreMidi/MidiCIDeviceIdentification.cs b/src/CoreMidi/MidiCIDeviceIdentification.cs
@@ -1,13 +1,19 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 using ObjCRuntime;
 using CoreFoundation;
 using Foundation;
 
 namespace CoreMidi {
 
+#if NET
+	[SupportedOSPlatform ("ios12.0")]
+	[UnsupportedOSPlatform ("tvos")]
+#else
 	[NoWatch, NoTV, Mac (10,14), iOS (12,0)]
+#endif
 	[StructLayout (LayoutKind.Sequential)]
 	public struct MidiCIDeviceIdentification {
 		[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]