Skip to content

Commit 5c7de0f

Browse files
authored
Remove GetCultureInfoByIetfLanguageTag proxy from SafeSecurityHelper (#9733)
1 parent 89e65f0 commit 5c7de0f

File tree

3 files changed

+5
-20
lines changed

3 files changed

+5
-20
lines changed

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/CultureMapper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static CultureInfo GetSpecificCulture(CultureInfo runCulture)
5858
try
5959
{
6060
CultureInfo culture = CultureInfo.CreateSpecificCulture(cultureName);
61-
specificCulture = SafeSecurityHelper.GetCultureInfoByIetfLanguageTag(culture.IetfLanguageTag);
61+
specificCulture = CultureInfo.GetCultureInfoByIetfLanguageTag(culture.IetfLanguageTag);
6262
}
6363
catch (ArgumentException)
6464
{

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/XmlLanguage.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public CultureInfo GetEquivalentCulture()
193193
{
194194
// Even if we previously failed to find an EquivalentCulture, we retry, if only to
195195
// capture inner exception.
196-
_equivalentCulture = SafeSecurityHelper.GetCultureInfoByIetfLanguageTag(lowerCaseTag);
196+
_equivalentCulture = CultureInfo.GetCultureInfoByIetfLanguageTag(lowerCaseTag);
197197
}
198198
catch (ArgumentException e)
199199
{
@@ -247,7 +247,7 @@ public CultureInfo GetSpecificCulture()
247247
{
248248
// note that it's important that we use culture.Name, not culture.IetfLanguageTag, here
249249
culture = CultureInfo.CreateSpecificCulture(culture.Name);
250-
_specificCulture = SafeSecurityHelper.GetCultureInfoByIetfLanguageTag(culture.IetfLanguageTag);
250+
_specificCulture = CultureInfo.GetCultureInfoByIetfLanguageTag(culture.IetfLanguageTag);
251251
}
252252
catch (ArgumentException e)
253253
{
@@ -268,9 +268,7 @@ internal CultureInfo GetCompatibleCulture()
268268
{
269269
if (_compatibleCulture == null)
270270
{
271-
CultureInfo culture = null;
272-
273-
if (!TryGetEquivalentCulture(out culture))
271+
if (!TryGetEquivalentCulture(out CultureInfo culture))
274272
{
275273
string languageTag = IetfLanguageTag;
276274

@@ -287,7 +285,7 @@ internal CultureInfo GetCompatibleCulture()
287285
{
288286
try
289287
{
290-
culture = SafeSecurityHelper.GetCultureInfoByIetfLanguageTag(languageTag);
288+
culture = CultureInfo.GetCultureInfoByIetfLanguageTag(languageTag);
291289
}
292290
catch (ArgumentException)
293291
{

src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/SafeSecurityHelper.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -278,19 +278,6 @@ static bool IsSameKeyToken(byte[] reqKeyToken, byte[] curKeyToken)
278278
}
279279
#endif //!REACHFRAMEWORK
280280

281-
#if PRESENTATION_CORE
282-
283-
/// <summary>
284-
/// This function is a wrapper for CultureInfo.GetCultureInfoByIetfLanguageTag().
285-
/// The wrapper works around a bug in that routine, which causes it to throw
286-
/// a SecurityException in Partial Trust.
287-
/// </summary>
288-
static internal CultureInfo GetCultureInfoByIetfLanguageTag(string languageTag)
289-
{
290-
return CultureInfo.GetCultureInfoByIetfLanguageTag(languageTag);
291-
}
292-
#endif //PRESENTATIONCORE
293-
294281
internal const string IMAGE = "image";
295282
}
296283

0 commit comments

Comments
 (0)