xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

Fixes https://github.com/xamarin/xamarin-macios/issues/11392.
This commit is contained in:
Rolf Bjarne Kvinge 2021-07-28 09:12:22 +02:00 коммит произвёл GitHub
Родитель 600ce3290b
Коммит 7986b2f2af
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 1 добавлений и 29 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
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>

2
tests/EmbeddedResources/ResourcesTest.cs
Просмотреть файл

@ -41,7 +41,6 @@ namespace EmbeddedResources {
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");
@ -49,7 +48,6 @@ namespace EmbeddedResources {
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
}
}
}

3
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)

3
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)

3
tests/linker/ios/link sdk/LinkSdkRegressionTest.cs
Просмотреть файл

@ -468,9 +468,6 @@ namespace LinkSdk {
#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;

6
tests/linker/ios/link sdk/LocaleTest.cs
Просмотреть файл

@ -14,9 +14,6 @@ namespace LinkSdk {
[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 ();
@ -24,9 +21,6 @@ namespace LinkSdk {
[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 ();

3
tests/monotouch-test/Foundation/LocaleTest.cs
Просмотреть файл

@ -38,9 +38,6 @@ namespace MonoTouchFixtures.Foundation {
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 ()
{

7
tools/linker/MonoTouch.Tuner/ListExportedSymbols.cs
Просмотреть файл

@ -168,13 +168,6 @@ namespace Xamarin.Linker.Steps
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;