Relax dynamic CoreCLR #defs to just SL5 && CORECLR

mythz · mythz · commit 294d6d391c4a · 2015-05-21T22:06:31.000+08:00
diff --git a/src/ServiceStack.Text/Pcl.Dynamic.cs b/src/ServiceStack.Text/Pcl.Dynamic.cs
@@ -1,7 +1,7 @@
 //Copyright (c) Service Stack LLC. All Rights Reserved.
 //License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
 
-#if !PCL && FALSE
+#if !PCL
 
 using System;
 using System.Collections.Generic;
@@ -87,6 +87,9 @@ private static int VerifyAndGetStartIndex(string value, Type createMapType)
         }
     }
 
+//TODO: Workout how to fix broken CoreCLR SL5 build that uses dynamic
+#if !(SL5 && CORECLR)
+
     public class DynamicJson : DynamicObject
     {
         private readonly IDictionary<string, object> _hash = new Dictionary<string, object>();
@@ -179,6 +182,7 @@ internal static string Underscored(IEnumerable<char> pascalCase)
             return sb.ToString().ToLowerInvariant();
         }
     }
+#endif
 }
 
 #endif
diff --git a/src/ServiceStack.Text/PclExport.Net40.cs b/src/ServiceStack.Text/PclExport.Net40.cs
@@ -456,7 +456,7 @@ public override ParseStringDelegate GetSpecializedCollectionParseMethod<TSeriali
 
         public override ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type type)
         {
-#if !__IOS__ && FALSE
+#if !__IOS__
             if (type.AssignableFrom(typeof(System.Dynamic.IDynamicMetaObjectProvider)) ||
                 type.HasInterface(typeof(System.Dynamic.IDynamicMetaObjectProvider)))
             {
diff --git a/src/ServiceStack.Text/PclExport.Sl5.cs b/src/ServiceStack.Text/PclExport.Sl5.cs
@@ -44,8 +44,8 @@ public override Assembly LoadAssembly(string assemblyPath)
 
         public override Assembly[] GetAllAssemblies()
         {
-//TODO: Get dynamic working in sl5 builds
-#if FALSE 
+//TODO: Workout how to fix broken CoreCLR SL5 build that uses dynamic
+#if !(SL5 && CORECLR)
             return ((dynamic)AppDomain.CurrentDomain).GetAssemblies() as Assembly[];
 #else
             return new Assembly[0]; 
diff --git a/src/ServiceStack.Text/PclExport.cs b/src/ServiceStack.Text/PclExport.cs
@@ -396,14 +396,12 @@ public virtual ParseStringDelegate GetSpecializedCollectionParseMethod<TSerializ
         public virtual ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type type)
             where TSerializer : ITypeSerializer
         {
-#if !PCL && FALSE
             if (type.AssignableFrom(typeof(System.Dynamic.IDynamicMetaObjectProvider)) ||
                 type.HasInterface(typeof(System.Dynamic.IDynamicMetaObjectProvider)))
             {
-	            return DeserializeDynamic<TSerializer>.Parse;
+                return DeserializeDynamic<TSerializer>.Parse;
             }
-#endif
-	        return null;
+            return null;
         }
 
         public virtual XmlSerializer NewXmlSerializer()
diff --git a/src/ServiceStack.Text/ServiceStack.Text-vs2015.sln b/src/ServiceStack.Text/ServiceStack.Text-vs2015.sln
@@ -0,0 +1,22 @@
+﻿
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.22823.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ServiceStack.Text", "ServiceStack.Text.xproj", "{8F56DF61-B041-4B95-B658-EB51EBEF4EF6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8F56DF61-B041-4B95-B658-EB51EBEF4EF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F56DF61-B041-4B95-B658-EB51EBEF4EF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F56DF61-B041-4B95-B658-EB51EBEF4EF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F56DF61-B041-4B95-B658-EB51EBEF4EF6}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/src/ServiceStack.Text/ServiceStack.Text.xproj b/src/ServiceStack.Text/ServiceStack.Text.xproj
@@ -24,5 +24,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
+  </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
diff --git a/src/ServiceStack.Text/project.json b/src/ServiceStack.Text/project.json
@@ -3,12 +3,10 @@
 
   "frameworks": {
 
-    "net45+win+wpa81+MonoAndroid10+Xamarin.iOS10+MonoTouch10": {
+    "net45+sl5+MonoAndroid10+Xamarin.iOS10+MonoTouch10": {
       "frameworkAssemblies": {
-        "Microsoft.CSharp": "",
         "System.Core": "",
         "System.Collections": "",
-        "System.Runtime": "",
         "System.Linq": "",
         "System.Linq.Expressions": "",
         "System.Linq.Queryable": "",
@@ -17,20 +15,26 @@
         "System.Reflection.Extensions": "",
         "System.Diagnostics.Debug": "",
         "System.ObjectModel": "",
+        "System.Threading": "",
+        "System.Runtime": "",
         "System.Runtime.Extensions": "",
-        "System.Threading": ""
-      }
+        "System.Runtime.Serialization.Primitives": "",
+        "System.Runtime.Serialization.Json": "",
+        "System.Runtime.Serialization.Xml": "",
+        "System.Net.Requests": "",
+        "System.Net.Http": ""
+      },
+      "compilationOptions": { "define": [ "PCL", "CORECLR" ] }
     },
     "net45": {
       "frameworkAssemblies": {
-        "Microsoft.CSharp": "",
         "System.Core": "",
         "System.Runtime.Serialization": "",
         "System.Xml": "",
         "System.Data.Linq": "",
         "System.Configuration": ""
       },
-      "compilationOptions": { "define": [ "NET45" ] }
+      "compilationOptions": { "define": [ "NET45", "CORECLR" ] }
     },
     "sl5": {
       "frameworkAssemblies": {
@@ -41,17 +45,18 @@
         "System.Net": "",
         "System.Xml": "",
         "System.Windows": ""
-      }
+      },
+      "compilationOptions": { "define": [ "SL5", "CORECLR" ] }
     },
     "dnx451": {
       "frameworkAssemblies": {
         "System.Core": "",
-        "Microsoft.CSharp": "",
         "System.Runtime.Serialization": "",
         "System.Xml": "",
         "System.Data.Linq": "",
         "System.Configuration": ""
-      }
+      },
+      "compilationOptions": { "define": [ "DNX451", "CORECLR" ] }
     }
   }
 }
