Merge pull request dotnet/corefx#3 from dotnet/master

Bring in dotnet/corefx

Commit migrated from dotnet/corefx@9797bf3

src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.Current.net45.cs

@@ -4,10 +4,10 @@
 
 using System.Runtime.Remoting.Messaging;
 using System.Security;
-using System.Threading;
 
 namespace System.Diagnostics
 {
+    [Serializable]
     public partial class Activity
     {
         /// <summary>
@@ -34,7 +34,13 @@ private set
         }
 
 #region private
-        private static readonly string FieldKey = $"{typeof(Activity).FullName}.Value.{AppDomain.CurrentDomain.Id}";
+
+        [Serializable]
+        private partial class KeyValueListNode
+        {
+        }
+
+        private static readonly string FieldKey = $"{typeof(Activity).FullName}";
 #endregion
     }
 }

src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs

@@ -420,10 +420,11 @@ private static unsafe long GetRandomNumber()
 
         private const int RequestIdMaxLength = 1024;
         private const char RootIdPrefix = '|';
+
         /// <summary>
         /// Having our own key-value linked list allows us to be more efficient  
         /// </summary>
-        private class KeyValueListNode
+        private partial class KeyValueListNode
         {
             public KeyValuePair<string, string> keyValue;
             public KeyValueListNode Next;