remove unnecessary refs where possible

mythz · mythz · commit 076cdeb9e066 · 2015-08-27T11:04:32.000-04:00
diff --git a/src/ServiceStack.Text/Common/DeserializeBuiltin.cs b/src/ServiceStack.Text/Common/DeserializeBuiltin.cs
@@ -80,10 +80,10 @@ 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 || DNX451 || DNXCORE50)
-                if (typeof(T) == typeof(System.Data.Linq.Binary))
-                    return value => new System.Data.Linq.Binary(Convert.FromBase64String(value));
-#endif
+//#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
             }
             else
             {
diff --git a/src/ServiceStack.Text/Common/DeserializeTypeRefJsv.cs b/src/ServiceStack.Text/Common/DeserializeTypeRefJsv.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
-using System.Reflection;
 using ServiceStack.Text.Json;
 using ServiceStack.Text.Jsv;
 
diff --git a/src/ServiceStack.Text/Common/ITypeSerializer.cs b/src/ServiceStack.Text/Common/ITypeSerializer.cs
@@ -45,7 +45,7 @@ public interface ITypeSerializer
         void WriteDecimal(TextWriter writer, object decimalValue);
         void WriteEnum(TextWriter writer, object enumValue);
         void WriteEnumFlags(TextWriter writer, object enumFlagValue);
-        void WriteLinqBinary(TextWriter writer, object linqBinaryValue);
+        //void WriteLinqBinary(TextWriter writer, object linqBinaryValue);
 
         //object EncodeMapKey(object value);
 
diff --git a/src/ServiceStack.Text/Common/JsWriter.cs b/src/ServiceStack.Text/Common/JsWriter.cs
@@ -166,9 +166,9 @@ public JsWriter()
         		{ typeof(Uri), Serializer.WriteObjectString },
         		{ typeof(Type), WriteType },
         		{ typeof(Exception), Serializer.WriteException },
-#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL || DNX451 || DNXCORE50)
-                { typeof(System.Data.Linq.Binary), Serializer.WriteLinqBinary },
-#endif
+//#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL || DNX451 || DNXCORE50)
+//                { typeof(System.Data.Linq.Binary), Serializer.WriteLinqBinary },
+//#endif
         	};
         }
 
diff --git a/src/ServiceStack.Text/CsvWriter.cs b/src/ServiceStack.Text/CsvWriter.cs
@@ -134,11 +134,9 @@ internal static void Reset()
                 var propertyName = propertyInfo.Name;
                 if (isDataContract)
                 {
-                    var dcsDataMember = propertyInfo.GetDataMember();
-                    if (dcsDataMember != null && dcsDataMember.Name != null)
-                    {
-                        propertyName = dcsDataMember.Name;
-                    }
+                    var dcsDataMemberName = propertyInfo.GetDataMemberName();
+                    if (dcsDataMemberName != null)
+                        propertyName = dcsDataMemberName;
                 }
                 Headers.Add(propertyName);
             }
diff --git a/src/ServiceStack.Text/HttpUtils.cs b/src/ServiceStack.Text/HttpUtils.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Net;
 using System.Threading.Tasks;
