[d16-7] [src] Remove the remaining Classic code. (#8820)

* [src] Remove Classic code from System.Net.Http.

* [src] Remove Classic code from the ObjCRuntime namespace.

* [src] Remove Classic code from the native types.

* [src] Remove the Classic defines from the makefiles.

* [src] Remove Classic code from the Constants class.

* [src] Update project files to remove XAMCORE_2_0 and __UNIFIED__.

* [src] Remove Classic code from the MonoNativeFunctionWrapper and MonoPInvokeCallback attributes.

* [src] Update README to remove outdated docs about XAMCORE_2_0.

* [d16-7] [registrar] Remove Classic Code.

* Bump Touch.Unit.

New commits in spouliot/Touch.Unit:

* xamarin/Touch.Unit@358b283 Remove code to be compatible with MonoTouch (Classic Xamarin.iOS). (#59)

Diff: https://github.com/spouliot/Touch.Unit/compare/9db795d50d9fe4ac5df77d3f0d85c1b84d32ce8c..358b283b64cb543627e30cbd5432ffd0b667c857

* [src] NUnitLite still needs the XAMCORE_2_0 and __UNIFIED__ defines.

They still have conditional code with those defines:
https://github.com/mono/NUnitLite/blob/a977ca57572c545e108b56ef32aa3f7ff8287611/NUnitLite-1.0.0/src/framework/Constraints/Numerics.cs#L57

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>

.gitmodules

@@ -12,7 +12,7 @@
 [submodule "external/Touch.Unit"]
     path = external/Touch.Unit
     url = ../../spouliot/Touch.Unit.git
-    branch = master
+    branch = d16-7
 [submodule "external/Xamarin.MacDev"]
     path = external/Xamarin.MacDev
     url = ../../xamarin/Xamarin.MacDev

msbuild/tests/MyiOSFrameworkBinding/MyiOSFrameworkBinding.csproj

@@ -17,7 +17,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;__UNIFIED__;XAMCORE_2_0</DefineConstants>
+    <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/Constants.iOS.cs.in

@@ -1,9 +1,7 @@
-#if XAMCORE_2_0
-namespace ObjCRuntime {
-#elif MTOUCH
+#if MTOUCH
 namespace Xamarin.Bundler {
 #else
-namespace MonoTouch {
+namespace ObjCRuntime {
 #endif
 	public static partial class Constants {
 		public const string Version = "@VERSION@";

src/Constants.mac.cs.in

@@ -22,12 +22,10 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if XAMCORE_2_0
-namespace ObjCRuntime {
-#elif MMP
+#if MMP
 namespace Xamarin.Bundler {
 #else
-namespace MonoMac {
+namespace ObjCRuntime {
 #endif
 	public static partial class Constants {
 		public const string Version = "@VERSION@";

src/Makefile

@@ -119,8 +119,8 @@ IOS_HTTP_SOURCES = \
 IOS_CORE_SOURCES += $(IOS_EXTRA_SOURCES)
 IOS_SOURCES += $(IOS_EXTRA_SOURCES) $(IOS_HTTP_SOURCES)
 
-IOS_GENERATOR_FLAGS = -inline-selectors -d:IOS -process-enums -warnaserror:$(IOS_GENERATOR_WARNASERROR) -d:XAMCORE_2_0 -d:__UNIFIED__
-IOS_DEFINES = -define:IPHONE -define:IOS -define:MONOTOUCH -d:__IOS__ $(APPLETLS_DEFINES) -d:SYSTEM_NET_HTTP -d:XAMCORE_2_0 -d:__UNIFIED__
+IOS_GENERATOR_FLAGS = -inline-selectors -d:IOS -process-enums -warnaserror:$(IOS_GENERATOR_WARNASERROR)
+IOS_DEFINES = -define:IPHONE -define:IOS -define:MONOTOUCH -d:__IOS__ $(APPLETLS_DEFINES) -d:SYSTEM_NET_HTTP
 IOS_GENERATOR=$(BUILD_DIR)/common/bgen.exe
 IOS_GENERATE=$(SYSTEM_MONO) --debug $(IOS_GENERATOR)
 
@@ -239,9 +239,10 @@ $(IOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.pdb: $(MACIOS_BINARIES_PATH)/MonoT
 $(IOS_BUILD_DIR)/reference%MonoTouch.NUnitLite.dll $(IOS_BUILD_DIR)/reference%MonoTouch.NUnitLite.pdb: $(IOS_TOUCHUNIT_SOURCES) $(IOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll $(PRODUCT_KEY_PATH) $(IOS_BUILD_DIR)/reference/Xamarin.iOS.dll
 	$(call Q_PROF_CSC,ios) $(IOS_CSC) -nologo -out:$(basename $@).dll -target:library -debug:portable -optimize -publicsign \
 		-deterministic \
-		-keyfile:$(PRODUCT_KEY_PATH) -r:$(IOS_BUILD_DIR)/reference/Xamarin.iOS.dll -define:XAMCORE_2_0 -define:__UNIFIED__ -define:MONO -r:$(IOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll -r:$(MONOTOUCH_MONO_PATH)/System.dll -r:$(MONOTOUCH_MONO_PATH)/System.Xml.dll \
+		-keyfile:$(PRODUCT_KEY_PATH) -r:$(IOS_BUILD_DIR)/reference/Xamarin.iOS.dll -define:MONO -r:$(IOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll -r:$(MONOTOUCH_MONO_PATH)/System.dll -r:$(MONOTOUCH_MONO_PATH)/System.Xml.dll \
 		-nowarn:3006,612,649,414,1635,659 \
 		-define:NUNITLITE,CLR_4_0,NET_4_5,__MOBILE__,MONO $(IOS_DEFINES) \
+		-define:XAMCORE_2_0,__UNIFIED__ \
 		$(IOS_TOUCHUNIT_SOURCES)
 
 $(IOS_BUILD_DIR)/reference/Xamarin.iOS.dll: $(IOS_BUILD_DIR)/native-64/Xamarin.iOS.dll | $(IOS_BUILD_DIR)/reference
@@ -383,11 +384,11 @@ MAC_WARNINGS_TO_FIX := 114,108
 # 4014 is "The statement is not awaited and execution of current method continues before the call is completed. Consider using `await' operator or calling `Wait' method"
 MAC_WARNINGS_TO_FIX := $(MAC_WARNINGS_TO_FIX),4014
 
-MAC_COMMON_DEFINES = -define:MONOMAC,XAMCORE_2_0,__UNIFIED__
+MAC_COMMON_DEFINES = -define:MONOMAC
 MAC_full_ARGS = -define:NO_SYSTEM_DRAWING -define:XAMMAC_SYSTEM_MONO
 MAC_mobile_ARGS = 
 MAC_BOOTSTRAP_DEFINES = $(MAC_COMMON_DEFINES),COREBUILD
-MAC_GENERATED_DEFINES = -d:MONOMAC -d:XAMCORE_2_0 -d:__UNIFIED__
+MAC_GENERATED_DEFINES = -d:MONOMAC
 
 MAC_CORE_DEFINES = $(MAC_BOOTSTRAP_DEFINES)
 MAC_CORE_WARNINGS_TO_FIX = -nowarn:3021,612,618,1635
@@ -554,7 +555,7 @@ $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac.dll: $(MACOS_DOTNET_BUILD_DIR)/macos-ge
 		$(ARGS_64) \
 		-nowarn:3021,1635,612,618,0219,0414,$(MAC_WARNINGS_TO_FIX) \
 		$(MAC_CSC_FLAGS_XM) \
-		$(MAC_CFNETWORK_SOURCES) $(MAC_HTTP_SOURCES) $(SHARED_SYSTEM_DRAWING_SOURCES) $(APPLETLS_DEFINES) -D:XAMARIN_MODERN -D:UNIFIED -D:__UNIFIED__ \
+		$(MAC_CFNETWORK_SOURCES) $(MAC_HTTP_SOURCES) $(SHARED_SYSTEM_DRAWING_SOURCES) $(APPLETLS_DEFINES) -D:XAMARIN_MODERN \
 		$(MAC_SOURCES) \
 		@$<
 
@@ -662,10 +663,10 @@ all-mac: $(MAC_TARGETS)
 # Xamarin.WatchOS
 #
 
-WATCH_DEFINES = -define:IPHONE -define:MONOTOUCH -d:WATCH -d:XAMCORE_2_0 -d:XAMCORE_3_0 -d:__WATCHOS__ -d:__UNIFIED__ -d:SYSTEM_NET_HTTP
+WATCH_DEFINES = -define:IPHONE -define:MONOTOUCH -d:WATCH -d:XAMCORE_3_0 -d:__WATCHOS__ -d:SYSTEM_NET_HTTP
 WATCH_GENERATOR=$(BUILD_DIR)/common/bgen.exe
 WATCH_GENERATE=$(SYSTEM_MONO) --debug $(WATCH_GENERATOR)
-WATCH_GENERATED_DEFINES= -d:WATCH -d:XAMCORE_3_0 -d:XAMCORE_2_0 -d:__UNIFIED__
+WATCH_GENERATED_DEFINES= -d:WATCH -d:XAMCORE_3_0
 
 WATCHOS_CORE_DEFINES = $(WATCH_DEFINES) -define:COREBUILD
 WATCHOS_CORE_WARNINGS_TO_FIX = -nowarn:219,618,114,414,1635,3021,$(IOS_WARNINGS_THAT_YOU_SHOULD_FIX)
@@ -805,6 +806,7 @@ $(WATCH_BUILD_DIR)/reference/MonoTouch.NUnitLite%dll $(WATCH_BUILD_DIR)/referenc
 		-keyfile:$(PRODUCT_KEY_PATH) -r:$(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/mscorlib.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/System.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/System.Xml.dll \
 		-nowarn:3006,612,649,414,1635,659 \
 		-define:NUNITLITE,CLR_4_0,NET_4_5,__MOBILE__,MONO $(WATCH_DEFINES) \
+		-define:XAMCORE_2_0,__UNIFIED__ \
 		-deterministic \
 		$(WATCHOS_TOUCHUNIT_SOURCES)
 
@@ -880,10 +882,10 @@ endif
 # Xamarin.TVOS
 #
 
-TVOS_DEFINES = -define:IPHONE -define:MONOTOUCH -d:TVOS -d:XAMCORE_2_0 -d:XAMCORE_3_0 -d:__TVOS__ $(APPLETLS_DEFINES) -d:__UNIFIED__ -d:SYSTEM_NET_HTTP
+TVOS_DEFINES = -define:IPHONE -define:MONOTOUCH -d:TVOS -d:XAMCORE_3_0 -d:__TVOS__ $(APPLETLS_DEFINES) -d:SYSTEM_NET_HTTP
 TVOS_GENERATOR=$(BUILD_DIR)/common/bgen.exe
 TVOS_GENERATE=$(SYSTEM_MONO) --debug $(TVOS_GENERATOR)
-TVOS_GENERATED_DEFINES= -d:TVOS -d:XAMCORE_3_0 -d:XAMCORE_2_0 -d:__UNIFIED__
+TVOS_GENERATED_DEFINES= -d:TVOS -d:XAMCORE_3_0
 
 TVOS_CORE_WARNINGS_TO_FIX=-nowarn:219,618,114,414,1635,3021,$(IOS_WARNINGS_THAT_YOU_SHOULD_FIX)
 TVOS_CORE_DEFINES=$(TVOS_DEFINES) -d:COREBUILD
@@ -1022,6 +1024,7 @@ $(TVOS_BUILD_DIR)/reference/MonoTouch.NUnitLite%dll $(TVOS_BUILD_DIR)/reference/
 		-keyfile:$(PRODUCT_KEY_PATH) -r:$(TVOS_BUILD_DIR)/reference/Xamarin.TVOS.dll -r:$(TVOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Xml.dll \
 		-nowarn:3006,612,649,414,1635,659 \
 		-define:NUNITLITE,CLR_4_0,NET_4_5,__MOBILE__,MONO $(TVOS_DEFINES) \
+		-define:XAMCORE_2_0,__UNIFIED__ \
 		-deterministic \
 		$(TVOS_TOUCHUNIT_SOURCES)
 

src/MonoNativeFunctionWrapperAttribute.cs

@@ -23,15 +23,8 @@
 //
 using System;
 
-#if XAMCORE_2_0
 namespace ObjCRuntime {
-#endif
 	[AttributeUsage (AttributeTargets.Delegate)]
-#if XAMCORE_2_0
-	sealed
-#endif
-	public class MonoNativeFunctionWrapperAttribute : Attribute {
+	public sealed class MonoNativeFunctionWrapperAttribute : Attribute {
 	}
-#if XAMCORE_2_0
 }
-#endif

src/MonoPInvokeCallbackAttribute.cs

@@ -22,10 +22,7 @@
 //
 using System;
 
-#if XAMCORE_2_0
 namespace ObjCRuntime {
-#endif
-
 	[AttributeUsage (AttributeTargets.Method)]
 	public sealed class MonoPInvokeCallbackAttribute : Attribute {
 		public MonoPInvokeCallbackAttribute (Type t)
@@ -35,7 +32,4 @@ public MonoPInvokeCallbackAttribute (Type t)
 
 		public Type DelegateType { get; set; }
 	}
-#if XAMCORE_2_0
 }
-#endif
-

src/NativeTypes/Drawing.tt

@@ -19,8 +19,6 @@
 // Copyright 2013 Xamarin, Inc. All rights reserved.
 //
 
-#if XAMCORE_2_0
-
 <#@ template language="C#v3.5" #>
 <#@ import namespace="System" #>
 <#@ import namespace="System.Collections.Generic" #>
@@ -30,10 +28,9 @@ using System.Drawing;
 #endif
 using System.Globalization;
 using System.Runtime.InteropServices;
-#if XAMCORE_2_0
+
 using Foundation;
 using ObjCRuntime;
-#endif
 
 namespace CoreGraphics
 {
@@ -164,7 +161,7 @@ namespace CoreGraphics
 			this.<#= type.Y_Height #> = <#= type.ArgName #>.<#= type.Y_Height #>;
 		}
 
-#if XAMCORE_2_0 && !COREBUILD
+#if !COREBUILD
 		public static bool TryParse (NSDictionary dictionaryRepresentation, out <#= type.Name #> <#= type.ArgName #>)
 		{
 			if (dictionaryRepresentation == null){
@@ -576,7 +573,7 @@ namespace CoreGraphics
 				x, y, width, height);
 		}
 
-#if XAMCORE_2_0 && !COREBUILD
+#if !COREBUILD
 		public static bool TryParse (NSDictionary dictionaryRepresentation, out CGRect rect)
 		{
 			if (dictionaryRepresentation == null){
@@ -593,7 +590,7 @@ namespace CoreGraphics
 #endif
 	}
 
-#if XAMCORE_2_0 && !COREBUILD
+#if !COREBUILD
 	internal static class NativeDrawingMethods {
 #if MONOMAC
 		internal const string CG = Constants.ApplicationServicesCoreGraphicsLibrary;
@@ -616,5 +613,3 @@ namespace CoreGraphics
 	}
 #endif
 }
-
-#endif

src/NativeTypes/Makefile

@@ -3,7 +3,7 @@
 all: test.exe
 
 test.exe: ../build/common/NativeTypes/Primitives.cs ../build/common/NativeTypes/Drawing.cs test.cs
-	mcs -unsafe -debug -out:$@ $+ -r:System.Drawing -define:XAMCORE_2_0
+	mcs -unsafe -debug -out:$@ $+ -r:System.Drawing
 
 test: test.exe
 	mono --debug $<

src/NativeTypes/NMath.cs

@@ -7,8 +7,6 @@
 // Copyright 2014 Xamarin Inc. All rights reserved.
 //
 
-#if XAMCORE_2_0
-
 using System.Runtime.CompilerServices;
 
 namespace System
@@ -231,5 +229,3 @@ public static nfloat Sqrt (nfloat d)
 		}
 	}
 }
-
-#endif

src/NativeTypes/Primitives.tt

@@ -24,8 +24,6 @@
 // Copyright 2013 Xamarin, Inc. All rights reserved.
 //
 
-#if XAMCORE_2_0
-
 <#@ template language="C#v3.5" #>
 <#@ import namespace="System" #>
 <#@ import namespace="System.Collections.Generic" #>
@@ -431,5 +429,3 @@ namespace System
 	}
 <# } #>
 }
-
-#endif

src/ObjCRuntime/PlatformAvailability2.cs

@@ -4,7 +4,7 @@
 // Unavailable.
 //
 // This addresses scalability issues with the AvailabilityAttribute
-// introduced originally for XAMCORE_2_0 where the Platform enum
+// introduced originally for the Unified profile where the Platform enum
 // cannot cleanly scale to other platforms (e.g. WatchOS).
 //
 // Used by unit tests to automatically skip selectors not available

src/ObjCRuntime/Registrar.cs

@@ -45,19 +45,13 @@
 #if MTOUCH
 using ProductException=Xamarin.Bundler.MonoTouchException;
 #else
-#if XAMCORE_2_0
 using ProductException=ObjCRuntime.RuntimeException;
-#else
-using ProductException=MonoTouch.RuntimeException;
-#endif
 #endif
 #elif MONOMAC
 #if MMP
 using ProductException=Xamarin.Bundler.MonoMacException;
-#elif XAMCORE_2_0
-using ProductException=ObjCRuntime.RuntimeException;
 #else
-using ProductException=MonoMac.RuntimeException;
+using ProductException=ObjCRuntime.RuntimeException;
 #endif
 #else
 #error Only XI and XM

src/README.md

@@ -44,12 +44,12 @@ Conditional compilation
 
 These are the symbols defined for each platform assembly:
 
-| Assembly            | Symbols                                        |
-| ------------------  | -----------                                    |
-| Xamarin.iOS.dll     | IPHONE MONOTOUCH IOS XAMCORE_2_0               |
-| Xamarin.Mac.dll     | MONOMAC XAMCORE_2_0                            |
-| Xamarin.WatchOS.dll | IPHONE MONOTOUCH WATCH XAMCORE_2_0 XAMCORE_3_0 |
-| Xamarin.TVOS.dll    | IPHONE MONOTOUCH TVOS XAMCORE_2_0 XAMCORE_3_0  |
+| Assembly            | Symbols                            |
+| ------------------  | -----------                        |
+| Xamarin.iOS.dll     | IPHONE MONOTOUCH IOS               |
+| Xamarin.Mac.dll     | MONOMAC                            |
+| Xamarin.WatchOS.dll | IPHONE MONOTOUCH WATCH XAMCORE_3_0 |
+| Xamarin.TVOS.dll    | IPHONE MONOTOUCH TVOS XAMCORE_3_0  |
 
 To build core for only one platform, use the platform unique variables `IOS`, `MONOMAC`, `WATCH` or `TVOS`.
 
@@ -179,7 +179,6 @@ conditional compilation:
 | `MONOMAC` | defined for Xamarin.Mac builds; not defined for Xamarin.iOS |
 | `ARCH_32` | defined when the target architecture is 32-bit; this will be defined for Classic and the Unified 32-bit assemblies |
 | `ARCH_64` | defined when the target architecture is 64-bit; this will be defined only for the Unified 64-bit assembly |
-| `XAMCORE_2_0` | defined for the Unified assemblies; this should be used for most conditions dealing with API differences between Unified and Classic assemblies |
 | `COREBUILD` | defined when building the intermediate `core.dll` assembly against which the code generator will produce bindings |
 
 For example, to build an API for all of iOS but only 64-bit OS X (Xamarin.Mac):

src/System.Net.Http/CFNetworkHandler.cs

@@ -37,14 +37,10 @@
 using CFNetwork;
 using CoreFoundation;
 using CF=CoreFoundation;
-#elif XAMCORE_2_0
+#else
 using CoreServices;
 using CoreFoundation;
 using CF=CoreFoundation;
-#else
-using MonoTouch.CoreServices;
-using MonoTouch.CoreFoundation;
-using CF=MonoTouch.CoreFoundation;
 #endif
 
 namespace System.Net.Http
@@ -248,11 +244,7 @@ internal async Task<HttpResponseMessage> SendAsync (HttpRequestMessage request,
 			// Always schedule stream events handling on main-loop. Due to ConfigureAwait (false) we may end up
 			// on any thread-pool thread which may not have run-loop running
 			//
-#if XAMCORE_2_0
 			stream.EnableEvents (CF.CFRunLoop.Main, CF.CFRunLoop.ModeCommon);
-#else
-			stream.EnableEvents (CF.CFRunLoop.Main, CF.CFRunLoop.CFRunLoopCommonModes);
-#endif
 
 			stream.Open ();
 

src/generator-filters.cs

@@ -106,7 +106,7 @@ public void GenerateFilter (Type type)
 		print ("");
 
 		// string constructor
-		// default is protected (for abstract) but backward compatibility (XAMCORE_2_0) requires some hacks
+		// default is protected (for abstract)
 		v = GetVisibility (filter.StringCtorVisibility);
 		if (is_abstract && (v.Length == 0))
 			v = "protected ";

src/xamios.tmpl.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>build\IDE\bin\iOS\Debug</OutputPath>
-    <DefineConstants>IPHONE;IOS;MINIMAL;XAMCORE_2_0;MONOTOUCH</DefineConstants>
+    <DefineConstants>IPHONE;IOS;MINIMAL;MONOTOUCH</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -31,7 +31,7 @@
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>build\IDE\bin\iOS\Release</OutputPath>
-    <DefineConstants>IPHONE;IOS;MINIMAL;XAMCORE_2_0;MONOTOUCH</DefineConstants>
+    <DefineConstants>IPHONE;IOS;MINIMAL;MONOTOUCH</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>

src/xammac.tmpl.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>build\IDE\bin\macOS-mobile\Debug</OutputPath>
-    <DefineConstants>DEBUG;MONOMAC;XAMCORE_2_0;NO_SYSTEM_DRAWING</DefineConstants>
+    <DefineConstants>DEBUG;MONOMAC;NO_SYSTEM_DRAWING</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -29,7 +29,7 @@
     <DebugType>full</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>build\IDE\bin\macOS-mobile\Release</OutputPath>
-    <DefineConstants>MONOMAC;XAMCORE_2_0;NO_SYSTEM_DRAWING</DefineConstants>
+    <DefineConstants>MONOMAC;NO_SYSTEM_DRAWING</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>