From 189f346f64bb6af1b64e382a5de27c6fdcf9c41f Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Wed, 22 Mar 2017 22:43:36 -0700 Subject: [PATCH] Fix fallout from switching corelib to use resx (dotnet/coreclr#10407) Fixes #https://github.com/dotnet/corefx/issues/17413 Commit migrated from https://github.com/dotnet/coreclr/commit/ab0fbce6b629d081c1102d353abab0d8febd4487 --- .../src/mscorlib/src/System/Globalization/EncodingDataItem.Unix.cs | 2 +- src/coreclr/src/mscorlib/src/System/Text/Encoding.cs | 2 +- src/coreclr/src/mscorlib/src/System/Threading/Tasks/TPLETWProvider.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/src/mscorlib/src/System/Globalization/EncodingDataItem.Unix.cs b/src/coreclr/src/mscorlib/src/System/Globalization/EncodingDataItem.Unix.cs index 408f6e6..ffb2d46 100644 --- a/src/coreclr/src/mscorlib/src/System/Globalization/EncodingDataItem.Unix.cs +++ b/src/coreclr/src/mscorlib/src/System/Globalization/EncodingDataItem.Unix.cs @@ -59,7 +59,7 @@ namespace System.Globalization { if (_displayNameResourceKey == null) { - _displayNameResourceKey = "Globalization.cp_" + CodePage; + _displayNameResourceKey = "Globalization_cp_" + CodePage; } return _displayNameResourceKey; diff --git a/src/coreclr/src/mscorlib/src/System/Text/Encoding.cs b/src/coreclr/src/mscorlib/src/System/Text/Encoding.cs index a7a9158..a4fdc79 100644 --- a/src/coreclr/src/mscorlib/src/System/Text/Encoding.cs +++ b/src/coreclr/src/mscorlib/src/System/Text/Encoding.cs @@ -538,7 +538,7 @@ namespace System.Text { get { - return SR.GetResourceString("Globalization.cp_" + m_codePage.ToString()); + return SR.GetResourceString("Globalization_cp_" + m_codePage.ToString()); } } diff --git a/src/coreclr/src/mscorlib/src/System/Threading/Tasks/TPLETWProvider.cs b/src/coreclr/src/mscorlib/src/System/Threading/Tasks/TPLETWProvider.cs index 1943059..33bf792 100644 --- a/src/coreclr/src/mscorlib/src/System/Threading/Tasks/TPLETWProvider.cs +++ b/src/coreclr/src/mscorlib/src/System/Threading/Tasks/TPLETWProvider.cs @@ -24,7 +24,7 @@ namespace System.Threading.Tasks [EventSource( Name = "System.Threading.Tasks.TplEventSource", Guid = "2e5dba47-a3d2-4d16-8ee0-6671ffdcd7b5", - LocalizationResources = System.CoreLib.Name)] + LocalizationResources = "FxResources.System.Private.CoreLib.SR")] internal sealed class TplEtwProvider : EventSource { /// Used to determine if tasks should generate Activity IDs for themselves -- 2.7.4