@@ -738,7 +737,7 @@ public static void UploadFile(this WebRequest webRequest, Stream fileStream, str
             if (requestFilter != null)
                 requestFilter(httpReq);
 
-            var boundary = "----------------------------" + Stopwatch.GetTimestamp().ToString("x");
+            var boundary = "----------------------------" + Guid.NewGuid().ToString("N");
 
             httpReq.ContentType = "multipart/form-data; boundary=" + boundary;
 
diff --git a/src/ServiceStack.Text/JsConfigScope.cs b/src/ServiceStack.Text/JsConfigScope.cs
@@ -1,9 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Diagnostics;
 using ServiceStack.Text.Common;
 
 namespace ServiceStack.Text
@@ -45,8 +41,6 @@ public void Dispose()
             if (!disposed)
             {
                 disposed = true;
-                Debug.Assert(this == head, "Disposed out of order.");
-
                 head = parent;
 
                 PclExport.Instance.EndThreadAffinity();
diff --git a/src/ServiceStack.Text/Json/JsonTypeSerializer.cs b/src/ServiceStack.Text/Json/JsonTypeSerializer.cs
@@ -312,12 +312,12 @@ public void WriteEnumFlags(TextWriter writer, object enumFlagValue)
 			JsWriter.WriteEnumFlags(writer, enumFlagValue);
         }
 
-        public void WriteLinqBinary(TextWriter writer, object linqBinaryValue)
-        {
-#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL || DNX451 || DNXCORE50)
-            WriteRawString(writer, Convert.ToBase64String(((System.Data.Linq.Binary)linqBinaryValue).ToArray()));
-#endif
-        }
+//        public void WriteLinqBinary(TextWriter writer, object linqBinaryValue)
+//        {
+//#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL || DNX451 || DNXCORE50)
+//            WriteRawString(writer, Convert.ToBase64String(((System.Data.Linq.Binary)linqBinaryValue).ToArray()));
+//#endif
+//        }
 
         public ParseStringDelegate GetParseFn<T>()
         {
diff --git a/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs b/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs
@@ -258,12 +258,12 @@ public void WriteEnumFlags(TextWriter writer, object enumFlagValue)
 			JsWriter.WriteEnumFlags(writer, enumFlagValue);
         }
 
-		public void WriteLinqBinary(TextWriter writer, object linqBinaryValue)
-        {
-#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL || DNX451 || DNXCORE50)
-            WriteRawString(writer, Convert.ToBase64String(((System.Data.Linq.Binary)linqBinaryValue).ToArray()));
-#endif
-        }
+//        public void WriteLinqBinary(TextWriter writer, object linqBinaryValue)
+//        {
+//#if !(__IOS__ || SL5 || XBOX || ANDROID || PCL || DNX451 || DNXCORE50)
+//            WriteRawString(writer, Convert.ToBase64String(((System.Data.Linq.Binary)linqBinaryValue).ToArray()));
+//#endif
+//        }
 
 		public object EncodeMapKey(object value)
 		{
diff --git a/src/ServiceStack.Text/PclExport.Net40.cs b/src/ServiceStack.Text/PclExport.Net40.cs
@@ -4,7 +4,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -166,13 +165,13 @@ public override WebResponse GetResponse(WebRequest webRequest)
             return webRequest.GetResponse();
         }
 
-        public override bool IsDebugBuild(Assembly assembly)
-        {
-            return assembly.AllAttributes()
-                           .OfType<DebuggableAttribute>()
-                           .Select(attr => attr.IsJITTrackingEnabled)
-                           .FirstOrDefault();
-        }
+        //public override bool IsDebugBuild(Assembly assembly)
+        //{
+        //    return assembly.AllAttributes()
+        //                   .OfType<DebuggableAttribute>()
+        //                   .Select(attr => attr.IsJITTrackingEnabled)
+        //                   .FirstOrDefault();
+        //}
 
         public override string MapAbsolutePath(string relativePath, string appendPartialPathModifier)
         {
@@ -469,13 +468,13 @@ public override ParseStringDelegate GetSpecializedCollectionParseMethod<TSeriali
 
         public override ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type type)
         {
-#if !__IOS__
-            if (type.AssignableFrom(typeof(System.Dynamic.IDynamicMetaObjectProvider)) ||
-                type.HasInterface(typeof(System.Dynamic.IDynamicMetaObjectProvider)))
-            {
-                return DeserializeDynamic<TSerializer>.Parse;
-            }
-#endif
+//#if !__IOS__
+//            if (type.AssignableFrom(typeof(System.Dynamic.IDynamicMetaObjectProvider)) ||
+//                type.HasInterface(typeof(System.Dynamic.IDynamicMetaObjectProvider)))
+//            {
+//                return DeserializeDynamic<TSerializer>.Parse;
+//            }
+//#endif
             return null;
         }
 
diff --git a/src/ServiceStack.Text/PclExport.cs b/src/ServiceStack.Text/PclExport.cs
@@ -223,8 +223,7 @@ public virtual WebResponse GetResponse(WebRequest webRequest)
         public virtual bool IsDebugBuild(Assembly assembly)
         {
             return assembly.AllAttributes()
-                .OfType<DebuggableAttribute>()
-                .Any();
+                .Any(x => x.GetType().Name == "DebuggableAttribute");
         }
 
         public virtual string MapAbsolutePath(string relativePath, string appendPartialPathModifier)
@@ -405,11 +404,11 @@ public virtual ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type type
             where TSerializer : ITypeSerializer
         {
 #if !PCL
-            if (type.AssignableFrom(typeof(System.Dynamic.IDynamicMetaObjectProvider)) ||
-                type.HasInterface(typeof(System.Dynamic.IDynamicMetaObjectProvider)))
-            {
-                return DeserializeDynamic<TSerializer>.Parse;
-            }
+            //if (type.AssignableFrom(typeof(System.Dynamic.IDynamicMetaObjectProvider)) ||
+            //    type.HasInterface(typeof(System.Dynamic.IDynamicMetaObjectProvider)))
+            //{
+            //    return DeserializeDynamic<TSerializer>.Parse;
+            //}
 #endif
             return null;
         }
diff --git a/src/ServiceStack.Text/RecyclableMemoryStream.cs b/src/ServiceStack.Text/RecyclableMemoryStream.cs
@@ -24,7 +24,6 @@
 using System.IO;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading;
 
@@ -648,7 +647,7 @@ public MemoryStream GetStream(string tag, int requiredSize, bool asContiguousBuf
         /// <param name="offset">The offset from the start of the buffer to copy from.</param>
         /// <param name="count">The number of bytes to copy from the buffer.</param>
         /// <returns>A MemoryStream.</returns>
-        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
+        //[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
         public MemoryStream GetStream(string tag, byte[] buffer, int offset, int count)
         {
             var stream = new RecyclableMemoryStream(this, tag, count);
@@ -897,7 +896,7 @@ internal RecyclableMemoryStream(RecyclableMemoryStreamManager memoryManager, str
         /// </summary>
         /// <param name="disposing">Whether we're disposing (true), or being called by the finalizer (false)</param>
         /// <remarks>This method is not thread safe and it may not be called more than once.</remarks>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1816:CallGCSuppressFinalizeCorrectly", Justification = "We have different disposal semantics, so SuppressFinalize is in a different spot.")]
+        //[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1816:CallGCSuppressFinalizeCorrectly", Justification = "We have different disposal semantics, so SuppressFinalize is in a different spot.")]
         protected override void Dispose(bool disposing)
         {
             if (this.disposed)
diff --git a/src/ServiceStack.Text/ReflectionExtensions.cs b/src/ServiceStack.Text/ReflectionExtensions.cs
@@ -777,6 +777,18 @@ public static DataMemberAttribute GetDataMember(this FieldInfo pi)
 
             return dataMember;
         }
+
+        public static string GetDataMemberName(this PropertyInfo pi)
+        {
+            var attr = pi.GetDataMember();
+            return attr != null ? attr.Name : null;
+        }
+
+        public static string GetDataMemberName(this FieldInfo fi)
+        {
+            var attr = fi.GetDataMember();
+            return attr != null ? attr.Name : null;
+        }
     }
 
     public static class PlatformExtensions //Because WinRT is a POS
diff --git a/tests/ServiceStack.Text.Tests/CyclicalDependencyTests.cs b/tests/ServiceStack.Text.Tests/CyclicalDependencyTests.cs
@@ -1,11 +1,8 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
-using System.Text;
 using NUnit.Framework;
 
 namespace ServiceStack.Text.Tests
diff --git a/tests/ServiceStack.Text.Tests/DictionaryTests.cs b/tests/ServiceStack.Text.Tests/DictionaryTests.cs
@@ -1,8 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Globalization;
 using System.Text.RegularExpressions;
 using NUnit.Framework;
 using ServiceStack.Text.Tests.DynamicModels.DataModel;

Original file line number	Diff line number	Diff line change
`@@ -134,11 +134,9 @@ internal static void Reset()`
`134`	`134`	`var propertyName = propertyInfo.Name;`
`135`	`135`	`if (isDataContract)`
`136`	`136`	`{`
`137`		`- var dcsDataMember = propertyInfo.GetDataMember();`
`138`		`- if (dcsDataMember != null && dcsDataMember.Name != null)`
`139`		`- {`
`140`		`- propertyName = dcsDataMember.Name;`
`141`		`- }`
	`137`	`+ var dcsDataMemberName = propertyInfo.GetDataMemberName();`
	`138`	`+ if (dcsDataMemberName != null)`
	`139`	`+ propertyName = dcsDataMemberName;`
`142`	`140`	`}`
`143`	`141`	`Headers.Add(propertyName);`
`144`	`142`	`}`