CoreCLR (Issue #51) removed usage of Encoding.Default, Debugger.NotifyOfCrossThreadDependency(), Converter<T1, T2>, and legacy exception serialization

Author: KrzysFR

FdbShell/Mono.Options/Options.cs

@@ -668,22 +668,25 @@ public OptionException (string message, string optionName, Exception innerExcept
 			this.option = optionName;
 		}
 
+#if !CORE_CLR
 		protected OptionException (SerializationInfo info, StreamingContext context)
 			: base (info, context)
 		{
 			this.option = info.GetString ("OptionName");
 		}
 
-		public string OptionName {
-			get {return this.option;}
-		}
-
 		[SecurityPermission (SecurityAction.LinkDemand, SerializationFormatter = true)]
 		public override void GetObjectData (SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData (info, context);
 			info.AddValue ("OptionName", option);
 		}
+#endif
+
+		public string OptionName {
+			get {return this.option;}
+		}
+
 	}
 
 	public delegate void OptionAction<TKey, TValue> (TKey key, TValue value);

FoundationDB.Client/Async/AsyncTransformQueue.cs

@@ -68,7 +68,9 @@ public int Count
 		{
 			get
 			{
+#if !CORE_CLR
 				Debugger.NotifyOfCrossThreadDependency();
+#endif
 				lock (m_lock)
 				{
 					return m_queue.Count;
@@ -87,7 +89,9 @@ public bool IsConsumerBlocked
 		{
 			get
 			{
+#if !CORE_CLR
 				Debugger.NotifyOfCrossThreadDependency();
+#endif
 				lock (m_lock)
 				{
 					return m_blockedConsumer != null && m_blockedConsumer.Task.IsCompleted;
@@ -100,7 +104,9 @@ public bool IsProducerBlocked
 		{
 			get
 			{
+#if !CORE_CLR
 				Debugger.NotifyOfCrossThreadDependency();
+#endif
 				lock (m_lock)
 				{
 					return m_blockedProducer != null && m_blockedProducer.Task.IsCompleted;

FoundationDB.Client/Converters/FdbConverters.cs

@@ -537,12 +537,13 @@ public static T Unbox<T>(object value)
 		/// <param name="value">Boxed value</param>
 		/// <returns>Converted value, or an exception if there are no known convertions. The value null is converted into default(<typeparamref name="R"/>) by convention</returns>
 		/// <exception cref="System.InvalidOperationException">No valid converter for these types was found</exception>
+		[CanBeNull]
 		public static R ConvertBoxed<R>(object value)
 		{
 			if (value == null) return default(R);
 			var type = value.GetType();
 
-			var targetType = typeof (R);
+			var targetType = typeof(R);
 
 			// cast !
 			if (targetType.IsAssignableFrom(type)) return (R)value;
@@ -573,7 +574,7 @@ public static R ConvertBoxed<R>(object value)
 
 		/// <summary>Converts all the elements of a sequence</summary>
 		/// <returns>New sequence with all the converted elements</returns>
-		public static IEnumerable<R> ConvertAll<T, R>(this IFdbConverter<T, R> converter, [NotNull] IEnumerable<T> items)
+		public static IEnumerable<R> ConvertAll<T, R>([NotNull] this IFdbConverter<T, R> converter, [NotNull] IEnumerable<T> items)
 		{
 			if (converter == null) throw new ArgumentNullException("converter");
 			if (items == null) throw new ArgumentNullException("items");
@@ -587,18 +588,27 @@ public static IEnumerable<R> ConvertAll<T, R>(this IFdbConverter<T, R> converter
 		/// <summary>Converts all the elements of a list</summary>
 		/// <returns>New list with all the converted elements</returns>
 		[NotNull]
-		public static List<R> ConvertAll<T, R>(this IFdbConverter<T, R> converter, [NotNull] List<T> items)
+		public static List<R> ConvertAll<T, R>([NotNull] this IFdbConverter<T, R> converter, [NotNull] List<T> items)
 		{
 			if (converter == null) throw new ArgumentNullException("converter");
 			if (items == null) throw new ArgumentNullException("items");
 
+#if CORE_CLR
+			var list = new List<R>(items.Count);
+			foreach (var item in items)
+			{
+				list.Add(converter.Convert(item));
+			}
+			return list;
+#else
 			return items.ConvertAll<R>(converter.Convert);
+#endif
 		}
 
 		/// <summary>Converts all the elements of an array</summary>
 		/// <returns>New array with all the converted elements</returns>
 		[NotNull]
-		public static R[] ConvertAll<T, R>(this IFdbConverter<T, R> converter, [NotNull] T[] items)
+		public static R[] ConvertAll<T, R>([NotNull] this IFdbConverter<T, R> converter, [NotNull] T[] items)
 		{
 			if (converter == null) throw new ArgumentNullException("converter");
 			if (items == null) throw new ArgumentNullException("items");

FoundationDB.Client/FdbException.cs

@@ -53,6 +53,7 @@ public FdbException(FdbError errorCode, string message, Exception innerException
 			this.Code = errorCode;
 		}
 
+#if !CORE_CLR
 		private FdbException(SerializationInfo info, StreamingContext context)
 			: base(info, context)
 		{
@@ -65,6 +66,7 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 			base.GetObjectData(info, context);
 			info.AddValue("Code", (int)this.Code);
 		}
+#endif
 
 		/// <summary>Gets the code for this error.</summary>
 		public FdbError Code { get; private set; }

FoundationDB.Client/Layers/Tuples/FdbTupleParser.cs

@@ -733,7 +733,7 @@ internal static string ParseAscii(Slice slice)
 
 			var decoded = UnescapeByteString(slice.Array, slice.Offset + 1, slice.Count - 2);
 
-			return Encoding.Default.GetString(decoded.Array, decoded.Offset, decoded.Count);
+			return Slice.DefaultEncoding.GetString(decoded.Array, decoded.Offset, decoded.Count);
 		}
 
 		internal static string ParseUnicode(Slice slice)

FoundationDB.Client/Native/FdbNative.cs

@@ -1,5 +1,5 @@
 #region BSD Licence
-/* Copyright (c) 2013-2014, Doxense SAS
+/* Copyright (c) 2013-2015, Doxense SAS
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -304,11 +304,11 @@ public static Slice ToNativeString(string value, bool nullTerminated)
 			if (nullTerminated)
 			{ // NULL terminated ANSI string
 				result = new byte[value.Length + 1];
-				Encoding.Default.GetBytes(value, 0, value.Length, result, 0);
+				Slice.DefaultEncoding.GetBytes(value, 0, value.Length, result, 0);
 			}
 			else
 			{
-				result = Encoding.Default.GetBytes(value);
+				result = Slice.DefaultEncoding.GetBytes(value);
 			}
 			return new Slice(result, 0, result.Length);
 		}

FoundationDB.Client/Utils/Slice.cs

@@ -830,12 +830,19 @@ public static Slice FromUuid64(Uuid64 value)
 			return value.ToSlice();
 		}
 
+		internal static readonly Encoding DefaultEncoding =
+#if CORE_CLR
+			Encoding.GetEncoding(0);
+#else
+			Encoding.Default;
+#endif
+
 		/// <summary>Dangerously create a slice containing string converted to ASCII. All non-ASCII characters may be corrupted or converted to '?'</summary>
 		/// <remarks>WARNING: if you put a string that contains non-ASCII chars, it will be silently corrupted! This should only be used to store keywords or 'safe' strings.
 		/// Note: depending on your default codepage, chars from 128 to 255 may be preserved, but only if they are decoded using the same codepage at the other end !</remarks>
 		public static Slice FromAscii(string text)
 		{
-			return text == null ? Slice.Nil : text.Length == 0 ? Slice.Empty : Slice.Create(Encoding.Default.GetBytes(text));
+			return text == null ? Slice.Nil : text.Length == 0 ? Slice.Empty : Slice.Create(DefaultEncoding.GetBytes(text));
 		}
 
 		/// <summary>Create a slice containing the UTF-8 bytes of the string <paramref name="value"/></summary>
@@ -964,7 +971,7 @@ public string ToAscii()
 		{
 			if (this.Count == 0) return this.HasValue ? String.Empty : default(string);
 			SliceHelpers.EnsureSliceIsValid(ref this);
-			return Encoding.Default.GetString(this.Array, this.Offset, this.Count);
+			return Slice.DefaultEncoding.GetString(this.Array, this.Offset, this.Count);
 		}
 
 		/// <summary>Stringify a slice containing an UTF-8 encoded string</summary>