Merge pull request #6480 from davmason/master

davmason · web-flow · commit 23b20c4e7370 · 2016-07-28T16:05:18.000-07:00
Merge changes with .net native.

The fix for DisposeOnShutdown is already in here, these are the changes that exist in ProjectN that are not in CoreCLR yet.
diff --git a/src/mscorlib/src/System/Diagnostics/Eventing/EventCounter.cs b/src/mscorlib/src/System/Diagnostics/Eventing/EventCounter.cs
@@ -1,4 +1,8 @@
-﻿using System;
+﻿// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
@@ -26,12 +30,12 @@ public EventCounter(string name, EventSource eventSource)
         {
             if (name == null)
             {
-                throw new ArgumentNullException("name");
+                throw new ArgumentNullException(nameof(name));
             }
 
             if (eventSource == null)
             {
-                throw new ArgumentNullException("eventSource");
+                throw new ArgumentNullException(nameof(eventSource));
             }
 
             InitializeBuffer();
@@ -281,7 +285,7 @@ private static void EnsureEventSourceIndexAvailable(int eventSourceIndex)
             else if (eventSourceIndex >= EventCounterGroup.s_eventCounterGroups.Length)
             {
                 EventCounterGroup[] newEventCounterGroups = new EventCounterGroup[eventSourceIndex + 1];
-                Array.Copy(EventCounterGroup.s_eventCounterGroups, newEventCounterGroups, EventCounterGroup.s_eventCounterGroups.Length);
+                Array.Copy(EventCounterGroup.s_eventCounterGroups, 0, newEventCounterGroups, 0, EventCounterGroup.s_eventCounterGroups.Length);
                 EventCounterGroup.s_eventCounterGroups = newEventCounterGroups;
             }
         }
