diff options
| author | David Mason <davmason@microsoft.com> | 2015-12-21 15:43:42 -0800 |
|---|---|---|
| committer | David Mason <davmason@microsoft.com> | 2016-01-07 14:58:21 -0800 |
| commit | efa1dda2c1579417dcaed92633b8556fd68270ee (patch) | |
| tree | 1a2e6fe446645f1dd96f6d07e5adc92ead2a8fd3 /src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/EventFieldFormat.cs | |
| parent | ad4683f3e1d0f4b133b39003a24f983d2d01f7c4 (diff) | |
| download | coreclr-efa1dda2c1579417dcaed92633b8556fd68270ee.tar.gz coreclr-efa1dda2c1579417dcaed92633b8556fd68270ee.tar.bz2 coreclr-efa1dda2c1579417dcaed92633b8556fd68270ee.zip | |
Merge the .Net Native and CoreCLR implementations of EventSource. This replaces a lot of the previous ifdefs in the ProjectN impelmentation with a partial class that is cleaner and easier to understand.
Remove some ifdefs that can be done in a better way and merge additional bug fixes that happened in the nuget package branch.
Refactor some code to eliminate ifdefs for projectN.
Refactor code so that the ProjectN support uses partial classes instead of ifdefs.
Round 2 of making sure everything compiles in CoreCLR and in ProjectN.
Add formatting to the debugger message that EventSource prints when an internal error happens.
Change null strings to be represented as empty strings in TraceLogging.
Remove some ifdefs that can be done in a better way and merge additional bug fixes that happened in the nuget package branch.
Change WriteEventString to use an anonymous struct instead of EventMessage.
Diffstat (limited to 'src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/EventFieldFormat.cs')
| -rw-r--r-- | src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/EventFieldFormat.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/EventFieldFormat.cs b/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/EventFieldFormat.cs index 409535287e..7e6ed763a7 100644 --- a/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/EventFieldFormat.cs +++ b/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/EventFieldFormat.cs @@ -24,7 +24,7 @@ namespace System.Diagnostics.Tracing /// Field should not be displayed. /// </summary> NoPrint = 1, -#endif +#endif /// <summary> /// Field should be formatted as character or string data. /// Typically applied to 8-bit or 16-bit integers. @@ -77,7 +77,7 @@ namespace System.Diagnostics.Tracing /// Field should be formatted as a SOCKADDR. Typically applied to byte[] types. /// </summary> SocketAddress = 10, -#endif +#endif /// <summary> /// Field should be formatted as XML string data. Typically applied to /// strings or arrays of 8-bit or 16-bit integers. |