Port EventSource Nuget Package Changes (dotnet/coreclr#14669)

brianrob · safern · commit f28cc64bada1 · 2018-01-16T13:09:54.000-08:00
* Add missing resource strings.

* Bring back code changes required to build the nuget package.

Signed-off-by: dotnet-bot-corefx-mirror &lt;dotnet-bot@microsoft.com&gt;
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/ActivityTracker.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/ActivityTracker.cs
@@ -5,6 +5,12 @@
 using System;
 using System.Diagnostics;
 using System.Threading;
+#if !ES_BUILD_AGAINST_DOTNET_V35
+using Contract = System.Diagnostics.Contracts.Contract;
+#else
+using Contract = Microsoft.Diagnostics.Contracts.Internal.Contract;
+#endif
+
 #if ES_BUILD_STANDALONE
 namespace Microsoft.Diagnostics.Tracing
 #else
@@ -37,6 +43,7 @@ namespace System.Diagnostics.Tracing
     /// </summary>
     internal class ActivityTracker
     {
+
         /// <summary>
         /// Called on work item begins.  The activity name = providerName + activityName without 'Start' suffix.
         /// It updates CurrentActivityId to track.   
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventDescriptor.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventDescriptor.cs
@@ -9,6 +9,12 @@
 using Environment = Microsoft.Diagnostics.Tracing.Internal.Environment;
 #endif
 
+#if !ES_BUILD_AGAINST_DOTNET_V35
+using Contract = System.Diagnostics.Contracts.Contract;
+#else
+using Contract = Microsoft.Diagnostics.Contracts.Internal.Contract;
+#endif
+
 #if ES_BUILD_STANDALONE
 namespace Microsoft.Diagnostics.Tracing
 #else
@@ -83,12 +89,12 @@ long keywords
         {
             if (id < 0)
             {
-                throw new ArgumentOutOfRangeException(nameof(id), Resources.GetResourceString("ArgumentOutOfRange_NeedNonNegNum"));
+                throw new ArgumentOutOfRangeException(nameof(id), SR.ArgumentOutOfRange_NeedNonNegNum);
             }
 
             if (id > ushort.MaxValue)
             {
-                throw new ArgumentOutOfRangeException(nameof(id), Resources.GetResourceString("ArgumentOutOfRange_NeedValidId", 1, ushort.MaxValue));
+                throw new ArgumentOutOfRangeException(nameof(id), SR.Format(SR.ArgumentOutOfRange_NeedValidId, 1, ushort.MaxValue));
             }
 
             m_traceloggingId = 0;
@@ -101,12 +107,12 @@ long keywords
 
             if (task < 0)
             {
-                throw new ArgumentOutOfRangeException(nameof(task), Resources.GetResourceString("ArgumentOutOfRange_NeedNonNegNum"));
+                throw new ArgumentOutOfRangeException(nameof(task), SR.ArgumentOutOfRange_NeedNonNegNum);
             }
 
             if (task > ushort.MaxValue)
             {
-                throw new ArgumentOutOfRangeException(nameof(task), Resources.GetResourceString("ArgumentOutOfRange_NeedValidId", 1, ushort.MaxValue));
+                throw new ArgumentOutOfRangeException(nameof(task), SR.Format(SR.ArgumentOutOfRange_NeedValidId, 1, ushort.MaxValue));
             }
 
             m_task = (ushort)task;
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventProvider.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventProvider.cs
@@ -14,6 +14,12 @@
 using System.Threading;
 using System;
 
+#if !ES_BUILD_AGAINST_DOTNET_V35
+using Contract = System.Diagnostics.Contracts.Contract;
+#else
+using Contract = Microsoft.Diagnostics.Contracts.Internal.Contract;
+#endif
+
 #if ES_BUILD_AGAINST_DOTNET_V35
 using Microsoft.Internal;       // for Tuple (can't define alias for open generic types so we "use" the whole namespace)
 #endif
@@ -628,6 +634,7 @@ public bool IsEnabled(byte level, long keywords)
             if ((level <= m_level) ||
                 (m_level == 0))
             {
+
                 //
                 // Check if Keyword is enabled
                 //
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventSource.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventSource.cs
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventSourceException.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/EventSourceException.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Resources;
 using System.Runtime.Serialization;
 
 #if ES_BUILD_STANDALONE
@@ -27,7 +28,7 @@ public class EventSourceException : Exception
         /// Initializes a new instance of the EventSourceException class.
         /// </summary>
         public EventSourceException() :
-            base(Resources.GetResourceString("EventSource_ListenerWriteFailure")) { }
+            base(SR.EventSource_ListenerWriteFailure) { }
 
         /// <summary>
         /// Initializes a new instance of the EventSourceException class with a specified error message.
@@ -48,6 +49,6 @@ protected EventSourceException(SerializationInfo info, StreamingContext context)
 #endif
 
         internal EventSourceException(Exception innerException) :
-            base(Resources.GetResourceString("EventSource_ListenerWriteFailure"), innerException) { }
+            base(SR.EventSource_ListenerWriteFailure, innerException) { }
     }
 }
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/IEventProvider.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/IEventProvider.cs
@@ -2,6 +2,7 @@
 // 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 Microsoft.Win32;
 
 #if ES_BUILD_STANDALONE
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/StubEnvironment.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/StubEnvironment.cs
@@ -356,3 +356,18 @@ public static int GetCurrentThreadId()
     }    
 }
 #endif
