[dotnet] Globalization works for Mac Catalyst now. Fixes #11392. (#12247

) Fixes #11392.
dotnet · Jul 28, 2021 · 7986b2f · 7986b2f · vs-mobiletools-engineering-service2 · Jul 28, 2021
1 parent 600ce32
commit 7986b2f
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 29 deletions.
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -128,8 +128,7 @@
 		<EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 		<EventSourceSupport Condition="'$(EventSourceSupport)' == ''">false</EventSourceSupport>
 		<HttpActivityPropagationSupport Condition="'$(HttpActivityPropagationSupport)' == ''">false</HttpActivityPropagationSupport>
-		<!-- native bits for ICU are not ready for Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392 -->
-		<InvariantGlobalization Condition="'$(_PlatformName)' == 'MacCatalyst' And '$(InvariantGlobalization)' == ''">true</InvariantGlobalization>
+		<InvariantGlobalization Condition="'$(InvariantGlobalization)' == ''">false</InvariantGlobalization>
 		<StartupHookSupport Condition="'$(StartupHookSupport)' == ''">false</StartupHookSupport>
 		<UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 		<UseNativeHttpHandler Condition="'$(_PlatformName)' != 'macOS' And '$(UseNativeHttpHandler)' == ''">true</UseNativeHttpHandler>

diff --git a/tests/EmbeddedResources/ResourcesTest.cs b/tests/EmbeddedResources/ResourcesTest.cs
@@ -41,15 +41,13 @@ public void Embedded ()
 			var manager = new ResourceManager ("EmbeddedResources.Welcome", typeof(ResourcesTest).Assembly);
 #endif
 
-#if !(NET && __MACCATALYST__) // https://github.com/xamarin/xamarin-macios/issues/11392
 			Assert.AreEqual ("Welcome", manager.GetString ("String1", new CultureInfo ("en")), "en");
 			Assert.AreEqual ("G'day", manager.GetString ("String1", new CultureInfo ("en-AU")), "en-AU");
 			Assert.AreEqual ("Willkommen", manager.GetString ("String1", new CultureInfo ("de")), "de");
 			Assert.AreEqual ("Willkommen", manager.GetString ("String1", new CultureInfo ("de-DE")), "de-DE");
 			Assert.AreEqual ("Bienvenido", manager.GetString ("String1", new CultureInfo ("es")), "es");
 			Assert.AreEqual ("Bienvenido", manager.GetString ("String1", new CultureInfo ("es-AR")), "es-AR");
 			Assert.AreEqual ("Bienvenido", manager.GetString ("String1", new CultureInfo ("es-ES")), "es-ES");
-#endif
 		}
 	}
 }
diff --git a/tests/linker/ios/link all/CalendarTest.cs b/tests/linker/ios/link all/CalendarTest.cs
@@ -10,9 +10,6 @@ namespace LinkAll.Calendars {
 	[TestFixture]
 	// we want the tests to be available because we use the linker
 	[Preserve (AllMembers = true)]
-#if NET && __MACCATALYST__
-	[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
-#endif
 	public class CalendarTest {
 
 		// application *MUST* be build with I18N.MidEast and I18N.Other (Thai)

diff --git a/tests/linker/ios/link sdk/CalendarTest.cs b/tests/linker/ios/link sdk/CalendarTest.cs
@@ -10,9 +10,6 @@ namespace LinkSdk.Calendars {
 	[TestFixture]
 	// we want the tests to be available because we use the linker
 	[Preserve (AllMembers = true)]
-#if NET && __MACCATALYST__
-	[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
-#endif
 	public class CalendarTest {
 
 		// application must *NOT* be build with I18N.MidEast and I18N.Other (Thai)

diff --git a/tests/linker/ios/link sdk/LinkSdkRegressionTest.cs b/tests/linker/ios/link sdk/LinkSdkRegressionTest.cs
@@ -468,9 +468,6 @@ public void OpenTk_Preserved ()
 #endif // !__WATCHOS__ && !__MACCATALYST__
 
 		[Test]
-#if NET && __MACCATALYST__
-		[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
-#endif
 		public void XElement_3137 ()
 		{
 			CultureInfo current = Thread.CurrentThread.CurrentCulture;

diff --git a/tests/linker/ios/link sdk/LocaleTest.cs b/tests/linker/ios/link sdk/LocaleTest.cs
@@ -14,19 +14,13 @@ public class LocaleTest {
 
 		[Test]
 		[SetCulture ("cs-CZ")]
-#if NET && __MACCATALYST__
-		[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
-#endif
 		public void CzechDictComparer ()
 		{
 			DictComparer ();
 		}
 
 		[Test]
 		[SetCulture ("en-US")]
-#if NET && __MACCATALYST__
-		[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
-#endif
 		public void EnglishDictComparer ()
 		{
 			DictComparer ();

diff --git a/tests/monotouch-test/Foundation/LocaleTest.cs b/tests/monotouch-test/Foundation/LocaleTest.cs
@@ -38,9 +38,6 @@ public void FromLocaleIdentifier ()
 			Assert.That (NSLocale.FromLocaleIdentifier (ident).Identifier, Is.EqualTo (ident), "FromLocaleIdentifier");
 		}
 
-#if NET && __MACCATALYST__
-		[Ignore ("No globalization for Mac Catalyst yet - https://github.com/xamarin/xamarin-macios/issues/11392")]
-#endif
 		[Test]
 		public void InitRegionInfo ()
 		{

diff --git a/tools/linker/MonoTouch.Tuner/ListExportedSymbols.cs b/tools/linker/MonoTouch.Tuner/ListExportedSymbols.cs
@@ -168,13 +168,6 @@ void ProcessMethod (MethodDefinition method)
 
 				case "libSystem.Globalization.Native":
 				case "System.Globalization.Native":
-#if NET
-					// https://github.com/xamarin/xamarin-macios/issues/11392
-					if (DerivedLinkContext.App.Platform == ApplePlatform.MacCatalyst) {
-						Driver.Log (4, "Did not add native reference to {0} in {1} referenced by {2} in {3}.", pinfo.EntryPoint, pinfo.Module.Name, method.FullName, method.Module.Name);
-						break;
-					}
-#endif
 					addPInvokeSymbol = true;
 					break;