Add initial support for CoreCLR pcl, net45, sl5, dnx451 builds

mythz · mythz · commit ada5503ebec6 · 2015-05-21T02:55:50.000+08:00
diff --git a/src/ServiceStack.Text/Common/DeserializeBuiltin.cs b/src/ServiceStack.Text/Common/DeserializeBuiltin.cs
@@ -80,7 +80,7 @@ private static ParseStringDelegate GetParseFn()
                     return value => DateTimeSerializer.ParseDateTimeOffset(value);
                 if (typeof(T) == typeof(TimeSpan))
                     return value => DateTimeSerializer.ParseTimeSpan(value);
-#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL)
+#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL || DNX451 || DNXCORE50)
                 if (typeof(T) == typeof(System.Data.Linq.Binary))
                     return value => new System.Data.Linq.Binary(Convert.FromBase64String(value));
 #endif
diff --git a/src/ServiceStack.Text/Common/JsWriter.cs b/src/ServiceStack.Text/Common/JsWriter.cs
@@ -166,7 +166,7 @@ public JsWriter()
         		{ typeof(Uri), Serializer.WriteObjectString },
         		{ typeof(Type), WriteType },
         		{ typeof(Exception), Serializer.WriteException },
-#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL)
+#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL || DNX451 || DNXCORE50)
                 { typeof(System.Data.Linq.Binary), Serializer.WriteLinqBinary },
 #endif
         	};
diff --git a/src/ServiceStack.Text/Json/JsonTypeSerializer.cs b/src/ServiceStack.Text/Json/JsonTypeSerializer.cs
@@ -309,7 +309,7 @@ public void WriteEnumFlags(TextWriter writer, object enumFlagValue)
 
         public void WriteLinqBinary(TextWriter writer, object linqBinaryValue)
         {
-#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL)
+#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL || DNX451 || DNXCORE50)
             WriteRawString(writer, Convert.ToBase64String(((System.Data.Linq.Binary)linqBinaryValue).ToArray()));
 #endif
         }
diff --git a/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs b/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs
@@ -255,7 +255,7 @@ public void WriteEnumFlags(TextWriter writer, object enumFlagValue)
 
 		public void WriteLinqBinary(TextWriter writer, object linqBinaryValue)
         {
-#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL)
+#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL || DNX451 || DNXCORE50)
             WriteRawString(writer, Convert.ToBase64String(((System.Data.Linq.Binary)linqBinaryValue).ToArray()));
 #endif
         }
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
+#if !PCL && FALSE
 
 using System;
 using System.Collections.Generic;
diff --git a/src/ServiceStack.Text/PclExport.Net40.cs b/src/ServiceStack.Text/PclExport.Net40.cs
@@ -43,8 +43,13 @@ public Net40PclExport()
             this.DirSep = Path.DirectorySeparatorChar;
             this.AltDirSep = Path.DirectorySeparatorChar == '/' ? '\\' : '/';
             this.RegexOptions = RegexOptions.Compiled;
+#if DNXCORE50
+            this.InvariantComparison = CultureInfo.InvariantCulture.CompareInfo.GetStringComparer();
+            this.InvariantComparisonIgnoreCase = CultureInfo.InvariantCultureIgnoreCase.CompareInfo.GetStringComparer();
+#else
             this.InvariantComparison = StringComparison.InvariantCulture;
             this.InvariantComparisonIgnoreCase = StringComparison.InvariantCultureIgnoreCase;
+#endif
             this.InvariantComparer = StringComparer.InvariantCulture;
             this.InvariantComparerIgnoreCase = StringComparer.InvariantCultureIgnoreCase;
 
