Merge remote-tracking branch 'origin/master' into bump-xamarin-forms-…

…book-samples
xamarin · May 31, 2019 · 5a8acb5 · 5a8acb5 · xamarin-release-manager · May 31, 2019
2 parents bd7e48e + 614de0b
commit 5a8acb5
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 21 deletions.
diff --git a/mk/xamarin.mk b/mk/xamarin.mk
@@ -1,5 +1,5 @@
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := 104656b89060d3c98cdc626709f7cadc467549af
+NEEDED_MACCORE_VERSION := 454450958e601857ce244ccaa9a2f1a377dabc87
 NEEDED_MACCORE_BRANCH := master
 
 MACCORE_DIRECTORY := maccore

diff --git a/src/generator.cs b/src/generator.cs
@@ -5228,13 +5228,7 @@ void GenerateAsyncMethod (MemberInformation original_minfo, AsyncMethodKind asyn
 	void PrintMethodAttributes (MemberInformation minfo)
 	{
 		MethodInfo mi = minfo.method;
-
-		foreach (var oa in AttributeManager.GetCustomAttributes<ObsoleteAttribute> (mi)) {
-			print ("[Obsolete (\"{0}\", {1})]",
-			       oa.Message, oa.IsError ? "true" : "false");
-			print ("[EditorBrowsable (EditorBrowsableState.Never)]");
-
-		}
+		var editor_browsable_attribute = false;
 
 		foreach (var sa in AttributeManager.GetCustomAttributes<ThreadSafeAttribute> (mi)) 
 			print (sa.Safe ? "[ThreadSafe]" : "[ThreadSafe (false)]");
@@ -5245,6 +5239,13 @@ void PrintMethodAttributes (MemberInformation minfo)
 			} else {
 				print ("[EditorBrowsable (EditorBrowsableState.{0})]", ea.State);
 			}
+			editor_browsable_attribute = true;
+		}
+
+		foreach (var oa in AttributeManager.GetCustomAttributes<ObsoleteAttribute> (mi)) {
+			print ("[Obsolete (\"{0}\", {1})]", oa.Message, oa.IsError ? "true" : "false");
+			if (!editor_browsable_attribute)
+				print ("[EditorBrowsable (EditorBrowsableState.Never)]");
 		}
 
 		if (minfo.is_return_release)

diff --git a/tests/bcl-test/BCLTests/BCLTests-tv.csproj.in b/tests/bcl-test/BCLTests/BCLTests-tv.csproj.in
@@ -7,8 +7,8 @@
     <ProjectGuid>{C459A4DD-0AFF-4B2C-9DEC-4B62CE04F4E2}</ProjectGuid>
     <ProjectTypeGuids>{06FA79CB-D6CD-4721-BB4B-1BD202089C55}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
-    <RootNamespace>%NAME%</RootNamespace>
-    <AssemblyName>%NAME%</AssemblyName>
+    <RootNamespace>com.xamarin.bcltests.%NAME%</RootNamespace>
+    <AssemblyName>com.xamarin.bcltests.%NAME%</AssemblyName>
     <NoWarn>67,168,169,219,414,612,618,649,672</NoWarn>
     <TargetFrameworkIdentifier>Xamarin.TVOS</TargetFrameworkIdentifier>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>

diff --git a/tests/bcl-test/BCLTests/Info-tv.plist.in b/tests/bcl-test/BCLTests/Info-tv.plist.in
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleName</key>
-	<string>%APPLICATION NAME%</string>
+	<string>com.xamarin.bcltests.%APPLICATION NAME%</string>
 	<key>CFBundleIdentifier</key>
 	<string>%BUNDLE INDENTIFIER%</string>
 	<key>CFBundleShortVersionString</key>

