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

Author: mythz

build/build-core.sh

@@ -27,7 +27,7 @@ echo replace Env
 sed -i "s/ServiceStackVersion = [[:digit:]]\+.[[:digit:]]\+m/ServiceStackVersion = ${EnvVersion}m/g" ./src/ServiceStack.Text/Env.cs
 
 echo replace project.json
-sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Text.NetCore/ServiceStack.Text/project.json
+sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Text/project.json
 
 echo replace package
 sed -i "s/<version>[^<]\+/<version>${PackageVersion}/g" ./NuGet.Core/ServiceStack.Text.Core/servicestack.text.core.nuspec

src/ServiceStack.Text/project.json

@@ -66,11 +66,11 @@
         ]
       },
       "frameworkAssemblies": {
-        "System.Runtime.Serialization.Primitives": "4.1.1-*",
-        "System.Runtime.Serialization.Xml": "4.1.1",
-        "System.Net.Requests": "4.0.11",
-        "System.Dynamic.Runtime": "4.0.11",
-        "Microsoft.CSharp": "4.0.1-*"
+        "System.Runtime.Serialization.Primitives": "4.0.0",
+        "System.Runtime.Serialization.Xml": "4.0.0",
+        "System.Net.Requests": "4.0.0",
+        "System.Dynamic.Runtime": "4.0.0",
+        "Microsoft.CSharp": "4.0.0"
       }
     }
   },

tests/ServiceStack.Text.Tests/DynamicModels/DataModel/CustomCollection.cs

@@ -4,7 +4,9 @@
 
 namespace ServiceStack.Text.Tests.DynamicModels.DataModel
 {
+#if !NETCORE
 	[Serializable]
+#endif
 	public class CustomCollection : Collection<CustomCollectionItem>
 	{
 		public int FindItemIndex(string name)

tests/ServiceStack.Text.Tests/DynamicModels/DataModel/CustomCollectionItem.cs

@@ -5,7 +5,9 @@
 
 namespace ServiceStack.Text.Tests.DynamicModels.DataModel
 {
+#if !NETCORE
 	[Serializable]
+#endif
 	public class CustomCollectionItem
 	{
 		public CustomCollectionItem()

tests/ServiceStack.Text.Tests/DynamicModels/DataModel/DataContainer.cs

@@ -3,7 +3,9 @@
 
 namespace ServiceStack.Text.Tests.DynamicModels.DataModel
 {
+#if !NETCORE
 	[Serializable]
+#endif
 	public sealed class DataContainer : DataContainerBase
 	{
 		public IEnumerable<Type> TypeList { get; set; }

tests/ServiceStack.Text.Tests/DynamicModels/DataModel/DataContainerBase.cs

@@ -5,7 +5,9 @@
 
 namespace ServiceStack.Text.Tests.DynamicModels.DataModel
 {
+#if !NETCORE
 	[Serializable]
+#endif
 	public abstract class DataContainerBase
 	{
 		public Guid Identifier { get; set; }

tests/ServiceStack.Text.Tests/DynamicModels/DataModel/ObjectGraph.cs

@@ -6,7 +6,9 @@
 
 namespace ServiceStack.Text.Tests.DynamicModels.DataModel
 {
+#if !NETCORE
 	[Serializable]
+#endif
 	public class ObjectGraph 
 #if !NETCORE
         : ISerializable

tests/ServiceStack.Text.Tests/JsonTests/PublicFieldTest.cs

@@ -3,7 +3,9 @@
 
 namespace ServiceStack.Text.Tests.JsonTests
 {
+#if !NETCORE
 	[Serializable]
+#endif
 	public class TypeWithPublicFields
 	{
 		public readonly string Text;

tests/ServiceStack.Text.Tests/StructTests.cs

@@ -12,7 +12,9 @@ namespace ServiceStack.Text.Tests
     [TestFixture]
     public class StructTests
     {
+#if !NETCORE
         [Serializable]
+#endif
         public class Foo
         {
             public string Name { get; set; }
@@ -24,7 +26,9 @@ public class Foo
 
         public interface IText { }
 
+#if !NETCORE
         [Serializable]
+#endif
         public struct Text
         {
             private readonly string _value;
@@ -209,7 +213,9 @@ public void Can_TreatValueAsRefType()
             JsConfig.Reset();
         }
 
+#if !NETCORE 
         [Serializable]
+#endif
         protected struct DangerousText1
         {
             public static object Parse(string text)
@@ -218,7 +224,9 @@ public static object Parse(string text)
             }
         }
 
+#if !NETCORE
         [Serializable]
+#endif
         protected struct DangerousText2
         {
             public static int Parse(string text)

tests/ServiceStack.Text.Tests/Support/DdnDtos.cs

@@ -24,7 +24,9 @@ public class UserPublicView
 		public ArrayOfPost Posts { get; set; }
 	}
 
+#if !NETCORE
 	[Serializable]
+#endif
 	[DataContract(Namespace = "http://schemas.ddnglobal.com/types/")]
 	public class UserPublicProfile
 	{
@@ -156,7 +158,9 @@ public string AboutMe
 		}
 	}
 
+#if !NETCORE
 	[Serializable]
+#endif
 	[CollectionDataContract(Namespace = "http://schemas.ddnglobal.com/types/", ItemName = "String")]
 	public class ArrayOfString : List<string>
 	{
@@ -169,7 +173,9 @@ public ArrayOfString(IEnumerable<string> collection) : base(collection) { }
 		//public ArrayOfString(params string[] ids) : base(ids) { }
 	}
 
+#if !NETCORE
 	[Serializable]
+#endif
 	[DataContract(Namespace = "http://schemas.ddnglobal.com/types/")]
 	public class UserSearchResult
 		: IHasId<Guid>
@@ -214,7 +220,9 @@ public class UserSearchResult
 		public DateTime ActivationDate { get; set; }
 	}
 
+#if !NETCORE
 	[Serializable]
+#endif
 	[CollectionDataContract(Namespace = "http://schemas.ddnglobal.com/types/", ItemName = "Post")]
 	public class ArrayOfPost : List<Post>
 	{
@@ -224,7 +232,9 @@ public ArrayOfPost(IEnumerable<Post> collection) : base(collection) { }
 		public static ArrayOfPost New(params Post[] ids) { return new ArrayOfPost(ids); }
 	}
 
+#if !NETCORE
 	[Serializable]
+#endif
 	[DataContract(Namespace = "http://schemas.ddnglobal.com/types/")]
 	public class Post
 		: IHasStringId
@@ -677,7 +687,9 @@ public string LinkUrl
 	}
 
 	[DataContract(Namespace = "http://schemas.ddnglobal.com/types/")]
+#if !NETCORE
 	[Serializable]
+#endif
 	public class ImageAsset
 	{
 		[DataMember(EmitDefaultValue = false)]