+
+#if ES_BUILD_STANDALONE
+namespace Microsoft.Win32
+{
+    using System.Runtime.InteropServices;
+    using System.Security;
+
+    [SuppressUnmanagedCodeSecurityAttribute()]
+    internal static class Win32Native
+    {
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        internal static extern uint GetCurrentProcessId();
+    }
+}
+#endif
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/DataCollector.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/DataCollector.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Resources;
 using System.Runtime.InteropServices;
 using System.Security;
 
@@ -85,7 +86,7 @@ internal void AddScalar(void* value, int size)
                 var scratchNew = scratchOld + size;
                 if (this.scratchEnd < scratchNew)
                 {
-                    throw new IndexOutOfRangeException(Resources.GetResourceString("EventSource_AddScalarOutOfRange"));
+                    throw new IndexOutOfRangeException(SR.EventSource_AddScalarOutOfRange);
                 }
 
                 this.ScalarsBegin();
@@ -272,13 +273,13 @@ private void PinArray(object value, int size)
             var pinsTemp = this.pins;
             if (this.pinsEnd <= pinsTemp)
             {
-                throw new IndexOutOfRangeException(Resources.GetResourceString("EventSource_PinArrayOutOfRange"));
+                throw new IndexOutOfRangeException(SR.EventSource_PinArrayOutOfRange);
             }
 
             var datasTemp = this.datas;
             if (this.datasEnd <= datasTemp)
             {
-                throw new IndexOutOfRangeException(Resources.GetResourceString("EventSource_DataDescriptorsOutOfRange"));
+                throw new IndexOutOfRangeException(SR.EventSource_DataDescriptorsOutOfRange);
             }
 
             this.pins = pinsTemp + 1;
@@ -296,7 +297,7 @@ private void ScalarsBegin()
                 var datasTemp = this.datas;
                 if (this.datasEnd <= datasTemp)
                 {
-                    throw new IndexOutOfRangeException(Resources.GetResourceString("EventSource_DataDescriptorsOutOfRange"));
+                    throw new IndexOutOfRangeException(SR.EventSource_DataDescriptorsOutOfRange);
                 }
 
                 datasTemp->DataPointer = (IntPtr) this.scratch;
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/EventPayload.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/EventPayload.cs
@@ -6,6 +6,12 @@
 using System.Collections;
 using System.Diagnostics;
 
+#if !ES_BUILD_AGAINST_DOTNET_V35
+using Contract = System.Diagnostics.Contracts.Contract;
+#else
+using Contract = Microsoft.Diagnostics.Contracts.Internal.Contract;
+#endif
+
 #if ES_BUILD_STANDALONE
 namespace Microsoft.Diagnostics.Tracing
 #else
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/EventSourceActivity.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/EventSourceActivity.cs
@@ -4,6 +4,12 @@
 
 using System;
 
