dotnet
diff --git a/‎src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/CultureMapper.cs
Lines changed: 1 addition & 1 deletion b/‎src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/CultureMapper.cs
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/XmlLanguage.cs
Lines changed: 4 additions & 6 deletions b/‎src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/XmlLanguage.cs
Lines changed: 4 additions & 6 deletions
diff --git a/‎src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/SafeSecurityHelper.cs
Lines changed: 0 additions & 13 deletions b/‎src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/SafeSecurityHelper.cs
Lines changed: 0 additions & 13 deletions
@@ -60,7 +60,7 @@ public static CultureInfo GetSpecificCulture(CultureInfo runCulture)
                             try
                             {
                                 CultureInfo culture = CultureInfo.CreateSpecificCulture(cultureName);
-                                specificCulture = SafeSecurityHelper.GetCultureInfoByIetfLanguageTag(culture.IetfLanguageTag);
+                                specificCulture = CultureInfo.GetCultureInfoByIetfLanguageTag(culture.IetfLanguageTag);
                             }
                             catch (ArgumentException)
                             {
 
@@ -197,7 +197,7 @@ public CultureInfo GetEquivalentCulture()
                 {
                     // Even if we previously failed to find an EquivalentCulture, we retry, if only to
                     //   capture inner exception.
-                    _equivalentCulture = SafeSecurityHelper.GetCultureInfoByIetfLanguageTag(lowerCaseTag);
+                    _equivalentCulture = CultureInfo.GetCultureInfoByIetfLanguageTag(lowerCaseTag);
                 }
                 catch (ArgumentException e)
                 {
@@ -251,7 +251,7 @@ public CultureInfo GetSpecificCulture()
                         {
                             // note that it's important that we use culture.Name, not culture.IetfLanguageTag, here
                             culture = CultureInfo.CreateSpecificCulture(culture.Name);
-                            _specificCulture = SafeSecurityHelper.GetCultureInfoByIetfLanguageTag(culture.IetfLanguageTag);
+                            _specificCulture = CultureInfo.GetCultureInfoByIetfLanguageTag(culture.IetfLanguageTag);
                         }
                         catch (ArgumentException e)
                         {
@@ -273,9 +273,7 @@ internal CultureInfo GetCompatibleCulture()
         {
             if (_compatibleCulture == null)
             {
-                CultureInfo culture = null;
-
-                if (!TryGetEquivalentCulture(out culture))
+                if (!TryGetEquivalentCulture(out CultureInfo culture))
                 {
                     string languageTag = IetfLanguageTag;
 
@@ -292,7 +290,7 @@ internal CultureInfo GetCompatibleCulture()
                         {
                             try
                             {
-                                culture = SafeSecurityHelper.GetCultureInfoByIetfLanguageTag(languageTag);
+                                culture = CultureInfo.GetCultureInfoByIetfLanguageTag(languageTag);
                             }
                             catch (ArgumentException)
                             {
 
@@ -361,19 +361,6 @@ internal static bool IsFeatureDisabled(KeyToRead key)
         }
 #endif //PRESENTATIONCORE||PRESENTATIONFRAMEWORK
 
-#if PRESENTATION_CORE
-
-        /// <summary>
-        ///     This function is a wrapper for CultureInfo.GetCultureInfoByIetfLanguageTag().
-        ///     The wrapper works around a bug in that routine, which causes it to throw
-        ///     a SecurityException in Partial Trust.
-        /// </summary>
-        static internal CultureInfo GetCultureInfoByIetfLanguageTag(string languageTag)
-        {
-            return CultureInfo.GetCultureInfoByIetfLanguageTag(languageTag);
-        }
-#endif //PRESENTATIONCORE
-
         internal const string IMAGE = "image";
     }
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public static CultureInfo GetSpecificCulture(CultureInfo runCulture)`
`60`	`60`	`try`
`61`	`61`	`{`
`62`	`62`	`CultureInfo culture = CultureInfo.CreateSpecificCulture(cultureName);`
`63`		`- specificCulture = SafeSecurityHelper.GetCultureInfoByIetfLanguageTag(culture.IetfLanguageTag);`
	`63`	`+ specificCulture = CultureInfo.GetCultureInfoByIetfLanguageTag(culture.IetfLanguageTag);`
`64`	`64`	`}`
`65`	`65`	`catch (ArgumentException)`
`66`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public CultureInfo GetEquivalentCulture()`
`197`	`197`	`{`
`198`	`198`	`// Even if we previously failed to find an EquivalentCulture, we retry, if only to`
`199`	`199`	`// capture inner exception.`
`200`		`- _equivalentCulture = SafeSecurityHelper.GetCultureInfoByIetfLanguageTag(lowerCaseTag);`
	`200`	`+ _equivalentCulture = CultureInfo.GetCultureInfoByIetfLanguageTag(lowerCaseTag);`
`201`	`201`	`}`
`202`	`202`	`catch (ArgumentException e)`
`203`	`203`	`{`
`@@ -251,7 +251,7 @@ public CultureInfo GetSpecificCulture()`
`251`	`251`	`{`
`252`	`252`	`// note that it's important that we use culture.Name, not culture.IetfLanguageTag, here`
`253`	`253`	`culture = CultureInfo.CreateSpecificCulture(culture.Name);`
`254`		`- _specificCulture = SafeSecurityHelper.GetCultureInfoByIetfLanguageTag(culture.IetfLanguageTag);`
	`254`	`+ _specificCulture = CultureInfo.GetCultureInfoByIetfLanguageTag(culture.IetfLanguageTag);`
`255`	`255`	`}`
`256`	`256`	`catch (ArgumentException e)`
`257`	`257`	`{`
`@@ -273,9 +273,7 @@ internal CultureInfo GetCompatibleCulture()`
`273`	`273`	`{`
`274`	`274`	`if (_compatibleCulture == null)`
`275`	`275`	`{`
`276`		`- CultureInfo culture = null;`
`277`		`-`
`278`		`- if (!TryGetEquivalentCulture(out culture))`
	`276`	`+ if (!TryGetEquivalentCulture(out CultureInfo culture))`
`279`	`277`	`{`
`280`	`278`	`string languageTag = IetfLanguageTag;`
`281`	`279`
`@@ -292,7 +290,7 @@ internal CultureInfo GetCompatibleCulture()`
`292`	`290`	`{`
`293`	`291`	`try`
`294`	`292`	`{`
`295`		`- culture = SafeSecurityHelper.GetCultureInfoByIetfLanguageTag(languageTag);`
	`293`	`+ culture = CultureInfo.GetCultureInfoByIetfLanguageTag(languageTag);`
`296`	`294`	`}`
`297`	`295`	`catch (ArgumentException)`
`298`	`296`	`{`