Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -4,8 +4,8 @@
namespace System.ServiceModel.Diagnostics
{
//
// FUTURE: This class is kept so that 4.0 Extended SKU runs fine on 4.5 Client. Will remove this in the future.
// Order is important here. The order must match the order of strings in ..\EventLog\EventLog.mc
[Obsolete("This has been replaced by System.Runtime.Diagnostics.EventLogCategory")]
enum EventLogCategory : ushort
{
@@ -25,4 +25,4 @@ namespace System.ServiceModel.Diagnostics
ListenerAdapter
}
}
}

View File

@@ -4,8 +4,8 @@
namespace System.ServiceModel.Diagnostics
{
//
// FUTURE: This class is kept so that 4.0 Extended SKU runs fine on 4.5 Client. Will remove this in the future.
// Order is important here. The order must match the order of strings in ..\EventLog\EventLog.mc
[Obsolete("This has been replaced by System.Runtime.Diagnostics.EventLogEventId")]
enum EventLogEventId : uint
{

View File

@@ -19,4 +19,4 @@ namespace System.ServiceModel.Diagnostics
[SecurityCritical]
internal static extern SafeEventLogWriteHandle RegisterEventSource(string uncServerName, string sourceName);
}
}
}

View File

@@ -9,4 +9,4 @@ namespace System.ServiceModel.Diagnostics
DiagnosticTraceSource,
PiiTraceSource
}
}
}