diff --git a/src/ServiceStack.Text/project.lock.json b/src/ServiceStack.Text/project.lock.json
@@ -4,7 +4,6 @@
   "projectFileDependencyGroups": {
     "": [],
     ".NETFramework,Version=v4.5": [
-      "framework/Microsoft.CSharp ",
       "framework/System.Core ",
       "framework/System.Runtime.Serialization ",
       "framework/System.Xml ",
@@ -22,7 +21,6 @@
     ],
     "DNX,Version=v4.5.1": [
       "framework/System.Core ",
-      "framework/Microsoft.CSharp ",
       "framework/System.Runtime.Serialization ",
       "framework/System.Xml ",
       "framework/System.Data.Linq ",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`//Copyright (c) Service Stack LLC. All Rights Reserved.`
`2`	`2`	`//License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt`
`3`	`3`
`4`		`-#if !PCL && FALSE`
	`4`	`+#if !PCL`
`5`	`5`
`6`	`6`	`using System;`
`7`	`7`	`using System.Collections.Generic;`
`@@ -87,6 +87,9 @@ private static int VerifyAndGetStartIndex(string value, Type createMapType)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
	`90`	`+//TODO: Workout how to fix broken CoreCLR SL5 build that uses dynamic`
	`91`	`+#if !(SL5 && CORECLR)`
	`92`	`+`
`90`	`93`	`public class DynamicJson : DynamicObject`
`91`	`94`	`{`
`92`	`95`	`private readonly IDictionary<string, object> _hash = new Dictionary<string, object>();`
`@@ -179,6 +182,7 @@ internal static string Underscored(IEnumerable<char> pascalCase)`
`179`	`182`	`return sb.ToString().ToLowerInvariant();`
`180`	`183`	`}`
`181`	`184`	`}`
	`185`	`+#endif`
`182`	`186`	`}`
`183`	`187`
`184`	`188`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ public override ParseStringDelegate GetSpecializedCollectionParseMethod<TSeriali`
`456`	`456`
`457`	`457`	`public override ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type type)`
`458`	`458`	`{`
`459`		`-#if !__IOS__ && FALSE`
	`459`	`+#if !__IOS__`
`460`	`460`	`if (type.AssignableFrom(typeof(System.Dynamic.IDynamicMetaObjectProvider)) \|\|`
`461`	`461`	`type.HasInterface(typeof(System.Dynamic.IDynamicMetaObjectProvider)))`
`462`	`462`	`{`
Original file line number	Diff line number	Diff line change
`@@ -396,14 +396,12 @@ public virtual ParseStringDelegate GetSpecializedCollectionParseMethod<TSerializ`
`396`	`396`	`public virtual ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type type)`
`397`	`397`	`where TSerializer : ITypeSerializer`
`398`	`398`	`{`
`399`		`-#if !PCL && FALSE`
`400`	`399`	`if (type.AssignableFrom(typeof(System.Dynamic.IDynamicMetaObjectProvider)) \|\|`
`401`	`400`	`type.HasInterface(typeof(System.Dynamic.IDynamicMetaObjectProvider)))`
`402`	`401`	`{`
`403`		`- return DeserializeDynamic<TSerializer>.Parse;`
	`402`	`+ return DeserializeDynamic<TSerializer>.Parse;`
`404`	`403`	`}`
`405`		`-#endif`
`406`		`- return null;`
	`404`	`+ return null;`
`407`	`405`	`}`
`408`	`406`
`409`	`407`	`public virtual XmlSerializer NewXmlSerializer()`