diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2019-10-31 19:36:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 19:36:57 +0300 |
| commit | 081f7b8bbd534cb73bbfb5cff3d9aa4907396a4f (patch) | |
| tree | 34e9102b28e36050ae3bc42c8bd1efc0da2d381d | |
| parent | a3fef7ee5c47ec188597daf9290b2039cddd2ed3 (diff) | |
| parent | c265e82ae202745715d5ce6cffd34e97db76a0fa (diff) | |
Merge pull request #9183 from mono/backport-pr-9182-to-release-8.3monodevelop-8.3.6.4
[release-8.3] [Mac] Disable memory monitor due to broken xammac binding
| -rw-r--r-- | main/src/addins/MacPlatform/MacPlatform.cs | 3 | ||||
| -rw-r--r-- | main/tests/MacPlatform.Tests/MacPlatformTest.cs | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs index be55443a6d..522b3882e7 100644 --- a/main/src/addins/MacPlatform/MacPlatform.cs +++ b/main/src/addins/MacPlatform/MacPlatform.cs @@ -1380,7 +1380,8 @@ namespace MonoDevelop.MacIntegration 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 index dd5bfc90e2..c44b385076 100644 --- a/main/tests/MacPlatform.Tests/MacPlatformTest.cs +++ b/main/tests/MacPlatform.Tests/MacPlatformTest.cs @@ -94,6 +94,7 @@ namespace MacPlatform.Tests } [Test] + [Ignore("https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1008370")] public void MacHasProperMonitor () { Assert.That (IdeServices.DesktopService.MemoryMonitor, Is.TypeOf<MacPlatformService.MacMemoryMonitor> ()); |