+#if !ES_BUILD_AGAINST_DOTNET_V35
+using Contract = System.Diagnostics.Contracts.Contract;
+#else
+using Contract = Microsoft.Diagnostics.Contracts.Internal.Contract;
+#endif
+
 #if ES_BUILD_STANDALONE
 namespace Microsoft.Diagnostics.Tracing
 #else
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/FieldMetadata.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/FieldMetadata.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Resources;
 using Encoding = System.Text.Encoding;
 
 #if ES_BUILD_STANDALONE
@@ -128,17 +129,17 @@ private FieldMetadata(
             {
                 if (coreType == (int)TraceLoggingDataType.Nil)
                 {
-                    throw new NotSupportedException(Resources.GetResourceString("EventSource_NotSupportedArrayOfNil"));
+                    throw new NotSupportedException(SR.EventSource_NotSupportedArrayOfNil);
                 }
                 if (coreType == (int)TraceLoggingDataType.Binary)
                 {
-                    throw new NotSupportedException(Resources.GetResourceString("EventSource_NotSupportedArrayOfBinary"));
+                    throw new NotSupportedException(SR.EventSource_NotSupportedArrayOfBinary);
                 }
 #if !BROKEN_UNTIL_M3
                 if (coreType == (int)TraceLoggingDataType.Utf16String ||
                     coreType == (int)TraceLoggingDataType.MbcsString)
                 {
-                    throw new NotSupportedException(Resources.GetResourceString("EventSource_NotSupportedArrayOfNullTerminatedString"));
+                    throw new NotSupportedException(SR.EventSource_NotSupportedArrayOfNullTerminatedString);
                 }
 #endif
             }
@@ -160,7 +161,7 @@ public void IncrementStructFieldCount()
             this.outType++;
             if ((this.outType & Statics.OutTypeMask) == 0)
             {
-                throw new NotSupportedException(Resources.GetResourceString("EventSource_TooManyFields"));
+                throw new NotSupportedException(SR.EventSource_TooManyFields);
             }
         }
 
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/PropertyValue.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/PropertyValue.cs
@@ -1,8 +1,19 @@
-﻿using System.Reflection;
+﻿using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
 
+#if !ES_BUILD_AGAINST_DOTNET_V35
+using Contract = System.Diagnostics.Contracts.Contract;
+#else
+using Contract = Microsoft.Diagnostics.Contracts.Internal.Contract;
+#endif
+
+#if ES_BUILD_STANDALONE
+namespace Microsoft.Diagnostics.Tracing
+#else
 namespace System.Diagnostics.Tracing
+#endif
 {
     /// <summary>
     /// Holds property values of any type.  For common value types, we have inline storage so that we don't need
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/SimpleTypeInfos.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/SimpleTypeInfos.cs
@@ -7,6 +7,12 @@
 using System.Reflection;
 using System.Diagnostics;
 
+#if !ES_BUILD_AGAINST_DOTNET_V35
+using Contract = System.Diagnostics.Contracts.Contract;
+#else
+using Contract = Microsoft.Diagnostics.Contracts.Internal.Contract;
+#endif
+
 #if ES_BUILD_STANDALONE
 namespace Microsoft.Diagnostics.Tracing
 #else
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/Statics.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/Statics.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Resources;
 using System.Runtime.CompilerServices;
 using Encoding = System.Text.Encoding;
 
@@ -531,7 +532,7 @@ public static TraceLoggingTypeInfo CreateDefaultTypeInfo(
 
             if (recursionCheck.Contains(dataType))
             {
-                throw new NotSupportedException(Resources.GetResourceString("EventSource_RecursiveTypeDefinition"));
+                throw new NotSupportedException(SR.EventSource_RecursiveTypeDefinition);
             }
 
             recursionCheck.Add(dataType);
@@ -714,7 +715,7 @@ public static TraceLoggingTypeInfo CreateDefaultTypeInfo(
                     }
                     else
                     {
-                        throw new ArgumentException(Resources.GetResourceString("EventSource_NonCompliantTypeError", dataType.Name));
+                        throw new ArgumentException(SR.Format(SR.EventSource_NonCompliantTypeError, dataType.Name));
                     }
                 }
             }
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventSource.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventSource.cs
@@ -24,14 +24,17 @@
 #endif
 
 using System;
