[tests] Remove mono-native logic.

tests/Makefile

@@ -352,8 +352,6 @@ package-test-libraries.zip:
 	$(Q) $(MAKE) all -C test-libraries/custom-type-assembly build-assembly
 	$(Q_GEN) rm -f "$@" "$@.tmp"
 	$(Q_GEN) cd $(TOP) && zip -9r --symlinks $(abspath $@).tmp ./tests/test-libraries
-	$(Q_GEN) cd $(TOP) && zip -9r --symlinks $(abspath $@).tmp ./tests/mono-native/macOS/unified ./tests/mono-native/macOS/compat
-	$(Q_GEN) cd $(TOP) && zip -9r --symlinks $(abspath $@).tmp ./tests/mono-native/iOS/unified ./tests/mono-native/iOS/compat
 	$(Q_GEN) cd $(TOP) && find tests -regex '.*/generated-projects/.*[c|f]sproj' -exec zip -9r --symlinks $(abspath $@).tmp {} +
 	$(Q_GEN) cd $(TOP) && find tests -regex '.*/generated-projects/.*sln' -exec zip -9r --symlinks $(abspath $@).tmp {} +
 	$(Q_GEN) cd $(TOP) && find tests -regex 'tests/test-libraries/custom-type-assembly/.libs/.*dll' -exec zip -9r --symlinks $(abspath $@).tmp {} +

tests/introspection/ApiPInvokeTest.cs

@@ -158,13 +158,7 @@ public void SymbolExists ()
 				case "System.Native":
 				case "System.Security.Cryptography.Native.Apple":
 				case "System.Net.Security.Native":
-					if (MonoNativeConfig.LinkMode == MonoNativeLinkMode.None)
-						continue;
-#if __IOS__
-					libname = MonoNativeConfig.GetPInvokeLibraryName (MonoNativeFlavor.Unified, MonoNativeConfig.LinkMode);
-#else
 					libname = null;
-#endif
 					break;
 				}
 
@@ -248,13 +242,7 @@ protected void Check (Assembly a)
 					case "System.Native":
 					case "System.Security.Cryptography.Native.Apple":
 					case "System.Net.Security.Native":
-						if (MonoNativeConfig.LinkMode == MonoNativeLinkMode.None)
-							continue;
-#if __IOS__
-						path = MonoNativeConfig.GetPInvokeLibraryName (MonoNativeFlavor.Unified, MonoNativeConfig.LinkMode);
-#else
 						path = null;
-#endif
 						break;
 					}
 

tests/introspection/Mac/introspection-mac.csproj

@@ -122,9 +122,6 @@
     <Compile Include="..\..\common\TestRuntime.cs">
       <Link>TestRuntime.cs</Link>
     </Compile>
-    <Compile Include="..\..\common\MonoNativeConfig.cs">
-      <Link>MonoNativeConfig.cs</Link>
-    </Compile>
     <Compile Include="MacApiTypoTest.cs" />
     <Compile Include="..\ApiAvailabilityTest.cs">
       <Link>ApiAvailabilityTest.cs</Link>

tests/introspection/dotnet/shared.csproj

@@ -111,9 +111,6 @@
     <Compile Include="$(IntrospectionTestDirectory)\EnvironmentVariable.cs">
       <Link>EnvironmentVariable.cs</Link>
     </Compile>
-    <Compile Include="$(IntrospectionTestDirectory)\..\common\MonoNativeConfig.cs">
-      <Link>MonoNativeConfig.cs</Link>
-    </Compile>
     <Compile Include="$(IntrospectionTestDirectory)\..\common\PlatformInfo.cs">
       <Link>PlatformInfo.cs</Link>
     </Compile>

tests/introspection/iOS/introspection-ios.csproj

@@ -148,9 +148,6 @@
     <Compile Include="..\EnvironmentVariable.cs">
       <Link>EnvironmentVariable.cs</Link>
     </Compile>
-    <Compile Include="..\..\common\MonoNativeConfig.cs">
-      <Link>MonoNativeConfig.cs</Link>
-    </Compile>
     <Compile Include="..\..\common\PlatformInfo.cs">
       <Link>PlatformInfo.cs</Link>
     </Compile>

tests/mmptest/src/CodeStrippingTests.cs

@@ -9,11 +9,11 @@
 namespace Xamarin.MMP.Tests {
 	public class CodeStrippingTests {
 		static Func<string, bool> LipoStripConditional = s => s.Contains ("lipo") && s.Contains ("-extract_family");
-		static Func<string, bool> LipoStripSkipPosixAndMonoNativeConditional = s => LipoStripConditional (s) && !s.Contains ("libMonoPosixHelper.dylib") && !s.Contains ("libmono-native.dylib");
+		static Func<string, bool> LipoStripSkipPosixConditional = s => LipoStripConditional (s) && !s.Contains ("libMonoPosixHelper.dylib");
 
-		static bool DidAnyLipoStripSkipPosixAndMonoNative (BuildResult buildResult)
+		static bool DidAnyLipoStripSkipPosix (BuildResult buildResult)
 		{
-			return buildResult.BuildOutputLines.Any (LipoStripSkipPosixAndMonoNativeConditional);
+			return buildResult.BuildOutputLines.Any (LipoStripSkipPosixConditional);
 		}
 
 		static bool DidAnyLipoStrip (BuildResult buildResult)
@@ -129,9 +129,9 @@ void AssertNoLipoOrWarning (BuildResult buildOutput, string context)
 			Assert.False (buildOutput.HasMessage (2108), "MM2108 incorrectly given in in context: " + context);
 		}
 
-		void AssertLipoOnlyMonoPosixAndMonoNative (BuildResult buildOutput, string context)
+		void AssertLipoOnlyMonoPosix (BuildResult buildOutput, string context)
 		{
-			Assert.False (DidAnyLipoStripSkipPosixAndMonoNative (buildOutput), "lipo incorrectly run in context outside of libMonoPosixHelper/libmono-native: " + context);
+			Assert.False (DidAnyLipoStripSkipPosix (buildOutput), "lipo incorrectly run in context outside of libMonoPosixHelper/libmono-native: " + context);
 			Assert.False (buildOutput.HasMessage (2108), "MM2108 incorrectly given in in context: " + context);
 		}
 
@@ -173,7 +173,7 @@ public void ThirdPartyLibrary_WithCorrectBitness_ShouldNotStripOrWarn ()
 
 				test.Release = true;
 				testResult = TI.TestUnifiedExecutable (test);
-				AssertLipoOnlyMonoPosixAndMonoNative (testResult.BuildResult, "Release"); // libMonoPosixHelper.dylib and libmono-native.dylib will lipo in Release
+				AssertLipoOnlyMonoPosix (testResult.BuildResult, "Release"); // libMonoPosixHelper.dylib and libmono-native.dylib will lipo in Release
 			});
 		}
 	}