From 4375068fdb172104b69f0f052af53b1bc1cc1422 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 5 Jul 2019 06:22:51 -0700 Subject: [PATCH] [mmptest] Remove the link-system.web-icalls test. Partial fix for #4975. (#6500) It tests linker behavior with System.Web.dll, but the linker is only available for the Modern profile, and the Modern profile doesn't contain System.Web.dll. So just remove this test. Fixes part of https://github.com/xamarin/xamarin-macios/issues/4975. --- tests/mmptest/regression/Makefile | 1 - .../link-system.web-icalls/Info.plist | 20 ---- .../LinkSysWebIcalls.cs | 36 ------- .../link-system.web-icalls.csproj | 95 ------------------- tests/mmptest/regression/tests.sln | 8 -- 5 files changed, 160 deletions(-) delete mode 100644 tests/mmptest/regression/link-system.web-icalls/Info.plist delete mode 100644 tests/mmptest/regression/link-system.web-icalls/LinkSysWebIcalls.cs delete mode 100644 tests/mmptest/regression/link-system.web-icalls/link-system.web-icalls.csproj diff --git a/tests/mmptest/regression/Makefile b/tests/mmptest/regression/Makefile index ae0cb2b609..76de6aff84 100644 --- a/tests/mmptest/regression/Makefile +++ b/tests/mmptest/regression/Makefile @@ -13,7 +13,6 @@ export XamarinMacFrameworkRoot=$(MAC_DESTDIR)/Library/Frameworks/Xamarin.Mac.fra TESTS_4_0 = \ link-posix-1 \ link-posix-2 \ - link-system.web-icalls \ link-keep-resources-1 \ link-preserve-assembly \ link-uithread-1 \ diff --git a/tests/mmptest/regression/link-system.web-icalls/Info.plist b/tests/mmptest/regression/link-system.web-icalls/Info.plist deleted file mode 100644 index 8d02e36715..0000000000 --- a/tests/mmptest/regression/link-system.web-icalls/Info.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - CFBundleIdentifier - com.yourcompany.link-system.web-icalls - CFBundleName - link-system.web-icalls - CFBundleVersion - 1 - LSMinimumSystemVersion - 10.9 - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - LSUIElement - 1 - - diff --git a/tests/mmptest/regression/link-system.web-icalls/LinkSysWebIcalls.cs b/tests/mmptest/regression/link-system.web-icalls/LinkSysWebIcalls.cs deleted file mode 100644 index 1ce4a32f45..0000000000 --- a/tests/mmptest/regression/link-system.web-icalls/LinkSysWebIcalls.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Web; -using System.IO; -using System.Reflection; -using MonoMac.Foundation; -using MonoMac.AppKit; -using MonoMac.ObjCRuntime; - -// Test -// * application references System.Web.dll -// * linker _must_ include all icalls -// ? that's what the mmp linker did, not clear (no history) why ? I could not find reflection usage of them ?!? -// -// 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); -#pragma warning disable 219 - // that will ensure System.Web reference is not removed - var sw = typeof (HttpApplication); -#pragma warning restore 219 - int mcount = Type.GetType ("System.Web.Util.ICalls, System.Web").GetMethods (BindingFlags.Public | BindingFlags.Static).Length; - Test.Log.WriteLine ("{0}\tSystem.Web.Util.ICalls {1}/3 icalls protected by linker", mcount == 3 ? "[PASS]" : "[FAIL]", mcount); - - Test.Terminate (); - } - } -} \ No newline at end of file diff --git a/tests/mmptest/regression/link-system.web-icalls/link-system.web-icalls.csproj b/tests/mmptest/regression/link-system.web-icalls/link-system.web-icalls.csproj deleted file mode 100644 index db7367d3f9..0000000000 --- a/tests/mmptest/regression/link-system.web-icalls/link-system.web-icalls.csproj +++ /dev/null @@ -1,95 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {6F2CC0E5-BE6A-4B96-AEDE-1A6EFE517166} - {42C0BBD9-55CE-4FC1-8D90-A7348ABAFB23};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - linksystem.webicalls - Resources - link-system.web-icalls - - - 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 af73e7c1fe..3a9dc83a30 100644 --- a/tests/mmptest/regression/tests.sln +++ b/tests/mmptest/regression/tests.sln @@ -15,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-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}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link-keep-resources-2", "link-keep-resources-2\link-keep-resources-2.csproj", "{9D5EA758-05CE-416C-B2D1-523E481C0DCD}" @@ -120,12 +118,6 @@ Global {6223332F-517A-43D0-9BCC-037645A24E97}.Debug|x86.Build.0 = Debug|x86 {6223332F-517A-43D0-9BCC-037645A24E97}.Release|x86.ActiveCfg = Release|x86 {6223332F-517A-43D0-9BCC-037645A24E97}.Release|x86.Build.0 = Release|x86 - {6F2CC0E5-BE6A-4B96-AEDE-1A6EFE517166}.AppStore|x86.ActiveCfg = AppStore|x86 - {6F2CC0E5-BE6A-4B96-AEDE-1A6EFE517166}.AppStore|x86.Build.0 = AppStore|x86 - {6F2CC0E5-BE6A-4B96-AEDE-1A6EFE517166}.Debug|x86.ActiveCfg = Debug|x86 - {6F2CC0E5-BE6A-4B96-AEDE-1A6EFE517166}.Debug|x86.Build.0 = Debug|x86 - {6F2CC0E5-BE6A-4B96-AEDE-1A6EFE517166}.Release|x86.ActiveCfg = Release|x86 - {6F2CC0E5-BE6A-4B96-AEDE-1A6EFE517166}.Release|x86.Build.0 = Release|x86 {7B6ECB8B-ED54-4687-A8BE-7ADA22973F3F}.AppStore|x86.ActiveCfg = Debug|Any CPU {7B6ECB8B-ED54-4687-A8BE-7ADA22973F3F}.AppStore|x86.Build.0 = Debug|Any CPU {7B6ECB8B-ED54-4687-A8BE-7ADA22973F3F}.Debug|x86.ActiveCfg = Debug|Any CPU