Merge changes from TFS

src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/EventDescriptor.cs

@@ -25,7 +25,21 @@ namespace System.Diagnostics.Tracing
 #if !CORECLR && !ES_BUILD_PN    
     [System.Security.Permissions.HostProtection(MayLeakOnAbort = true)]
 #endif // !CORECLR && !ES_BUILD_PN
-    internal struct EventDescriptor
+
+    /*
+     EventDescriptor was public in the separate System.Diagnostics.Tracing assembly(pre NS2.0), 
+     now the move to CoreLib marked them as private.
+     While they are technically private (it's a contract used between the library and the ILC toolchain), 
+     we need them to be rooted and exported from shared library for the system to work.
+     For now I'm simply marking them as public again.A cleaner solution might be to use.rd.xml to 
+     root them and modify shared library definition to force export them.
+     */
+#if ES_BUILD_PN
+    public
+#else
+    internal
+#endif
+    struct EventDescriptor
     {
         # region private
         [FieldOffset(0)]

src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/EventSource.cs

@@ -2505,7 +2505,21 @@ protected override void OnControllerCommand(ControllerCommand command, IDictiona
         /// descriptor as well as some stuff we added specifically for EventSource. see the
         /// code:m_eventData for where we use this.  
         /// </summary>
-        internal partial struct EventMetadata
+
+        /*
+         EventMetadata was public in the separate System.Diagnostics.Tracing assembly(pre NS2.0), 
+         now the move to CoreLib marked them as private.
+         While they are technically private (it's a contract used between the library and the ILC toolchain), 
+         we need them to be rooted and exported from shared library for the system to work.
+         For now I'm simply marking them as public again.A cleaner solution might be to use.rd.xml to 
+         root them and modify shared library definition to force export them.
+         */
+#if ES_BUILD_PN
+       public
+#else
+       internal
+#endif
+        partial struct EventMetadata
         {
             public EventDescriptor Descriptor;
             public EventTags Tags;

src/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource_CoreRT.cs

@@ -149,9 +149,22 @@ private Type GetDataType(EventMetadata eventData, int parameterId)
             return dataType;
         }
 
-        private static readonly bool m_EventSourcePreventRecursion = true; 
+        private static readonly bool m_EventSourcePreventRecursion = true;
 
-        internal partial struct EventMetadata
+        /*
+   EventMetadata was public in the separate System.Diagnostics.Tracing assembly(pre NS2.0), 
+   now the move to CoreLib marked them as private.
+   While they are technically private (it's a contract used between the library and the ILC toolchain), 
+   we need them to be rooted and exported from shared library for the system to work.
+   For now I'm simply marking them as public again.A cleaner solution might be to use.rd.xml to 
+   root them and modify shared library definition to force export them.
+   */
+#if ES_BUILD_PN
+        public
+#else
+        internal
+#endif
+         partial struct EventMetadata
         {
             public EventMetadata(EventDescriptor descriptor,
                 EventTags tags,