+using System.Resources;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Collections.ObjectModel;
 
 #if !ES_BUILD_AGAINST_DOTNET_V35
+using Contract = System.Diagnostics.Contracts.Contract;
 using System.Collections.Generic;
 using System.Text;
 #else
+using Contract = Microsoft.Diagnostics.Contracts.Internal.Contract;
 using System.Collections.Generic;
 using System.Text;
 #endif
@@ -114,7 +117,6 @@ public unsafe void Write(string eventName)
                 throw new ArgumentNullException(nameof(eventName));
             }
 
-
             if (!this.IsEnabled())
             {
                 return;
@@ -140,7 +142,6 @@ public unsafe void Write(string eventName, EventSourceOptions options)
                 throw new ArgumentNullException(nameof(eventName));
             }
 
-
             if (!this.IsEnabled())
             {
                 return;
@@ -774,7 +775,7 @@ private void InitializeProviderMetadata()
                             }
                             else
                             {
-                                throw new ArgumentException(Resources.GetResourceString("UnknownEtwTrait", etwTrait), "traits");
+                                throw new ArgumentException(SR.Format(SR.EventSource_UnknownEtwTrait, etwTrait), "traits");
                             }
                         }
                         string value = m_traits[i + 1];
@@ -817,7 +818,7 @@ private static int AddValueToMetaData(List<byte> metaData, string value)
                     {
                         if (!(i + 1 < value.Length))
                         {
-                            throw new ArgumentException(Resources.GetResourceString("EvenHexDigits"), "traits");
+                            throw new ArgumentException(SR.EventSource_EvenHexDigits, "traits");
                         }
                         metaData.Add((byte)(HexDigit(value[i]) * 16 + HexDigit(value[i + 1])));
                         i++;
@@ -830,7 +831,7 @@ private static int AddValueToMetaData(List<byte> metaData, string value)
             }
             else
             {
-                throw new ArgumentException(Resources.GetResourceString("IllegalValue", value), "traits");
+                throw new ArgumentException(SR.Format(SR.EventSource_IllegalValue, value), "traits");
             }
 
             return metaData.Count - startPos;
@@ -854,7 +855,7 @@ private static int HexDigit(char c)
                 return (c - 'A' + 10);
             }
             
