Remove dependencies to System.Xml and Microsoft.CSharp in PCL builds

mythz · mythz · commit 9e620350034d · 2015-08-26T17:08:57.000-04:00
diff --git a/src/ServiceStack.Text/Common/DateTimeSerializer.cs b/src/ServiceStack.Text/Common/DateTimeSerializer.cs
@@ -14,8 +14,8 @@
 using System.Globalization;
 using System.IO;
 using System.Text;
-using System.Xml;
 using ServiceStack.Text.Json;
+using ServiceStack.Text.Support;
 
 namespace ServiceStack.Text.Common
 {
@@ -355,13 +355,18 @@ public static string ToLocalXsdDateTimeString(DateTime dateTime)
 
         public static string ToXsdTimeSpanString(TimeSpan timeSpan)
         {
-            var r = XmlConvert.ToString(timeSpan);
+#if !PCL
+            var r = System.Xml.XmlConvert.ToString(timeSpan);
             if (Env.IsMono)
             {
                 // Mono returns DT even if time is 00:00:00
-                if (r.EndsWith("DT")) return r.Substring(0, r.Length - 1);
+                if (r.EndsWith("DT")) 
+                    return r.Substring(0, r.Length - 1);
             }
             return r;
+#else
+            return TimeSpanConverter.ToXsdDuration(timeSpan);
+#endif
         }
 
         public static string ToXsdTimeSpanString(TimeSpan? timeSpan)
@@ -390,23 +395,27 @@ public static TimeSpan ParseNSTimeInterval(string doubleInSecs)
             return TimeSpan.FromSeconds(secs);
         }
 
-        public static TimeSpan ParseXsdTimeSpan(string dateTimeStr)
-        {
-            return XmlConvert.ToTimeSpan(dateTimeStr);
-        }
-
         public static TimeSpan? ParseNullableTimeSpan(string dateTimeStr)
         {
             return string.IsNullOrEmpty(dateTimeStr)
                 ? (TimeSpan?)null
                 : ParseTimeSpan(dateTimeStr);
         }
 
+        public static TimeSpan ParseXsdTimeSpan(string dateTimeStr)
+        {
+#if !PCL
+            return System.Xml.XmlConvert.ToTimeSpan(dateTimeStr);
+#else
+            return TimeSpanConverter.FromXsdDuration(dateTimeStr);
+#endif
+        }
+
         public static TimeSpan? ParseXsdNullableTimeSpan(string dateTimeStr)
         {
-            return String.IsNullOrEmpty(dateTimeStr) ?
+            return string.IsNullOrEmpty(dateTimeStr) ?
                 null :
-                new TimeSpan?(XmlConvert.ToTimeSpan(dateTimeStr));
+                new TimeSpan?(ParseXsdTimeSpan(dateTimeStr));
         }
 
         public static string ToShortestXsdDateTimeString(DateTime dateTime)
diff --git a/src/ServiceStack.Text/HttpUtils.cs b/src/ServiceStack.Text/HttpUtils.cs
@@ -784,7 +784,7 @@ public static void UploadFile(this WebRequest webRequest, Stream fileStream, str
             UploadFile(webRequest, fileStream, fileName, mimeType);
         }
 
-#if !XBOX
+#if !(XBOX || PCL)
         public static string PostXmlToUrl(this string url, object data,
             Action<HttpWebRequest> requestFilter = null, Action<HttpWebResponse> responseFilter = null)
         {
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 || __IOS__ || ANDROID)
 
 using System;
 using System.Collections.Generic;
diff --git a/src/ServiceStack.Text/PclExport.Net40.cs b/src/ServiceStack.Text/PclExport.Net40.cs
@@ -17,7 +17,6 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-using System.Xml;
 using ServiceStack.Text;
 using ServiceStack.Text.Common;
 using ServiceStack.Text.Json;
