diff --git a/tests/mmptest/regression/Makefile b/tests/mmptest/regression/Makefile
index f3a4400758..dadb8ae87a 100644
--- a/tests/mmptest/regression/Makefile
+++ b/tests/mmptest/regression/Makefile
@@ -11,8 +11,6 @@ export XamarinMacFrameworkRoot=$(MAC_DESTDIR)/Library/Frameworks/Xamarin.Mac.fra
TESTS_4_0 = \
- link-gdiplus-1 \
- link-gdiplus-2 \
link-posix-1 \
link-posix-2 \
link-system.web-icalls \
diff --git a/tests/mmptest/regression/link-gdiplus-1/Info.plist b/tests/mmptest/regression/link-gdiplus-1/Info.plist
deleted file mode 100644
index 0e3da8ff85..0000000000
--- a/tests/mmptest/regression/link-gdiplus-1/Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- CFBundleIdentifier
- com.yourcompany.link-gdiplus-1
- CFBundleName
- link-gdiplus-1
- CFBundleVersion
- 1
- LSMinimumSystemVersion
- 10.9
- NSMainNibFile
- MainMenu
- NSPrincipalClass
- NSApplication
- LSUIElement
- 1
-
-
diff --git a/tests/mmptest/regression/link-gdiplus-1/LinkGdiPlus1.cs b/tests/mmptest/regression/link-gdiplus-1/LinkGdiPlus1.cs
deleted file mode 100644
index 7a75a77f51..0000000000
--- a/tests/mmptest/regression/link-gdiplus-1/LinkGdiPlus1.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Drawing;
-using System.IO;
-using System.Reflection;
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-
-// Test
-// * application references System.Drawing
-// * application creates a Bitmap which pinvoke into gdiplus
-// * linker includes libgdiplus.dylib in the application bundle
-//
-// Requirement
-// * Link SDK or Link All must be enabled
-
-namespace Xamarin.Mac.Linker.Test {
-
- class GdiPlus1 {
-
- static void Main (string[] args)
- {
- NSApplication.Init ();
-
- Test.EnsureLinker (true);
-
- bool gdiplus = false;
- string msg = "Bitmap created";
- try {
- Bitmap b = new Bitmap (32, 32);
- gdiplus = (b != null);
- }
- catch (Exception e) {
- msg = e.ToString ();
- }
-
- Test.Log.WriteLine ("{0}\t{1}", gdiplus ? "[PASS]" : "[FAIL]", msg);
-
- string path = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
- bool bundled = File.Exists (Path.Combine (path, "libgdiplus.dylib"));
- Test.Log.WriteLine ("{0}\t{1}", bundled ? "[PASS]" : "[FAIL]", "libgdiplus present in bundle");
-
- Test.Terminate ();
- }
- }
-}
\ No newline at end of file
diff --git a/tests/mmptest/regression/link-gdiplus-1/link-gdiplus-1.csproj b/tests/mmptest/regression/link-gdiplus-1/link-gdiplus-1.csproj
deleted file mode 100644
index d3f5431d91..0000000000
--- a/tests/mmptest/regression/link-gdiplus-1/link-gdiplus-1.csproj
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
- Debug
- x86
- 8.0.30703
- 2.0
- {150FA3E6-0AFA-417E-A7FA-B13E95B46CF0}
- {42C0BBD9-55CE-4FC1-8D90-A7348ABAFB23};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Exe
- linkgdiplus1
- Resources
- link-gdiplus-1
-
-
- True
- full
- False
- bin\Debug
- DEBUG;
- prompt
- 4
- True
- False
- False
- Mac Developer
- False
- False
- x86
- 3rd Party Mac Developer Installer
-
-
- Full
- false
- false
-
-
- none
- True
- bin\Release
- prompt
- 4
- Full
- False
- False
- False
- Mac Developer
- False
- False
- x86
- false
- false
-
-
- none
- True
- bin\x86\AppStore
- prompt
- 4
- Full
- True
- 3rd Party Mac Developer Installer
- True
- True
- 3rd Party Mac Developer Application
- True
- False
- x86
- false
- false
-
-
-
-
-
- ..\..\..\..\src\build\compat\XamMac.dll
-
-
-
-
-
-
-
-
-
-
- Test.cs
-
-
-
-
- MainMenu.xib
-
-
-
\ No newline at end of file
diff --git a/tests/mmptest/regression/link-gdiplus-2/Info.plist b/tests/mmptest/regression/link-gdiplus-2/Info.plist
deleted file mode 100644
index 74e300332b..0000000000
--- a/tests/mmptest/regression/link-gdiplus-2/Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- CFBundleIdentifier
- com.yourcompany.link-gdiplus-2
- CFBundleName
- link-gdiplus-2
- CFBundleVersion
- 1
- LSMinimumSystemVersion
- 10.9
- NSMainNibFile
- MainMenu
- NSPrincipalClass
- NSApplication
- LSUIElement
- 1
-
-
diff --git a/tests/mmptest/regression/link-gdiplus-2/LinkGdiPlus2.cs b/tests/mmptest/regression/link-gdiplus-2/LinkGdiPlus2.cs
deleted file mode 100644
index cf839872cd..0000000000
--- a/tests/mmptest/regression/link-gdiplus-2/LinkGdiPlus2.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Reflection;
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-
-// Test
-// * application references System.Drawing.BitmapData
-// * linker must include all the private fields of the class (used or not)
-// * linker does NOT include libgdiplus.dylib in the application bundle
-//
-// Requirement
-// * Link SDK or Link All must be enabled
-
-namespace Xamarin.Mac.Linker.Test {
-
- class GdiPlus2 {
-
- static void Main (string[] args)
- {
- NSApplication.Init ();
-
- Test.EnsureLinker (true);
-
- int fcount = typeof (BitmapData).GetFields (BindingFlags.NonPublic | BindingFlags.Instance).Length;
- Test.Log.WriteLine ("{0}\tBitmapData {1}/17 fields protected by linker", fcount == 17 ? "[PASS]" : "[FAIL]", fcount);
-
- // there's no [DllImport] on BitmapData so libgdiplus.dylib should not be copied into the bundle
- string path = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
- bool bundled = File.Exists (Path.Combine (path, "libgdiplus.dylib"));
- Test.Log.WriteLine ("{0}\t{1}", !bundled ? "[PASS]" : "[FAIL]", "libgdiplus not present in bundle");
-
- Test.Terminate ();
- }
- }
-}
\ No newline at end of file
diff --git a/tests/mmptest/regression/link-gdiplus-2/link-gdiplus-2.csproj b/tests/mmptest/regression/link-gdiplus-2/link-gdiplus-2.csproj
deleted file mode 100644
index 14a9886dc7..0000000000
--- a/tests/mmptest/regression/link-gdiplus-2/link-gdiplus-2.csproj
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
- Debug
- x86
- 8.0.30703
- 2.0
- {CB3AC1BE-2C81-4CAF-A9AA-5838816CA705}
- {42C0BBD9-55CE-4FC1-8D90-A7348ABAFB23};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Exe
- linkgdiplus2
- Resources
- link-gdiplus-2
-
-
- True
- full
- False
- bin\Debug
- DEBUG;
- prompt
- 4
- True
- False
- False
- Mac Developer
- False
- False
- x86
- 3rd Party Mac Developer Installer
-
-
- Full
- false
- false
-
-
- none
- True
- bin\Release
- prompt
- 4
- Full
- False
- False
- False
- Mac Developer
- False
- False
- x86
- false
- false
-
-
- none
- True
- bin\x86\AppStore
- prompt
- 4
- Full
- True
- 3rd Party Mac Developer Installer
- True
- True
- 3rd Party Mac Developer Application
- True
- False
- x86
- false
- false
-
-
-
-
-
- ..\..\..\..\src\build\compat\XamMac.dll
-
-
-
-
-
-
-
-
-
- MainMenu.xib
-
-
-
-
- Test.cs
-
-
-
-
\ No newline at end of file
diff --git a/tests/mmptest/regression/tests.sln b/tests/mmptest/regression/tests.sln
index a4d312039f..a4c9f4af1f 100644
--- a/tests/mmptest/regression/tests.sln
+++ b/tests/mmptest/regression/tests.sln
@@ -5,8 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link-posix-1", "link-posix-
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link-posix-2", "link-posix-2\link-posix-2.csproj", "{141239A4-4094-4349-A3F3-00CD16643226}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link-gdiplus-1", "link-gdiplus-1\link-gdiplus-1.csproj", "{150FA3E6-0AFA-417E-A7FA-B13E95B46CF0}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link-webclient-1", "link-webclient-1\link-webclient-1.csproj", "{148DC17B-B29F-48A7-97CD-EECE26015B25}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link-webclient-2", "link-webclient-2\link-webclient-2.csproj", "{FA5882C9-C02D-4C7B-963B-AEA929D01390}"
@@ -17,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link-httpclient-async", "li
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link-webclient-3", "link-webclient-3\link-webclient-3.csproj", "{359E3AA4-A0E2-41A5-A5C5-03D322B71FE4}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link-gdiplus-2", "link-gdiplus-2\link-gdiplus-2.csproj", "{CB3AC1BE-2C81-4CAF-A9AA-5838816CA705}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link-system.web-icalls", "link-system.web-icalls\link-system.web-icalls.csproj", "{6F2CC0E5-BE6A-4B96-AEDE-1A6EFE517166}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link-keep-resources-1", "link-keep-resources-1\link-keep-resources-1.csproj", "{0A4EBB71-92E1-448C-BAA6-DFFB9491D8A0}"
@@ -90,12 +86,6 @@ Global
{148DC17B-B29F-48A7-97CD-EECE26015B25}.Debug|x86.Build.0 = Debug|x86
{148DC17B-B29F-48A7-97CD-EECE26015B25}.Release|x86.ActiveCfg = Release|x86
{148DC17B-B29F-48A7-97CD-EECE26015B25}.Release|x86.Build.0 = Release|x86
- {150FA3E6-0AFA-417E-A7FA-B13E95B46CF0}.AppStore|x86.ActiveCfg = AppStore|x86
- {150FA3E6-0AFA-417E-A7FA-B13E95B46CF0}.AppStore|x86.Build.0 = AppStore|x86
- {150FA3E6-0AFA-417E-A7FA-B13E95B46CF0}.Debug|x86.ActiveCfg = Debug|x86
- {150FA3E6-0AFA-417E-A7FA-B13E95B46CF0}.Debug|x86.Build.0 = Debug|x86
- {150FA3E6-0AFA-417E-A7FA-B13E95B46CF0}.Release|x86.ActiveCfg = Release|x86
- {150FA3E6-0AFA-417E-A7FA-B13E95B46CF0}.Release|x86.Build.0 = Release|x86
{1F4422A4-C6B2-49B5-BB1D-6CA4676397CA}.AppStore|x86.ActiveCfg = AppStore|x86
{1F4422A4-C6B2-49B5-BB1D-6CA4676397CA}.AppStore|x86.Build.0 = AppStore|x86
{1F4422A4-C6B2-49B5-BB1D-6CA4676397CA}.Debug|x86.ActiveCfg = Debug|x86
@@ -198,12 +188,6 @@ Global
{CA9DCC2E-8DD6-4E73-A5E4-980028A9436C}.Debug|x86.Build.0 = Debug|x86
{CA9DCC2E-8DD6-4E73-A5E4-980028A9436C}.Release|x86.ActiveCfg = Release|x86
{CA9DCC2E-8DD6-4E73-A5E4-980028A9436C}.Release|x86.Build.0 = Release|x86
- {CB3AC1BE-2C81-4CAF-A9AA-5838816CA705}.AppStore|x86.ActiveCfg = AppStore|x86
- {CB3AC1BE-2C81-4CAF-A9AA-5838816CA705}.AppStore|x86.Build.0 = AppStore|x86
- {CB3AC1BE-2C81-4CAF-A9AA-5838816CA705}.Debug|x86.ActiveCfg = Debug|x86
- {CB3AC1BE-2C81-4CAF-A9AA-5838816CA705}.Debug|x86.Build.0 = Debug|x86
- {CB3AC1BE-2C81-4CAF-A9AA-5838816CA705}.Release|x86.ActiveCfg = Release|x86
- {CB3AC1BE-2C81-4CAF-A9AA-5838816CA705}.Release|x86.Build.0 = Release|x86
{CCE59D9C-CA71-4DB8-8156-98D7A9428534}.AppStore|x86.ActiveCfg = AppStore|Any CPU
{CCE59D9C-CA71-4DB8-8156-98D7A9428534}.AppStore|x86.Build.0 = AppStore|Any CPU
{CCE59D9C-CA71-4DB8-8156-98D7A9428534}.Debug|x86.ActiveCfg = Debug|Any CPU