-            throw new ArgumentException(Resources.GetResourceString("BadHexDigit", c), "traits");
+            throw new ArgumentException(SR.Format(SR.EventSource_BadHexDigit, c), "traits");
         }
 
         private NameInfo UpdateDescriptor(
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventTypes.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventTypes.cs
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingMetadataCollector.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingMetadataCollector.cs
diff --git a/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingTypeInfo.cs b/src/Common/src/CoreLib/System/Diagnostics/Tracing/TraceLogging/TraceLoggingTypeInfo.cs

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,12 @@`
`9`	`9`	`using Environment = Microsoft.Diagnostics.Tracing.Internal.Environment;`
`10`	`10`	`#endif`
`11`	`11`
	`12`	`+#if !ES_BUILD_AGAINST_DOTNET_V35`
	`13`	`+using Contract = System.Diagnostics.Contracts.Contract;`
	`14`	`+#else`
	`15`	`+using Contract = Microsoft.Diagnostics.Contracts.Internal.Contract;`
	`16`	`+#endif`
	`17`	`+`
`12`	`18`	`#if ES_BUILD_STANDALONE`
`13`	`19`	`namespace Microsoft.Diagnostics.Tracing`
`14`	`20`	`#else`
`@@ -83,12 +89,12 @@ long keywords`
`83`	`89`	`{`
`84`	`90`	`if (id < 0)`
`85`	`91`	`{`
`86`		`- throw new ArgumentOutOfRangeException(nameof(id), Resources.GetResourceString("ArgumentOutOfRange_NeedNonNegNum"));`
	`92`	`+ throw new ArgumentOutOfRangeException(nameof(id), SR.ArgumentOutOfRange_NeedNonNegNum);`
`87`	`93`	`}`
`88`	`94`
`89`	`95`	`if (id > ushort.MaxValue)`
`90`	`96`	`{`
`91`		`- throw new ArgumentOutOfRangeException(nameof(id), Resources.GetResourceString("ArgumentOutOfRange_NeedValidId", 1, ushort.MaxValue));`
	`97`	`+ throw new ArgumentOutOfRangeException(nameof(id), SR.Format(SR.ArgumentOutOfRange_NeedValidId, 1, ushort.MaxValue));`
`92`	`98`	`}`
`93`	`99`
`94`	`100`	`m_traceloggingId = 0;`
`@@ -101,12 +107,12 @@ long keywords`
`101`	`107`
`102`	`108`	`if (task < 0)`
`103`	`109`	`{`
`104`		`- throw new ArgumentOutOfRangeException(nameof(task), Resources.GetResourceString("ArgumentOutOfRange_NeedNonNegNum"));`
	`110`	`+ throw new ArgumentOutOfRangeException(nameof(task), SR.ArgumentOutOfRange_NeedNonNegNum);`
`105`	`111`	`}`
`106`	`112`
`107`	`113`	`if (task > ushort.MaxValue)`
`108`	`114`	`{`
`109`		`- throw new ArgumentOutOfRangeException(nameof(task), Resources.GetResourceString("ArgumentOutOfRange_NeedValidId", 1, ushort.MaxValue));`
	`115`	`+ throw new ArgumentOutOfRangeException(nameof(task), SR.Format(SR.ArgumentOutOfRange_NeedValidId, 1, ushort.MaxValue));`
`110`	`116`	`}`
`111`	`117`
`112`	`118`	`m_task = (ushort)task;`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`	`5`	`using System;`
	`6`	`+using System.Resources;`
`6`	`7`	`using System.Runtime.InteropServices;`
`7`	`8`	`using System.Security;`
`8`	`9`
`@@ -85,7 +86,7 @@ internal void AddScalar(void* value, int size)`
`85`	`86`	`var scratchNew = scratchOld + size;`
`86`	`87`	`if (this.scratchEnd < scratchNew)`
`87`	`88`	`{`
`88`		`- throw new IndexOutOfRangeException(Resources.GetResourceString("EventSource_AddScalarOutOfRange"));`
	`89`	`+ throw new IndexOutOfRangeException(SR.EventSource_AddScalarOutOfRange);`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`this.ScalarsBegin();`
`@@ -272,13 +273,13 @@ private void PinArray(object value, int size)`
`272`	`273`	`var pinsTemp = this.pins;`
`273`	`274`	`if (this.pinsEnd <= pinsTemp)`
`274`	`275`	`{`
`275`		`- throw new IndexOutOfRangeException(Resources.GetResourceString("EventSource_PinArrayOutOfRange"));`
	`276`	`+ throw new IndexOutOfRangeException(SR.EventSource_PinArrayOutOfRange);`
`276`	`277`	`}`
`277`	`278`
`278`	`279`	`var datasTemp = this.datas;`
`279`	`280`	`if (this.datasEnd <= datasTemp)`
`280`	`281`	`{`
`281`		`- throw new IndexOutOfRangeException(Resources.GetResourceString("EventSource_DataDescriptorsOutOfRange"));`
	`282`	`+ throw new IndexOutOfRangeException(SR.EventSource_DataDescriptorsOutOfRange);`
`282`	`283`	`}`
`283`	`284`
`284`	`285`	`this.pins = pinsTemp + 1;`
`@@ -296,7 +297,7 @@ private void ScalarsBegin()`
`296`	`297`	`var datasTemp = this.datas;`
`297`	`298`	`if (this.datasEnd <= datasTemp)`
`298`	`299`	`{`
`299`		`- throw new IndexOutOfRangeException(Resources.GetResourceString("EventSource_DataDescriptorsOutOfRange"));`
	`300`	`+ throw new IndexOutOfRangeException(SR.EventSource_DataDescriptorsOutOfRange);`
`300`	`301`	`}`
`301`	`302`
`302`	`303`	`datasTemp->DataPointer = (IntPtr) this.scratch;`