summaryrefslogtreecommitdiff
path: root/src/mscorlib/src/System/Diagnostics/Eventing/EventSource_CoreCLR.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/mscorlib/src/System/Diagnostics/Eventing/EventSource_CoreCLR.cs')
-rw-r--r--src/mscorlib/src/System/Diagnostics/Eventing/EventSource_CoreCLR.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mscorlib/src/System/Diagnostics/Eventing/EventSource_CoreCLR.cs b/src/mscorlib/src/System/Diagnostics/Eventing/EventSource_CoreCLR.cs
index 0a689efe92..b691dd38b9 100644
--- a/src/mscorlib/src/System/Diagnostics/Eventing/EventSource_CoreCLR.cs
+++ b/src/mscorlib/src/System/Diagnostics/Eventing/EventSource_CoreCLR.cs
@@ -128,12 +128,12 @@ namespace System.Diagnostics.Tracing
private static string GetResourceString(string key, params object[] args)
{
- return Environment.GetResourceString(key, args);
+ return SR.Format(SR.GetResourceString(key), args);
}
-
+
private static readonly bool m_EventSourcePreventRecursion = false;
}
-
+
internal partial class ManifestBuilder
{
private string GetTypeNameHelper(Type type)
@@ -174,13 +174,13 @@ namespace System.Diagnostics.Tracing
return "win:Pointer";
else if ((type.IsArray || type.IsPointer) && type.GetElementType() == typeof(byte))
return "win:Binary";
-
+
ManifestError(Resources.GetResourceString("EventSource_UnsupportedEventTypeInManifest", type.Name), true);
return string.Empty;
}
}
}
-
+
internal partial class EventProvider
{
internal unsafe int SetInformation(
@@ -197,7 +197,7 @@ namespace System.Diagnostics.Tracing
status = UnsafeNativeMethods.ManifestEtw.EventSetInformation(
m_regHandle,
eventInfoClass,
- (void *)data,
+ (void*)data,
(int)dataSize);
}
catch (TypeLoadException)
@@ -209,12 +209,12 @@ namespace System.Diagnostics.Tracing
return status;
}
}
-
+
internal static class Resources
{
internal static string GetResourceString(string key, params object[] args)
{
- return Environment.GetResourceString(key, args);
+ return SR.Format(SR.GetResourceString(key), args);
}
}
}