diff --git a/tests/bcl-test/BCLTests/tvOS-monotouch_corlib_xunit-test.dll.ignore b/tests/bcl-test/BCLTests/tvOS-monotouch_corlib_xunit-test.dll.ignore
@@ -0,0 +1,9 @@
+# device failures:
+
+# Expected: 0
+# Actual:   -1 
+System.IO.Tests.FileInfo_Exists.TrueForNonRegularFile
+System.IO.Tests.DirectoryInfo_Exists.FalseForNonRegularFile
+
+# Exception messages: System.NullReferenceException : Object reference not set to an instance of an object
+System.Threading.Tasks.Tests.TaskSchedulerTests.GetScheduledTasksForDebugger_DebuggerAttached_ReturnsTasksFromCustomSchedulers
diff --git a/tests/generator/BGenTool.cs b/tests/generator/BGenTool.cs
@@ -151,11 +151,19 @@ int Execute ()
 			var in_process = InProcess && Profile != Profile.macOSClassic;
 			if (in_process) {
 				int rv;
+				var previous_environment = new Dictionary<string, string> ();
+				foreach (var kvp in EnvironmentVariables) {
+					previous_environment [kvp.Key] = Environment.GetEnvironmentVariable (kvp.Key);
+					Environment.SetEnvironmentVariable (kvp.Key, kvp.Value);
+				}
 				ThreadStaticTextWriter.ReplaceConsole (Output);
 				try {
 					rv = BindingTouch.Main (arguments);
 				} finally {
 					ThreadStaticTextWriter.RestoreConsole ();
+					foreach (var kvp in previous_environment) {
+						Environment.SetEnvironmentVariable (kvp.Key, kvp.Value);
+					}
 				}
 				Console.WriteLine (Output);
 				ParseMessages ();

diff --git a/tests/monotouch-test/Metal/MTLDeviceTests.cs b/tests/monotouch-test/Metal/MTLDeviceTests.cs
@@ -110,14 +110,16 @@ public void ReturnReleaseTest ()
 			}
 
 #if __MACOS__
-			using (var descriptor = MTLTextureDescriptor.CreateTexture2DDescriptor (MTLPixelFormat.RGBA8Unorm, 64, 64, false)) {
-				descriptor.StorageMode = MTLStorageMode.Private;
-				using (var texture = device.CreateSharedTexture (descriptor)) {
-					Assert.IsNotNull (texture, "CreateSharedTexture (MTLTextureDescriptor): NonNull");
-
-					using (var handle = texture.CreateSharedTextureHandle ())
-					using (var shared = device.CreateSharedTexture (handle))
-						Assert.IsNotNull (texture, "CreateSharedTexture (MTLSharedTextureHandle): NonNull");
+			if (TestRuntime.CheckXcodeVersion (10, 0)) {
+				using (var descriptor = MTLTextureDescriptor.CreateTexture2DDescriptor (MTLPixelFormat.RGBA8Unorm, 64, 64, false)) {
+					descriptor.StorageMode = MTLStorageMode.Private;
+					using (var texture = device.CreateSharedTexture (descriptor)) {
+						Assert.IsNotNull (texture, "CreateSharedTexture (MTLTextureDescriptor): NonNull");
+
+						using (var handle = texture.CreateSharedTextureHandle ())
+						using (var shared = device.CreateSharedTexture (handle))
+							Assert.IsNotNull (texture, "CreateSharedTexture (MTLSharedTextureHandle): NonNull");
+					}
 				}
 			}
 #endif

diff --git a/tests/monotouch-test/System.Net.Http/MessageHandlers.cs b/tests/monotouch-test/System.Net.Http/MessageHandlers.cs
@@ -169,6 +169,11 @@ public void RejectSslCertificatesServicePointManager (Type handlerType)
 			TestRuntime.AssertSystemVersion (PlatformName.MacOSX, 10, 9, throwIfOtherPlatform: false);
 			TestRuntime.AssertSystemVersion (PlatformName.iOS, 7, 0, throwIfOtherPlatform: false);
 
+#if __MACOS__
+			if (handlerType == typeof (NSUrlSessionHandler) && TestRuntime.CheckSystemVersion (PlatformName.MacOSX, 10, 10, 0) && !TestRuntime.CheckSystemVersion (PlatformName.MacOSX, 10, 11, 0))
+				Assert.Ignore ("Fails on macOS 10.10: https://github.com/xamarin/maccore/issues/1645");
+#endif
+
 			bool servicePointManagerCbWasExcuted = false;
 			bool done = false;
 			Exception ex = null;

diff --git a/tools/bcl-test-importer/BCLTestImporter/BCLTestProjectGenerator.cs b/tools/bcl-test-importer/BCLTestImporter/BCLTestProjectGenerator.cs
@@ -161,8 +161,6 @@ public class BclTestProjectInfo {
 		static readonly List<string> iOSIgnoredAssemblies = new List<string> {};
 
 		static readonly List<string> tvOSIgnoredAssemblies = new List<string> {
-			"monotouch_corlib_xunit-test.dll", // ignored due to https://github.com/xamarin/maccore/issues/1611 until mono fixes it
-			"monotouch_System_xunit-test.dll", // ignored due to https://github.com/xamarin/maccore/issues/1610
 		};
 
 		static readonly List<string> watcOSIgnoredAssemblies = new List<string> {