diff --git a/src/mscorlib/src/System/Diagnostics/Eventing/EventDescriptor.cs b/src/mscorlib/src/System/Diagnostics/Eventing/EventDescriptor.cs
@@ -73,12 +73,12 @@ long keywords
         {
             if (id < 0)
             {
-                throw new ArgumentOutOfRangeException("id", Resources.GetResourceString("ArgumentOutOfRange_NeedNonNegNum"));
+                throw new ArgumentOutOfRangeException(nameof(id), Resources.GetResourceString("ArgumentOutOfRange_NeedNonNegNum"));
             }
 
             if (id > ushort.MaxValue)
             {
-                throw new ArgumentOutOfRangeException("id", Resources.GetResourceString("ArgumentOutOfRange_NeedValidId", 1, ushort.MaxValue));
+                throw new ArgumentOutOfRangeException(nameof(id), Resources.GetResourceString("ArgumentOutOfRange_NeedValidId", 1, ushort.MaxValue));
             }
 
             m_traceloggingId = 0;
@@ -91,12 +91,12 @@ long keywords
 
             if (task < 0)
             {
-                throw new ArgumentOutOfRangeException("task", Resources.GetResourceString("ArgumentOutOfRange_NeedNonNegNum"));
+                throw new ArgumentOutOfRangeException(nameof(task), Resources.GetResourceString("ArgumentOutOfRange_NeedNonNegNum"));
             }
 
             if (task > ushort.MaxValue)
             {
-                throw new ArgumentOutOfRangeException("task", Resources.GetResourceString("ArgumentOutOfRange_NeedValidId", 1, ushort.MaxValue));
+                throw new ArgumentOutOfRangeException(nameof(task), Resources.GetResourceString("ArgumentOutOfRange_NeedValidId", 1, ushort.MaxValue));
             }
 
             m_task = (ushort)task;
diff --git a/src/mscorlib/src/System/Diagnostics/Eventing/EventProvider.cs b/src/mscorlib/src/System/Diagnostics/Eventing/EventProvider.cs
@@ -89,7 +89,7 @@ internal SessionInfo(int sessionIdBit_, int etwSessionId_)
         private static WriteEventErrorCode s_returnCode; // The last return code 
 
         private const int s_basicTypeAllocationBufferSize = 16;
-        private const int s_etwMaxNumberArguments = 64;
+        private const int s_etwMaxNumberArguments = 128;
         private const int s_etwAPIMaxRefObjCount = 8;
         private const int s_maxEventDataDescriptors = 128;
         private const int s_traceEventMaximumSize = 65482;
@@ -560,7 +560,7 @@ private unsafe bool GetDataFromController(int etwSessionId,
             dataStart = 0;
             if (filterData == null)
             {
-#if !ES_BUILD_PCL && !FEATURE_PAL
+#if (!ES_BUILD_PCL && !PROJECTN && !FEATURE_PAL)
                 string regKey = @"\Microsoft\Windows\CurrentVersion\Winevt\Publishers\{" + m_providerId + "}";
                 if (System.Runtime.InteropServices.Marshal.SizeOf(typeof(IntPtr)) == 8)
                     regKey = @"HKEY_LOCAL_MACHINE\Software" + @"\Wow6432Node" + regKey;
diff --git a/src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs b/src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs
@@ -404,7 +404,7 @@ public EventSourceSettings Settings
         public static Guid GetGuid(Type eventSourceType)
         {
             if (eventSourceType == null)
-                throw new ArgumentNullException("eventSourceType");
+                throw new ArgumentNullException(nameof(eventSourceType));
             Contract.EndContractBlock();
 
             EventSourceAttribute attrib = (EventSourceAttribute)GetCustomAttributeHelper(eventSourceType, typeof(EventSourceAttribute));
@@ -429,7 +429,7 @@ public static Guid GetGuid(Type eventSourceType)
 
             if (name == null)
             {
-                throw new ArgumentException(Resources.GetResourceString("Argument_InvalidTypeName"), "eventSourceType");
+                throw new ArgumentException(Resources.GetResourceString("Argument_InvalidTypeName"), nameof(eventSourceType));
             }
             return GenerateGuidFromName(name.ToUpperInvariant());       // Make it case insensitive.  
         }
@@ -472,7 +472,7 @@ public static string GenerateManifest(Type eventSourceType, string assemblyPathT
         public static string GenerateManifest(Type eventSourceType, string assemblyPathToIncludeInManifest, EventManifestOptions flags)
         {
             if (eventSourceType == null)
-                throw new ArgumentNullException("eventSourceType");
+                throw new ArgumentNullException(nameof(eventSourceType));
             Contract.EndContractBlock();
 
             byte[] manifestBytes = EventSource.CreateManifestAndDescriptors(eventSourceType, assemblyPathToIncludeInManifest, null, flags);
@@ -511,12 +511,12 @@ public static IEnumerable<EventSource> GetSources()
         public static void SendCommand(EventSource eventSource, EventCommand command, IDictionary<string, string> commandArguments)
         {
             if (eventSource == null)
-                throw new ArgumentNullException("eventSource");
+                throw new ArgumentNullException(nameof(eventSource));
 
             // User-defined EventCommands should not conflict with the reserved commands.
             if ((int)command <= (int)EventCommand.Update && (int)command != (int)EventCommand.SendManifest)
             {
-                throw new ArgumentException(Resources.GetResourceString("EventSource_InvalidCommand"), "command");
+                throw new ArgumentException(Resources.GetResourceString("EventSource_InvalidCommand"), nameof(command));
             }
 
             eventSource.SendCommand(null, 0, 0, command, true, EventLevel.LogAlways, EventKeywords.None, commandArguments);
@@ -1451,7 +1451,7 @@ private unsafe void Initialize(Guid eventSourceGuid, string eventSourceName, str
                 m_traits = traits;
                 if (m_traits != null && m_traits.Length % 2 != 0)
                 {
-                    throw new ArgumentException(Resources.GetResourceString("TraitEven"), "traits");
+                    throw new ArgumentException(Resources.GetResourceString("TraitEven"), nameof(traits));
                 }
 
                 if (eventSourceGuid == Guid.Empty)
@@ -1543,7 +1543,7 @@ private unsafe void Initialize(Guid eventSourceGuid, string eventSourceName, str
         private static string GetName(Type eventSourceType, EventManifestOptions flags)
         {
             if (eventSourceType == null)
-                throw new ArgumentNullException("eventSourceType");
+                throw new ArgumentNullException(nameof(eventSourceType));
             Contract.EndContractBlock();
 
             EventSourceAttribute attrib = (EventSourceAttribute)GetCustomAttributeHelper(eventSourceType, typeof(EventSourceAttribute), flags);
@@ -3672,7 +3672,7 @@ private static void AddEventDescriptor(ref EventMetadata[] eventData, string eve
             if (eventData == null || eventData.Length <= eventAttribute.EventId)
             {
                 EventMetadata[] newValues = new EventMetadata[Math.Max(eventData.Length + 16, eventAttribute.EventId + 1)];
-                Array.Copy(eventData, newValues, eventData.Length);
+                Array.Copy(eventData, 0, newValues, 0, eventData.Length);
                 eventData = newValues;
             }
 
@@ -3711,7 +3711,7 @@ private static void TrimEventDescriptors(ref EventMetadata[] eventData)
             if (eventData.Length - idx > 2)      // allow one wasted slot. 
             {
                 EventMetadata[] newValues = new EventMetadata[idx + 1];
-                Array.Copy(eventData, newValues, newValues.Length);
+                Array.Copy(eventData, 0, newValues, 0, newValues.Length);
                 eventData = newValues;
             }
         }
@@ -3994,7 +3994,7 @@ private EventSourceSettings ValidateSettings(EventSourceSettings settings)
                                 EventSourceSettings.EtwSelfDescribingEventFormat;
             if ((settings & evtFormatMask) == evtFormatMask)
             {
-                throw new ArgumentException(Resources.GetResourceString("EventSource_InvalidEventFormat"), "settings");
+                throw new ArgumentException(Resources.GetResourceString("EventSource_InvalidEventFormat"), nameof(settings));
             }
 
             // If you did not explicitly ask for manifest, you get self-describing.  
@@ -4351,7 +4351,7 @@ public void EnableEvents(EventSource eventSource, EventLevel level, EventKeyword
         {
             if (eventSource == null)
             {
-                throw new ArgumentNullException("eventSource");
+                throw new ArgumentNullException(nameof(eventSource));
             }
             Contract.EndContractBlock();
 
@@ -4366,7 +4366,7 @@ public void DisableEvents(EventSource eventSource)
         {
             if (eventSource == null)
             {
-                throw new ArgumentNullException("eventSource");
+                throw new ArgumentNullException(nameof(eventSource));
             }
             Contract.EndContractBlock();
 
@@ -6000,7 +6000,7 @@ internal EventDispatcher(EventDispatcher next, bool[] eventEnabled, EventListene
         internal bool m_activityFilteringEnabled;     // does THIS EventSource have activity filtering turned on for this listener?
 #endif // FEATURE_ACTIVITYSAMPLING
 
-        // Only guarenteed to exist after a InsureInit()
+        // Only guaranteed to exist after a InsureInit()
         internal EventDispatcher m_Next;              // These form a linked list in code:EventSource.m_Dispatchers
         // Of all listeners for that eventSource.  
     }
diff --git a/src/mscorlib/src/System/Diagnostics/Eventing/EventSource_CoreCLR.cs b/src/mscorlib/src/System/Diagnostics/Eventing/EventSource_CoreCLR.cs
@@ -178,12 +178,12 @@ private string GetTypeNameHelper(Type type)
                     else if ((type.IsArray || type.IsPointer) && type.GetElementType() == typeof(byte))
                         return "win:Binary";
                         
-                    ManifestError(Environment.GetResourceString("EventSource_UnsupportedEventTypeInManifest", type.Name), true);
+                    ManifestError(Resources.GetResourceString("EventSource_UnsupportedEventTypeInManifest", type.Name), true);
                     return string.Empty;
             }
         }
     }
-        
+    
     internal partial class EventProvider
     {
         [System.Security.SecurityCritical]
diff --git a/src/mscorlib/src/System/Diagnostics/Eventing/StubEnvironment.cs b/src/mscorlib/src/System/Diagnostics/Eventing/StubEnvironment.cs
@@ -226,7 +226,7 @@ static class ReflectionExtensions
         public static bool IsGenericType(this Type type) { return type.IsConstructedGenericType; }
         public static Type BaseType(this Type type) { return type.GetTypeInfo().BaseType; }
         public static Assembly Assembly(this Type type) { return type.GetTypeInfo().Assembly; }
-        public static IEnumerable<PropertyInfo> GetProperties(this Type type) { return type.GetTypeInfo().DeclaredProperties; }
+        public static IEnumerable<PropertyInfo> GetProperties(this Type type) { return type.GetRuntimeProperties(); }
         public static MethodInfo GetGetMethod(this PropertyInfo propInfo) { return propInfo.GetMethod; }
         public static Type[] GetGenericArguments(this Type type) { return type.GenericTypeArguments; }
         

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`		`-using System;`
	`1`	`+// Licensed to the .NET Foundation under one or more agreements.`
	`2`	`+// The .NET Foundation licenses this file to you under the MIT license.`
	`3`	`+// See the LICENSE file in the project root for more information.`
	`4`	`+`
	`5`	`+using System;`
`2`	`6`	`using System.Collections;`
`3`	`7`	`using System.Collections.Generic;`
`4`	`8`	`using System.Threading;`
`@@ -26,12 +30,12 @@ public EventCounter(string name, EventSource eventSource)`
`26`	`30`	`{`
`27`	`31`	`if (name == null)`
`28`	`32`	`{`
`29`		`- throw new ArgumentNullException("name");`
	`33`	`+ throw new ArgumentNullException(nameof(name));`
`30`	`34`	`}`
`31`	`35`
`32`	`36`	`if (eventSource == null)`
`33`	`37`	`{`
`34`		`- throw new ArgumentNullException("eventSource");`
	`38`	`+ throw new ArgumentNullException(nameof(eventSource));`
`35`	`39`	`}`
`36`	`40`
`37`	`41`	`InitializeBuffer();`
`@@ -281,7 +285,7 @@ private static void EnsureEventSourceIndexAvailable(int eventSourceIndex)`
`281`	`285`	`else if (eventSourceIndex >= EventCounterGroup.s_eventCounterGroups.Length)`
`282`	`286`	`{`
`283`	`287`	`EventCounterGroup[] newEventCounterGroups = new EventCounterGroup[eventSourceIndex + 1];`
`284`		`- Array.Copy(EventCounterGroup.s_eventCounterGroups, newEventCounterGroups, EventCounterGroup.s_eventCounterGroups.Length);`
	`288`	`+ Array.Copy(EventCounterGroup.s_eventCounterGroups, 0, newEventCounterGroups, 0, EventCounterGroup.s_eventCounterGroups.Length);`
`285`	`289`	`EventCounterGroup.s_eventCounterGroups = newEventCounterGroups;`
`286`	`290`	`}`
`287`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,12 @@ long keywords`
`73`	`73`	`{`
`74`	`74`	`if (id < 0)`
`75`	`75`	`{`
`76`		`- throw new ArgumentOutOfRangeException("id", Resources.GetResourceString("ArgumentOutOfRange_NeedNonNegNum"));`
	`76`	`+ throw new ArgumentOutOfRangeException(nameof(id), Resources.GetResourceString("ArgumentOutOfRange_NeedNonNegNum"));`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`if (id > ushort.MaxValue)`
`80`	`80`	`{`
`81`		`- throw new ArgumentOutOfRangeException("id", Resources.GetResourceString("ArgumentOutOfRange_NeedValidId", 1, ushort.MaxValue));`
	`81`	`+ throw new ArgumentOutOfRangeException(nameof(id), Resources.GetResourceString("ArgumentOutOfRange_NeedValidId", 1, ushort.MaxValue));`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`m_traceloggingId = 0;`
`@@ -91,12 +91,12 @@ long keywords`
`91`	`91`
`92`	`92`	`if (task < 0)`
`93`	`93`	`{`
`94`		`- throw new ArgumentOutOfRangeException("task", Resources.GetResourceString("ArgumentOutOfRange_NeedNonNegNum"));`
	`94`	`+ throw new ArgumentOutOfRangeException(nameof(task), Resources.GetResourceString("ArgumentOutOfRange_NeedNonNegNum"));`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`if (task > ushort.MaxValue)`
`98`	`98`	`{`
`99`		`- throw new ArgumentOutOfRangeException("task", Resources.GetResourceString("ArgumentOutOfRange_NeedValidId", 1, ushort.MaxValue));`
	`99`	`+ throw new ArgumentOutOfRangeException(nameof(task), Resources.GetResourceString("ArgumentOutOfRange_NeedValidId", 1, ushort.MaxValue));`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`m_task = (ushort)task;`
Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ public EventSourceSettings Settings`
`404`	`404`	`public static Guid GetGuid(Type eventSourceType)`
`405`	`405`	`{`
`406`	`406`	`if (eventSourceType == null)`
`407`		`- throw new ArgumentNullException("eventSourceType");`
	`407`	`+ throw new ArgumentNullException(nameof(eventSourceType));`
`408`	`408`	`Contract.EndContractBlock();`
`409`	`409`
`410`	`410`	`EventSourceAttribute attrib = (EventSourceAttribute)GetCustomAttributeHelper(eventSourceType, typeof(EventSourceAttribute));`
`@@ -429,7 +429,7 @@ public static Guid GetGuid(Type eventSourceType)`
`429`	`429`
`430`	`430`	`if (name == null)`
`431`	`431`	`{`
`432`		`- throw new ArgumentException(Resources.GetResourceString("Argument_InvalidTypeName"), "eventSourceType");`
	`432`	`+ throw new ArgumentException(Resources.GetResourceString("Argument_InvalidTypeName"), nameof(eventSourceType));`
`433`	`433`	`}`
`434`	`434`	`return GenerateGuidFromName(name.ToUpperInvariant()); // Make it case insensitive.`
`435`	`435`	`}`
`@@ -472,7 +472,7 @@ public static string GenerateManifest(Type eventSourceType, string assemblyPathT`
`472`	`472`	`public static string GenerateManifest(Type eventSourceType, string assemblyPathToIncludeInManifest, EventManifestOptions flags)`
`473`	`473`	`{`
`474`	`474`	`if (eventSourceType == null)`
`475`		`- throw new ArgumentNullException("eventSourceType");`
	`475`	`+ throw new ArgumentNullException(nameof(eventSourceType));`
`476`	`476`	`Contract.EndContractBlock();`
`477`	`477`
`478`	`478`	`byte[] manifestBytes = EventSource.CreateManifestAndDescriptors(eventSourceType, assemblyPathToIncludeInManifest, null, flags);`
`@@ -511,12 +511,12 @@ public static IEnumerable<EventSource> GetSources()`
`511`	`511`	`public static void SendCommand(EventSource eventSource, EventCommand command, IDictionary<string, string> commandArguments)`
`512`	`512`	`{`
`513`	`513`	`if (eventSource == null)`
`514`		`- throw new ArgumentNullException("eventSource");`
	`514`	`+ throw new ArgumentNullException(nameof(eventSource));`
`515`	`515`
`516`	`516`	`// User-defined EventCommands should not conflict with the reserved commands.`
`517`	`517`	`if ((int)command <= (int)EventCommand.Update && (int)command != (int)EventCommand.SendManifest)`
`518`	`518`	`{`
`519`		`- throw new ArgumentException(Resources.GetResourceString("EventSource_InvalidCommand"), "command");`
	`519`	`+ throw new ArgumentException(Resources.GetResourceString("EventSource_InvalidCommand"), nameof(command));`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`eventSource.SendCommand(null, 0, 0, command, true, EventLevel.LogAlways, EventKeywords.None, commandArguments);`
`@@ -1451,7 +1451,7 @@ private unsafe void Initialize(Guid eventSourceGuid, string eventSourceName, str`
`1451`	`1451`	`m_traits = traits;`
`1452`	`1452`	`if (m_traits != null && m_traits.Length % 2 != 0)`
`1453`	`1453`	`{`
`1454`		`- throw new ArgumentException(Resources.GetResourceString("TraitEven"), "traits");`
	`1454`	`+ throw new ArgumentException(Resources.GetResourceString("TraitEven"), nameof(traits));`
`1455`	`1455`	`}`
`1456`	`1456`
`1457`	`1457`	`if (eventSourceGuid == Guid.Empty)`
`@@ -1543,7 +1543,7 @@ private unsafe void Initialize(Guid eventSourceGuid, string eventSourceName, str`
`1543`	`1543`	`private static string GetName(Type eventSourceType, EventManifestOptions flags)`
`1544`	`1544`	`{`
`1545`	`1545`	`if (eventSourceType == null)`
`1546`		`- throw new ArgumentNullException("eventSourceType");`
	`1546`	`+ throw new ArgumentNullException(nameof(eventSourceType));`
`1547`	`1547`	`Contract.EndContractBlock();`
`1548`	`1548`
`1549`	`1549`	`EventSourceAttribute attrib = (EventSourceAttribute)GetCustomAttributeHelper(eventSourceType, typeof(EventSourceAttribute), flags);`
`@@ -3672,7 +3672,7 @@ private static void AddEventDescriptor(ref EventMetadata[] eventData, string eve`
`3672`	`3672`	`if (eventData == null \|\| eventData.Length <= eventAttribute.EventId)`
`3673`	`3673`	`{`
`3674`	`3674`	`EventMetadata[] newValues = new EventMetadata[Math.Max(eventData.Length + 16, eventAttribute.EventId + 1)];`
`3675`		`- Array.Copy(eventData, newValues, eventData.Length);`
	`3675`	`+ Array.Copy(eventData, 0, newValues, 0, eventData.Length);`
`3676`	`3676`	`eventData = newValues;`
`3677`	`3677`	`}`
`3678`	`3678`
`@@ -3711,7 +3711,7 @@ private static void TrimEventDescriptors(ref EventMetadata[] eventData)`
`3711`	`3711`	`if (eventData.Length - idx > 2) // allow one wasted slot.`
`3712`	`3712`	`{`
`3713`	`3713`	`EventMetadata[] newValues = new EventMetadata[idx + 1];`
`3714`		`- Array.Copy(eventData, newValues, newValues.Length);`
	`3714`	`+ Array.Copy(eventData, 0, newValues, 0, newValues.Length);`
`3715`	`3715`	`eventData = newValues;`
`3716`	`3716`	`}`
`3717`	`3717`	`}`
`@@ -3994,7 +3994,7 @@ private EventSourceSettings ValidateSettings(EventSourceSettings settings)`
`3994`	`3994`	`EventSourceSettings.EtwSelfDescribingEventFormat;`
`3995`	`3995`	`if ((settings & evtFormatMask) == evtFormatMask)`
`3996`	`3996`	`{`
`3997`		`- throw new ArgumentException(Resources.GetResourceString("EventSource_InvalidEventFormat"), "settings");`
	`3997`	`+ throw new ArgumentException(Resources.GetResourceString("EventSource_InvalidEventFormat"), nameof(settings));`
`3998`	`3998`	`}`
`3999`	`3999`
`4000`	`4000`	`// If you did not explicitly ask for manifest, you get self-describing.`
`@@ -4351,7 +4351,7 @@ public void EnableEvents(EventSource eventSource, EventLevel level, EventKeyword`
`4351`	`4351`	`{`
`4352`	`4352`	`if (eventSource == null)`
`4353`	`4353`	`{`
`4354`		`- throw new ArgumentNullException("eventSource");`
	`4354`	`+ throw new ArgumentNullException(nameof(eventSource));`
`4355`	`4355`	`}`
`4356`	`4356`	`Contract.EndContractBlock();`
`4357`	`4357`
`@@ -4366,7 +4366,7 @@ public void DisableEvents(EventSource eventSource)`
`4366`	`4366`	`{`
`4367`	`4367`	`if (eventSource == null)`
`4368`	`4368`	`{`
`4369`		`- throw new ArgumentNullException("eventSource");`
	`4369`	`+ throw new ArgumentNullException(nameof(eventSource));`
`4370`	`4370`	`}`
`4371`	`4371`	`Contract.EndContractBlock();`
`4372`	`4372`
`@@ -6000,7 +6000,7 @@ internal EventDispatcher(EventDispatcher next, bool[] eventEnabled, EventListene`
`6000`	`6000`	`internal bool m_activityFilteringEnabled; // does THIS EventSource have activity filtering turned on for this listener?`
`6001`	`6001`	`#endif // FEATURE_ACTIVITYSAMPLING`
`6002`	`6002`
`6003`		`- // Only guarenteed to exist after a InsureInit()`
	`6003`	`+ // Only guaranteed to exist after a InsureInit()`
`6004`	`6004`	`internal EventDispatcher m_Next; // These form a linked list in code:EventSource.m_Dispatchers`
`6005`	`6005`	`// Of all listeners for that eventSource.`
`6006`	`6006`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,12 +178,12 @@ private string GetTypeNameHelper(Type type)`
`178`	`178`	`else if ((type.IsArray \|\| type.IsPointer) && type.GetElementType() == typeof(byte))`
`179`	`179`	`return "win:Binary";`
`180`	`180`
`181`		`- ManifestError(Environment.GetResourceString("EventSource_UnsupportedEventTypeInManifest", type.Name), true);`
	`181`	`+ ManifestError(Resources.GetResourceString("EventSource_UnsupportedEventTypeInManifest", type.Name), true);`
`182`	`182`	`return string.Empty;`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`	`}`
`186`		`-`
	`186`	`+`
`187`	`187`	`internal partial class EventProvider`
`188`	`188`	`{`
`189`	`189`	`[System.Security.SecurityCritical]`