Merge remote-tracking branch 'origin/master' into mono-2018-08

dotnet · Oct 25, 2018 · 0ebc514 · 0ebc514
2 parents 545c7bf + d836c88
commit 0ebc514
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 12 deletions.
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.App.Common.targets
@@ -22,6 +22,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 	<PropertyGroup>
 		<IsWatchApp>True</IsWatchApp>
 		<IsWatch2App>True</IsWatch2App>
+		<IOSDebugOverWiFi>True</IOSDebugOverWiFi>
 	</PropertyGroup>
 
 	<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Common.targets" />

diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets
@@ -18,6 +18,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 	<PropertyGroup>
 		<IsAppExtension>True</IsAppExtension>
 		<IsWatchExtension>True</IsWatchExtension>
+		<IOSDebugOverWiFi>True</IOSDebugOverWiFi>
 		<AppBundleExtension>.appex</AppBundleExtension>
 		<MtouchHttpClientHandler Condition="'$(MtouchHttpClientHandler)' == ''">NSUrlSessionHandler</MtouchHttpClientHandler>
 

diff --git a/src/CoreGraphics/CGAffineTransform.cs b/src/CoreGraphics/CGAffineTransform.cs
@@ -107,11 +107,6 @@ public void Multiply (CGAffineTransform b)
 			y0 = a.x0 * b.yx + a.y0 * b.yy + b.y0;
 		}
 
-		public enum MatrixOrder {
-			Prepend = 0,
-			Append = 1,
-		}
-
 		public void Scale (nfloat sx, nfloat sy, MatrixOrder order)
 		{
 			switch (order) {

diff --git a/src/CoreGraphics/CGEnums.cs b/src/CoreGraphics/CGEnums.cs
@@ -0,0 +1,16 @@
+//
+// CGEnums.cs: Enumerations
+//
+// Author:
+//   Vincent Dondain (vidondai@microsoft.com)
+//
+// Copyright 2018 Microsoft
+//
+
+namespace CoreGraphics {
+
+	public enum MatrixOrder {
+		Prepend = 0,
+		Append = 1,
+	}
+}
diff --git a/src/frameworks.sources b/src/frameworks.sources
@@ -440,6 +440,7 @@ COREGRAPHICS_CORE_SOURCES = \
 	CoreGraphics/CGColorSpace.cs \
 	CoreGraphics/CGContext.cs \
 	CoreGraphics/CGDisplay.cs \
+	CoreGraphics/CGEnums.cs \
 	CoreGraphics/CGGeometry.cs \
 	CoreGraphics/CGGradient.cs \
 	CoreGraphics/CGImage.cs \

diff --git a/src/metal.cs b/src/metal.cs
@@ -2081,7 +2081,8 @@ partial interface MTLRenderCommandEncoder : MTLCommandEncoder {
 		[Abstract, Export ("setCullMode:")]
 		void SetCullMode (MTLCullMode cullMode);
 
-		[Mac (10,11, onlyOn64 : true), TV (11,0), iOS (11,0), NoWatch]
+		[iOS (9,0)] // Current headers claim this member was introduced in iOS 11, but it also shows up in Xcode 7's header (as introduced in iOS 9)
+		[Mac (10,11, onlyOn64 : true), TV (11,0), NoWatch]
 #if XAMCORE_4_0
 		// Apple added a new required member in iOS 9, but that breaks our binary compat, so we can't do that in our existing code.
 		[Abstract]

diff --git a/src/spritekit.cs b/src/spritekit.cs
@@ -158,10 +158,12 @@ partial interface SKNode : NSSecureCoding, NSCopying {
 		[return: NullAllowed]
 		SKNode Create (string filename, IntPtr classesPtr, out NSError error);
 
-#if MONOMAC || WATCH
 		[Export ("frame")]
-		CGRect Frame { get; }
+#if !(MONOMAC || WATCH)
+		// For iOS+tvOS we also get this property from the UIFocusItem protocol, but we redefine it here to get the right availability attributes.
+		new
 #endif
+		CGRect Frame { get; }
 
 		[Export ("calculateAccumulatedFrame")]
 		CGRect CalculateAccumulatedFrame ();

diff --git a/tests/monotouch-test/CoreGraphics/AffineTransformTest.cs b/tests/monotouch-test/CoreGraphics/AffineTransformTest.cs
@@ -153,7 +153,7 @@ public void Scale ()
 
 			var transform2 = CGAffineTransform.MakeTranslation (1, 2);
 			// t' = [ sx 0 0 sy 0 0 ] * t – Swift equivalent
-			transform2.Scale (3, 4, CGAffineTransform.MatrixOrder.Prepend);
+			transform2.Scale (3, 4, MatrixOrder.Prepend);
 
 			Assert.AreEqual ((nfloat)3, transform2.xx);
 			Assert.AreEqual ((nfloat)0, transform2.yx);
@@ -204,7 +204,7 @@ public void Translate ()
 			Assert.AreEqual ((nfloat)3, transform.y0, "y0");
 
 			transform = new CGAffineTransform (1, 2, 3, 4, 5, 6);
-			transform.Translate (2, -3, CGAffineTransform.MatrixOrder.Prepend);
+			transform.Translate (2, -3, MatrixOrder.Prepend);
 
 			Assert.AreEqual ((nfloat)1, transform.xx, "xx");
 			Assert.AreEqual ((nfloat)2, transform.yx, "yx");
@@ -259,7 +259,7 @@ public void Rotate ()
 			Assert.That ((double) (-6), Is.EqualTo ((double) transform.y0).Within (0.000001), "y0");
 
 			transform = new CGAffineTransform (1, 2, 3, 4, 5, 6);
-			transform.Rotate ((nfloat)Math.PI, CGAffineTransform.MatrixOrder.Prepend);
+			transform.Rotate ((nfloat)Math.PI, MatrixOrder.Prepend);
 
 			Assert.That ((double)(-1), Is.EqualTo ((double)transform.xx).Within (0.000001), "xx");
 			Assert.That ((double)(-2), Is.EqualTo ((double)transform.yx).Within (0.000001), "yx");

diff --git a/tests/xharness/Jenkins.cs b/tests/xharness/Jenkins.cs
@@ -183,7 +183,7 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
 				case "monotouch-test":
 					yield return new TestData { Variation = "Release (all optimizations)", MTouchExtraArgs = "--registrar:static --optimize:all", Debug = false, Profiling = false, Defines = "OPTIMIZEALL" };
 					yield return new TestData { Variation = "Debug (all optimizations)", MTouchExtraArgs = "--registrar:static --optimize:all", Debug = true, Profiling = false, Defines = "OPTIMIZEALL" };
-					yield return new TestData { Variation = "Debug (interpreter)", MTouchExtraArgs = "--interpreter", Debug = true, Profiling = false, Ignored = true, };
+					yield return new TestData { Variation = "Debug (interpreter)", MTouchExtraArgs = "--interpreter", Debug = true, Profiling = false, };
 					yield return new TestData { Variation = "Debug (interpreter -mscorlib)", MTouchExtraArgs = "--interpreter=-mscorlib", Debug = true, Profiling = false, Ignored = true, };
 					break;
 				case "mscorlib":