Merge branch 'master' of github.com:ServiceStack/ServiceStack.Text

Author: mythz

src/ServiceStack.Text/PclExport.Net40.cs

@@ -23,9 +23,11 @@
 #if !__IOS__
 using System.Reflection.Emit;
 using FastMember = ServiceStack.Text.FastMember;
-#elif __UNIFIED__
+#endif
+
+#if __UNIFIED__
 using Preserve = Foundation.PreserveAttribute;
-#else
+#elif __IOS__
 using Preserve = MonoTouch.Foundation.PreserveAttribute;
 #endif
 
@@ -125,6 +127,7 @@ public override void RegisterLicenseFromConfig()
         {
 #if ANDROID
 #elif __IOS__
+#elif __MAC__
 #else
             //Automatically register license key stored in <appSettings/>
             var licenceKeyText = System.Configuration.ConfigurationManager.AppSettings[AppSettingsKey];
@@ -670,7 +673,25 @@ private static DynamicMethod CreateDynamicSetMethod(MemberInfo memberInfo)
 #endif
     }
 
-#if __IOS__
+#if __MAC__
+	public class MacPclExport : IosPclExport 
+	{
+		public static new MacPclExport Provider = new MacPclExport();
+
+		public MacPclExport()
+		{
+			PlatformName = "MAC";
+			SupportsEmit = SupportsExpression = true;
+		}
+		
+		public new static void Configure()
+		{
+			Configure(Provider);
+		}
+	}
+#endif
+
+#if __IOS__ || __MAC__
     [Preserve(AllMembers = true)]
     internal class Poco
     {

src/ServiceStack.Text/PclExport.cs

@@ -22,7 +22,8 @@ public static class Platforms
         {
             public const string WindowsStore = "WindowsStore";
             public const string Android = "Android";
-            public const string IOS = "IOS";
+			public const string IOS = "IOS";
+            public const string Mac = "MAC";
             public const string Silverlight5 = "Silverlight5";
             public const string WindowsPhone = "WindowsPhone";
         }
@@ -40,6 +41,8 @@ public static PclExport Instance
           = new XboxPclExport()
 #elif __IOS__
           = new IosPclExport()
+#elif __MAC__
+          = new MacPclExport()
 #elif ANDROID
           = new AndroidPclExport()
 #else
@@ -58,6 +61,8 @@ static PclExport()
                     return;
                 if (ConfigureProvider("ServiceStack.AndroidPclExportClient, ServiceStack.Pcl.Android"))
                     return;
+                if (ConfigureProvider("ServiceStack.MacPclExportClient, ServiceStack.Pcl.Mac20"))
+                    return;
                 if (ConfigureProvider("ServiceStack.WinStorePclExportClient, ServiceStack.Pcl.WinStore"))
                     return;
                 if (ConfigureProvider("ServiceStack.Net40PclExportClient, ServiceStack.Pcl.Net45"))