@@ -411,23 +410,37 @@ private Expression GetCastOrConvertExpression(Expression expression, Type target
 
         public override string ToXsdDateTimeString(DateTime dateTime)
         {
-            return XmlConvert.ToString(dateTime.ToStableUniversalTime(), XmlDateTimeSerializationMode.Utc);
+#if !(__IOS__ || ANDROID)
+            return System.Xml.XmlConvert.ToString(dateTime.ToStableUniversalTime(), System.Xml.XmlDateTimeSerializationMode.Utc);
+#else
+            return dateTime.ToStableUniversalTime().ToString(DateTimeSerializer.XsdDateTimeFormat);
+#endif
         }
 
         public override string ToLocalXsdDateTimeString(DateTime dateTime)
         {
-            return XmlConvert.ToString(dateTime, XmlDateTimeSerializationMode.Local);
+#if !(__IOS__ || ANDROID)
+            return System.Xml.XmlConvert.ToString(dateTime, System.Xml.XmlDateTimeSerializationMode.Local);
+#else
+            return dateTime.ToString(DateTimeSerializer.XsdDateTimeFormat);
+#endif
         }
 
         public override DateTime ParseXsdDateTime(string dateTimeStr)
         {
-            return XmlConvert.ToDateTime(dateTimeStr, XmlDateTimeSerializationMode.Utc);
+#if !(__IOS__ || ANDROID)
+            return System.Xml.XmlConvert.ToDateTime(dateTimeStr, System.Xml.XmlDateTimeSerializationMode.Utc);
+#else
+            return DateTime.ParseExact(dateTimeStr, DateTimeSerializer.XsdDateTimeFormat, CultureInfo.InvariantCulture);
+#endif
         }
 
+#if !(__IOS__ || ANDROID)
         public override DateTime ParseXsdDateTimeAsUtc(string dateTimeStr)
         {
-            return XmlConvert.ToDateTime(dateTimeStr, XmlDateTimeSerializationMode.Utc).Prepare(parsedAsUtc: true);
+            return System.Xml.XmlConvert.ToDateTime(dateTimeStr, System.Xml.XmlDateTimeSerializationMode.Utc).Prepare(parsedAsUtc: true);
         }
+#endif
 
         public override DateTime ToStableUniversalTime(DateTime dateTime)
         {
@@ -466,11 +479,6 @@ public override ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type typ
             return null;
         }
 
-        public override XmlSerializer NewXmlSerializer()
-        {
-            return new XmlSerializer();
-        }
-
         public override void InitHttpWebRequest(HttpWebRequest httpReq,
             long? contentLength = null, bool allowAutoRedirect = true, bool keepAlive = true)
         {
@@ -1214,7 +1222,7 @@ public static void CompressToStream<TXmlDto>(TXmlDto from, Stream stream)
             throw new NotImplementedException("Compression is not supported on this platform");
 #else
             using (var deflateStream = new System.IO.Compression.DeflateStream(stream, System.IO.Compression.CompressionMode.Compress))
-            using (var xw = new XmlTextWriter(deflateStream, Encoding.UTF8))
+            using (var xw = new System.Xml.XmlTextWriter(deflateStream, Encoding.UTF8))
             {
                 var serializer = new DataContractSerializer(from.GetType());
                 serializer.WriteObject(xw, from);
diff --git a/src/ServiceStack.Text/PclExport.cs b/src/ServiceStack.Text/PclExport.cs
@@ -12,7 +12,6 @@
 using System.Runtime.Serialization;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Xml;
 using ServiceStack.Text;
 using ServiceStack.Text.Common;
 
@@ -353,26 +352,35 @@ public virtual PropertyGetterDelegate GetFieldGetterFn(FieldInfo fieldInfo)
 
         public virtual string ToXsdDateTimeString(DateTime dateTime)
         {
-            return XmlConvert.ToString(dateTime.ToStableUniversalTime(), DateTimeSerializer.XsdDateTimeFormat);
+#if !PCL
+            return System.Xml.XmlConvert.ToString(dateTime.ToStableUniversalTime(), DateTimeSerializer.XsdDateTimeFormat);
+#else
+            return dateTime.ToStableUniversalTime().ToString(DateTimeSerializer.XsdDateTimeFormat);
+#endif
         }
 
         public virtual string ToLocalXsdDateTimeString(DateTime dateTime)
         {
-            return XmlConvert.ToString(dateTime, DateTimeSerializer.XsdDateTimeFormat);
+#if !PCL
+            return System.Xml.XmlConvert.ToString(dateTime, DateTimeSerializer.XsdDateTimeFormat);
+#else
+            return dateTime.ToString(DateTimeSerializer.XsdDateTimeFormat);
+#endif
         }
 
         public virtual DateTime ParseXsdDateTime(string dateTimeStr)
         {
-            return XmlConvert.ToDateTimeOffset(dateTimeStr).DateTime;
+#if !PCL
+            return System.Xml.XmlConvert.ToDateTimeOffset(dateTimeStr).DateTime;
+#else
+            return DateTime.ParseExact(dateTimeStr, DateTimeSerializer.XsdDateTimeFormat, CultureInfo.InvariantCulture);
+#endif
         }
 
         public virtual DateTime ParseXsdDateTimeAsUtc(string dateTimeStr)
         {
-            var knownDateTime = DateTimeSerializer.ParseManual(dateTimeStr);
-            if (knownDateTime == null)
-                throw new ArgumentException("Unable to parse unknown format: {0}".Fmt(dateTimeStr));
-
-            return knownDateTime.Value;
+            return DateTimeSerializer.ParseManual(dateTimeStr, DateTimeKind.Utc)
+                ?? DateTime.ParseExact(dateTimeStr, DateTimeSerializer.XsdDateTimeFormat, CultureInfo.InvariantCulture);
         }
 
         public virtual DateTime ToStableUniversalTime(DateTime dateTime)
@@ -406,11 +414,6 @@ public virtual ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type type
             return null;
         }
 
-        public virtual XmlSerializer NewXmlSerializer()
-        {
-            return new XmlSerializer();
-        }
-
         public virtual void InitHttpWebRequest(HttpWebRequest httpReq,
             long? contentLength = null, bool allowAutoRedirect = true, bool keepAlive = true)
         {            
diff --git a/src/ServiceStack.Text/StringExtensions.cs b/src/ServiceStack.Text/StringExtensions.cs
@@ -998,7 +998,7 @@ public static int CountOccurrencesOf(this string text, char needle)
             return count;
         }
 
-#if !XBOX
+#if !(XBOX || PCL)
         public static string HexEscape(this string text, params char[] anyCharOf)
         {
             if (String.IsNullOrEmpty(text)) return text;
diff --git a/src/ServiceStack.Text/XmlSerializer.cs b/src/ServiceStack.Text/XmlSerializer.cs
@@ -1,4 +1,4 @@
-#if !XBOX
+#if !(XBOX || PCL)
 using System;
 using System.IO;
 using System.Runtime.Serialization;
@@ -12,7 +12,7 @@ public class XmlSerializer
         private static readonly XmlWriterSettings XWSettings = new XmlWriterSettings();
         private static readonly XmlReaderSettings XRSettings = new XmlReaderSettings();
 
-        public static XmlSerializer Instance = PclExport.Instance.NewXmlSerializer();
+        public static XmlSerializer Instance = new XmlSerializer();
 
         public XmlSerializer(bool omitXmlDeclaration = false, int maxCharsInDocument = 1024 * 1024)
         {

Original file line number	Diff line number	Diff line change
`@@ -784,7 +784,7 @@ public static void UploadFile(this WebRequest webRequest, Stream fileStream, str`
`784`	`784`	`UploadFile(webRequest, fileStream, fileName, mimeType);`
`785`	`785`	`}`
`786`	`786`
`787`		`-#if !XBOX`
	`787`	`+#if !(XBOX \|\| PCL)`
`788`	`788`	`public static string PostXmlToUrl(this string url, object data,`
`789`	`789`	`Action<HttpWebRequest> requestFilter = null, Action<HttpWebResponse> responseFilter = null)`
`790`	`790`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`using System.Text;`
`18`	`18`	`using System.Text.RegularExpressions;`
`19`	`19`	`using System.Threading;`
`20`		`-using System.Xml;`
`21`	`20`	`using ServiceStack.Text;`
`22`	`21`	`using ServiceStack.Text.Common;`
`23`	`22`	`using ServiceStack.Text.Json;`
`@@ -411,23 +410,37 @@ private Expression GetCastOrConvertExpression(Expression expression, Type target`
`411`	`410`
`412`	`411`	`public override string ToXsdDateTimeString(DateTime dateTime)`
`413`	`412`	`{`
`414`		`- return XmlConvert.ToString(dateTime.ToStableUniversalTime(), XmlDateTimeSerializationMode.Utc);`
	`413`	`+#if !(__IOS__ \|\| ANDROID)`
	`414`	`+ return System.Xml.XmlConvert.ToString(dateTime.ToStableUniversalTime(), System.Xml.XmlDateTimeSerializationMode.Utc);`
	`415`	`+#else`
	`416`	`+ return dateTime.ToStableUniversalTime().ToString(DateTimeSerializer.XsdDateTimeFormat);`
	`417`	`+#endif`
`415`	`418`	`}`
`416`	`419`
`417`	`420`	`public override string ToLocalXsdDateTimeString(DateTime dateTime)`
`418`	`421`	`{`
`419`		`- return XmlConvert.ToString(dateTime, XmlDateTimeSerializationMode.Local);`
	`422`	`+#if !(__IOS__ \|\| ANDROID)`
	`423`	`+ return System.Xml.XmlConvert.ToString(dateTime, System.Xml.XmlDateTimeSerializationMode.Local);`
	`424`	`+#else`
	`425`	`+ return dateTime.ToString(DateTimeSerializer.XsdDateTimeFormat);`
	`426`	`+#endif`
`420`	`427`	`}`
`421`	`428`
`422`	`429`	`public override DateTime ParseXsdDateTime(string dateTimeStr)`
`423`	`430`	`{`
`424`		`- return XmlConvert.ToDateTime(dateTimeStr, XmlDateTimeSerializationMode.Utc);`
	`431`	`+#if !(__IOS__ \|\| ANDROID)`
	`432`	`+ return System.Xml.XmlConvert.ToDateTime(dateTimeStr, System.Xml.XmlDateTimeSerializationMode.Utc);`
	`433`	`+#else`
	`434`	`+ return DateTime.ParseExact(dateTimeStr, DateTimeSerializer.XsdDateTimeFormat, CultureInfo.InvariantCulture);`
	`435`	`+#endif`
`425`	`436`	`}`
`426`	`437`
	`438`	`+#if !(__IOS__ \|\| ANDROID)`
`427`	`439`	`public override DateTime ParseXsdDateTimeAsUtc(string dateTimeStr)`
`428`	`440`	`{`
`429`		`- return XmlConvert.ToDateTime(dateTimeStr, XmlDateTimeSerializationMode.Utc).Prepare(parsedAsUtc: true);`
	`441`	`+ return System.Xml.XmlConvert.ToDateTime(dateTimeStr, System.Xml.XmlDateTimeSerializationMode.Utc).Prepare(parsedAsUtc: true);`
`430`	`442`	`}`
	`443`	`+#endif`
`431`	`444`
`432`	`445`	`public override DateTime ToStableUniversalTime(DateTime dateTime)`
`433`	`446`	`{`
`@@ -466,11 +479,6 @@ public override ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type typ`
`466`	`479`	`return null;`
`467`	`480`	`}`
`468`	`481`
`469`		`- public override XmlSerializer NewXmlSerializer()`
`470`		`- {`
`471`		`- return new XmlSerializer();`
`472`		`- }`
`473`		`-`
`474`	`482`	`public override void InitHttpWebRequest(HttpWebRequest httpReq,`
`475`	`483`	`long? contentLength = null, bool allowAutoRedirect = true, bool keepAlive = true)`
`476`	`484`	`{`
`@@ -1214,7 +1222,7 @@ public static void CompressToStream<TXmlDto>(TXmlDto from, Stream stream)`
`1214`	`1222`	`throw new NotImplementedException("Compression is not supported on this platform");`
`1215`	`1223`	`#else`
`1216`	`1224`	`using (var deflateStream = new System.IO.Compression.DeflateStream(stream, System.IO.Compression.CompressionMode.Compress))`
`1217`		`- using (var xw = new XmlTextWriter(deflateStream, Encoding.UTF8))`
	`1225`	`+ using (var xw = new System.Xml.XmlTextWriter(deflateStream, Encoding.UTF8))`
`1218`	`1226`	`{`
`1219`	`1227`	`var serializer = new DataContractSerializer(from.GetType());`
`1220`	`1228`	`serializer.WriteObject(xw, from);`
Original file line number	Diff line number	Diff line change
`@@ -998,7 +998,7 @@ public static int CountOccurrencesOf(this string text, char needle)`
`998`	`998`	`return count;`
`999`	`999`	`}`
`1000`	`1000`
`1001`		`-#if !XBOX`
	`1001`	`+#if !(XBOX \|\| PCL)`
`1002`	`1002`	`public static string HexEscape(this string text, params char[] anyCharOf)`
`1003`	`1003`	`{`
`1004`	`1004`	`if (String.IsNullOrEmpty(text)) return text;`