Merge pull request #9183 from mono/backport-pr-9182-to-release-8.3

slluis · web-flow · commit 081f7b8bbd53 · 2019-10-31T17:36:57.000+01:00
[release-8.3] [Mac] Disable memory monitor due to broken xammac binding
diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs
@@ -1380,7 +1380,8 @@ internal override IPlatformTelemetryDetails CreatePlatformTelemetryDetails ()
 			return MacTelemetryDetails.CreateTelemetryDetails ();
 		}
 
-		internal override MemoryMonitor CreateMemoryMonitor () => new MacMemoryMonitor ();
+		// Disabled due to https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1008370
+		//internal override MemoryMonitor CreateMemoryMonitor () => new MacMemoryMonitor ();
 
 		internal class MacMemoryMonitor : MemoryMonitor, IDisposable
 		{
diff --git a/main/tests/MacPlatform.Tests/MacPlatformTest.cs b/main/tests/MacPlatform.Tests/MacPlatformTest.cs
@@ -94,6 +94,7 @@ public void GetMimeType_Null ()
 		}
 
 		[Test]
+		[Ignore("https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1008370")]
 		public void MacHasProperMonitor ()
 		{
 			Assert.That (IdeServices.DesktopService.MemoryMonitor, Is.TypeOf<MacPlatformService.MacMemoryMonitor> ());

Original file line number	Diff line number	Diff line change
`@@ -1380,7 +1380,8 @@ internal override IPlatformTelemetryDetails CreatePlatformTelemetryDetails ()`
`1380`	`1380`	`return MacTelemetryDetails.CreateTelemetryDetails ();`
`1381`	`1381`	`}`
`1382`	`1382`
`1383`		`- internal override MemoryMonitor CreateMemoryMonitor () => new MacMemoryMonitor ();`
	`1383`	`+ // Disabled due to https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1008370`
	`1384`	`+ //internal override MemoryMonitor CreateMemoryMonitor () => new MacMemoryMonitor ();`
`1384`	`1385`
`1385`	`1386`	`internal class MacMemoryMonitor : MemoryMonitor, IDisposable`
`1386`	`1387`	`{`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ public void GetMimeType_Null ()`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`[Test]`
	`97`	`+ [Ignore("https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1008370")]`
`97`	`98`	`public void MacHasProperMonitor ()`
`98`	`99`	`{`
`99`	`100`	`Assert.That (IdeServices.DesktopService.MemoryMonitor, Is.TypeOf<MacPlatformService.MacMemoryMonitor> ());`