@@ -451,7 +456,7 @@ public override ParseStringDelegate GetSpecializedCollectionParseMethod<TSeriali
 
         public override ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type type)
         {
-#if !__IOS__
+#if !__IOS__ && FALSE
             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,7 +44,12 @@ public override Assembly LoadAssembly(string assemblyPath)
 
         public override Assembly[] GetAllAssemblies()
         {
+//TODO: Get dynamic working in sl5 builds
+#if FALSE 
             return ((dynamic)AppDomain.CurrentDomain).GetAssemblies() as Assembly[];
+#else
+            return new Assembly[0]; 
+#endif
         }
 
         public override Type GetGenericCollectionType(Type type)
diff --git a/src/ServiceStack.Text/PclExport.cs b/src/ServiceStack.Text/PclExport.cs
@@ -396,7 +396,7 @@ public virtual ParseStringDelegate GetSpecializedCollectionParseMethod<TSerializ
         public virtual ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type type)
             where TSerializer : ITypeSerializer
         {
-#if !PCL
+#if !PCL && FALSE
             if (type.AssignableFrom(typeof(System.Dynamic.IDynamicMetaObjectProvider)) ||
                 type.HasInterface(typeof(System.Dynamic.IDynamicMetaObjectProvider)))
             {
diff --git a/src/ServiceStack.Text/ReflectionExtensions.cs b/src/ServiceStack.Text/ReflectionExtensions.cs
@@ -1425,7 +1425,7 @@ public static Type FirstGenericTypeDefinition(this Type type)
 
         public static bool IsDynamic(this Assembly assembly)
         {
-#if __IOS__ || WP || NETFX_CORE || PCL
+#if __IOS__ || WP || NETFX_CORE || PCL || DNX451 || DNXCORE50
             return false;
 #else
             try
diff --git a/src/ServiceStack.Text/ServiceStack.Text.xproj b/src/ServiceStack.Text/ServiceStack.Text.xproj
@@ -0,0 +1,28 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="__ToolsVersion__" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>8f56df61-b041-4b95-b658-eb51ebef4ef6</ProjectGuid>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <AssemblyName>ServiceStack.Text</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <RootNamespace>ServiceStack.Text</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|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
@@ -0,0 +1,57 @@
+{
+  "version": "4.0.0-*",
+
+  "frameworks": {
+
+    "net45+win+wpa81+MonoAndroid10+Xamarin.iOS10+MonoTouch10": {
+      "frameworkAssemblies": {
+        "Microsoft.CSharp": "",
+        "System.Core": "",
+        "System.Collections": "",
+        "System.Runtime": "",
+        "System.Linq": "",
+        "System.Linq.Expressions": "",
+        "System.Linq.Queryable": "",
+        "System.Text.RegularExpressions": "",
+        "System.Reflection": "",
+        "System.Reflection.Extensions": "",
+        "System.Diagnostics.Debug": "",
+        "System.ObjectModel": "",
+        "System.Runtime.Extensions": "",
+        "System.Threading": ""
+      }
+    },
+    "net45": {
+      "frameworkAssemblies": {
+        "Microsoft.CSharp": "",
+        "System.Core": "",
+        "System.Runtime.Serialization": "",
+        "System.Xml": "",
+        "System.Data.Linq": "",
+        "System.Configuration": ""
+      },
+      "compilationOptions": { "define": [ "NET45" ] }
+    },
+    "sl5": {
+      "frameworkAssemblies": {
+        "System": "",
+        "System.Core": "",
+        "mscorlib": "",
+        "System.Runtime.Serialization": "",
+        "System.Net": "",
+        "System.Xml": "",
+        "System.Windows": ""
+      }
+    },
+    "dnx451": {
+      "frameworkAssemblies": {
+        "System.Core": "",
+        "Microsoft.CSharp": "",
+        "System.Runtime.Serialization": "",
+        "System.Xml": "",
+        "System.Data.Linq": "",
+        "System.Configuration": ""
+      }
+    }
+  }
+}
diff --git a/src/ServiceStack.Text/project.lock.json b/src/ServiceStack.Text/project.lock.json
@@ -0,0 +1,33 @@
+{
+  "locked": false,
+  "version": -9998,
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": [
+      "framework/Microsoft.CSharp ",
+      "framework/System.Core ",
+      "framework/System.Runtime.Serialization ",
+      "framework/System.Xml ",
+      "framework/System.Data.Linq ",
+      "framework/System.Configuration "
+    ],
+    "Silverlight,Version=v5.0": [
+      "framework/System ",
+      "framework/System.Core ",
+      "framework/mscorlib ",
+      "framework/System.Runtime.Serialization ",
+      "framework/System.Net ",
+      "framework/System.Xml ",
+      "framework/System.Windows "
+    ],
+    "DNX,Version=v4.5.1": [
+      "framework/System.Core ",
+      "framework/Microsoft.CSharp ",
+      "framework/System.Runtime.Serialization ",
+      "framework/System.Xml ",
+      "framework/System.Data.Linq ",
+      "framework/System.Configuration "
+    ]
+  },
+  "libraries": {}
+}

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ public void WriteEnumFlags(TextWriter writer, object enumFlagValue)`
`309`	`309`
`310`	`310`	`public void WriteLinqBinary(TextWriter writer, object linqBinaryValue)`
`311`	`311`	`{`
`312`		`-#if !(__IOS__ \|\| SL5 \|\| XBOX \|\| ANDROID \|\| PCL)`
	`312`	`+#if !(__IOS__ \|\| SL5 \|\| XBOX \|\| ANDROID \|\| PCL \|\| DNX451 \|\| DNXCORE50)`
`313`	`313`	`WriteRawString(writer, Convert.ToBase64String(((System.Data.Linq.Binary)linqBinaryValue).ToArray()));`
`314`	`314`	`#endif`
`315`	`315`	`}`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ public void WriteEnumFlags(TextWriter writer, object enumFlagValue)`
`255`	`255`
`256`	`256`	`public void WriteLinqBinary(TextWriter writer, object linqBinaryValue)`
`257`	`257`	`{`
`258`		`-#if !(__IOS__ \|\| SL5 \|\| XBOX \|\| ANDROID \|\| PCL)`
	`258`	`+#if !(__IOS__ \|\| SL5 \|\| XBOX \|\| ANDROID \|\| PCL \|\| DNX451 \|\| DNXCORE50)`
`259`	`259`	`WriteRawString(writer, Convert.ToBase64String(((System.Data.Linq.Binary)linqBinaryValue).ToArray()));`
`260`	`260`	`#endif`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,12 @@ public override Assembly LoadAssembly(string assemblyPath)`
`44`	`44`
`45`	`45`	`public override Assembly[] GetAllAssemblies()`
`46`	`46`	`{`
	`47`	`+//TODO: Get dynamic working in sl5 builds`
	`48`	`+#if FALSE`
`47`	`49`	`return ((dynamic)AppDomain.CurrentDomain).GetAssemblies() as Assembly[];`
	`50`	`+#else`
	`51`	`+ return new Assembly[0];`
	`52`	`+#endif`
`48`	`53`	`}`
`49`	`54`
`50`	`55`	`public override Type GetGenericCollectionType(Type type)`
Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@ public virtual ParseStringDelegate GetSpecializedCollectionParseMethod<TSerializ`
`396`	`396`	`public virtual ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type type)`
`397`	`397`	`where TSerializer : ITypeSerializer`
`398`	`398`	`{`
`399`		`-#if !PCL`
	`399`	`+#if !PCL && FALSE`
`400`	`400`	`if (type.AssignableFrom(typeof(System.Dynamic.IDynamicMetaObjectProvider)) \|\|`
`401`	`401`	`type.HasInterface(typeof(System.Dynamic.IDynamicMetaObjectProvider)))`
`402`	`402`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1425,7 +1425,7 @@ public static Type FirstGenericTypeDefinition(this Type type)`
`1425`	`1425`
`1426`	`1426`	`public static bool IsDynamic(this Assembly assembly)`
`1427`	`1427`	`{`
`1428`		`-#if __IOS__ \|\| WP \|\| NETFX_CORE \|\| PCL`
	`1428`	`+#if __IOS__ \|\| WP \|\| NETFX_CORE \|\| PCL \|\| DNX451 \|\| DNXCORE50`
`1429`	`1429`	`return false;`
`1430`	`1430`	`#else`
`1431`	`1431`	`try`