Skip to content

Commit

Permalink
Merge branch 'main' into mm-cleanup-and-enable
Browse files Browse the repository at this point in the history 
* main:
  Localized file check-in by OneLocBuild Task: Build definition ID 11410: Build ID 6759133 (xamarin#7423)
  LEGO: Merge pull request 7422
  Bump to 32.0.476 .NET 6 Android packages (xamarin#7415)
  • Loading branch information
@grendello
grendello committed Sep 29, 2022
2 parents 48c3328 + 0f031dd commit 5781643
Show file tree
Hide file tree
Showing 13 changed files with 60 additions and 25 deletions.
9 changes: 9 additions & 0 deletions Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl
View file
Expand Up @@ -657,6 +657,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA1030" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Vlastnost MSBuild RunAOTCompilation se podporuje jen tehdy, když je povolené trimování. Upravte soubor projektu v textovém editoru, aby se vlastnost PublishTrimmed pro tuto konfiguraci sestavení nastavila na true.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl
View file
Expand Up @@ -657,6 +657,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA1030" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[La propiedad "RunAOTCompilation" de MSBuild solo se admite cuando el recorte está habilitado. Edite el archivo del proyecto en un editor de texto para establecer "PublishTrimmed" en "true" para esta configuración de compilación.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl
View file
Expand Up @@ -657,6 +657,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA1030" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[La propriété MSBuild « RunAOTCompilation » n’est prise en charge que lorsque le découpage est activé. Modifiez le fichier projet dans un éditeur de texte pour définir « PublishTrimmed » sur « true » pour cette configuration de build.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl
View file
Expand Up @@ -657,6 +657,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA1030" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[A propriedade MSBuild 'RunAOTCompilation' só tem suporte quando o corte está habilitado. Edite o arquivo de projeto em um editor de texto para definir 'PublishTrimmed' como 'true' para esta configuração de compilação.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl
View file
Expand Up @@ -657,6 +657,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA1030" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Свойство MSBuild "RunAOTCompilation" поддерживается только при включенной обрезке. Измените файл проекта в текстовом редакторе и установите значение "true" для свойства "PublishTrimmed" для этой конфигурации сборки.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl
View file
Expand Up @@ -657,6 +657,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA1030" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA['RunAOTCompilation' MSBuild özelliği yalnızca kırpma etkinleştirildiğinde desteklenir. Bu yapı yapılandırması için 'PublishTrimmed' öğesini 'true' olarak ayarlamak için proje dosyasını bir metin düzenleyicide düzenleyin.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx
View file
Expand Up @@ -467,7 +467,7 @@ In this message, the term "binding" means a piece of generated code that makes i
<comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
</data>
<data name="XA1030" xml:space="preserve">
<value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
<value>Vlastnost MSBuild RunAOTCompilation se podporuje jen tehdy, když je povolené trimování. Upravte soubor projektu v textovém editoru, aby se vlastnost PublishTrimmed pro tuto konfiguraci sestavení nastavila na true.</value>
<comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx
View file
Expand Up @@ -467,7 +467,7 @@ In this message, the term "binding" means a piece of generated code that makes i
<comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
</data>
<data name="XA1030" xml:space="preserve">
<value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
<value>La propiedad "RunAOTCompilation" de MSBuild solo se admite cuando el recorte está habilitado. Edite el archivo del proyecto en un editor de texto para establecer "PublishTrimmed" en "true" para esta configuración de compilación.</value>
<comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx
View file
Expand Up @@ -467,7 +467,7 @@ In this message, the term "binding" means a piece of generated code that makes i
<comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
</data>
<data name="XA1030" xml:space="preserve">
<value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
<value>La propriété MSBuild « RunAOTCompilation » n’est prise en charge que lorsque le découpage est activé. Modifiez le fichier projet dans un éditeur de texte pour définir « PublishTrimmed » sur « true » pour cette configuration de build.</value>
<comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx
View file
Expand Up @@ -467,7 +467,7 @@ In this message, the term "binding" means a piece of generated code that makes i
<comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
</data>
<data name="XA1030" xml:space="preserve">
<value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
<value>A propriedade MSBuild 'RunAOTCompilation' só tem suporte quando o corte está habilitado. Edite o arquivo de projeto em um editor de texto para definir 'PublishTrimmed' como 'true' para esta configuração de compilação.</value>
<comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx
View file
Expand Up @@ -467,7 +467,7 @@ In this message, the term "binding" means a piece of generated code that makes i
<comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
</data>
<data name="XA1030" xml:space="preserve">
<value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
<value>Свойство MSBuild "RunAOTCompilation" поддерживается только при включенной обрезке. Измените файл проекта в текстовом редакторе и установите значение "true" для свойства "PublishTrimmed" для этой конфигурации сборки.</value>
<comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx
View file
Expand Up @@ -467,7 +467,7 @@ In this message, the term "binding" means a piece of generated code that makes i
<comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
</data>
<data name="XA1030" xml:space="preserve">
<value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
<value>'RunAOTCompilation' MSBuild özelliği yalnızca kırpma etkinleştirildiğinde desteklenir. Bu yapı yapılandırması için 'PublishTrimmed' öğesini 'true' olarak ayarlamak için proje dosyasını bir metin düzenleyicide düzenleyin.</value>
<comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
19 changes: 0 additions & 19 deletions src/monodroid/jni/monodroid-glue.cc
View file
Expand Up @@ -2511,56 +2511,37 @@ MonodroidRuntime::Java_mono_android_Runtime_register (JNIEnv *env, jstring manag
total_time_index = internal_timing->start_event (TimingEventKind::RuntimeRegister);
}

log_info (LOG_DEFAULT, " loc #1");
jsize managedType_len = env->GetStringLength (managedType);
log_info (LOG_DEFAULT, " loc #2");
const jchar *managedType_ptr = env->GetStringChars (managedType, nullptr);
log_info (LOG_DEFAULT, " loc #3");
int methods_len = env->GetStringLength (methods);
log_info (LOG_DEFAULT, " loc #4");
const jchar *methods_ptr = env->GetStringChars (methods, nullptr);
log_info (LOG_DEFAULT, " loc #5");

#if !defined (NET) || !defined (ANDROID)
log_info (LOG_DEFAULT, " loc #6");
void *args[] = {
&managedType_ptr,
&managedType_len,
&nativeClass,
&methods_ptr,
&methods_len,
};
log_info (LOG_DEFAULT, " loc #7");
MonoMethod *register_jni_natives = registerType;
log_info (LOG_DEFAULT, " loc #8 (register_jni_natives == %p)", register_jni_natives);
#endif // ndef NET || ndef ANDROID

#if !defined (NET)
log_info (LOG_DEFAULT, " loc #8");
MonoDomain *domain = utils.get_current_domain (/* attach_thread_if_needed */ false);
log_info (LOG_DEFAULT, " loc #9");
mono_jit_thread_attach (domain);
log_info (LOG_DEFAULT, " loc #10");
// Refresh current domain as it might have been modified by the above call
domain = mono_domain_get ();
log_info (LOG_DEFAULT, " loc #11");

if constexpr (is_running_on_desktop) {
log_info (LOG_DEFAULT, " loc #12");
MonoClass *runtime = utils.monodroid_get_class_from_name (domain, SharedConstants::MONO_ANDROID_ASSEMBLY_NAME, SharedConstants::ANDROID_RUNTIME_NS_NAME, SharedConstants::JNIENVINIT_CLASS_NAME);
log_info (LOG_DEFAULT, " loc #13 (runtime == %p)", runtime);
register_jni_natives = mono_class_get_method_from_name (runtime, "RegisterJniNatives", 5);
log_info (LOG_DEFAULT, " loc #14 (register_jni_natives == %p)", register_jni_natives);
}

log_info (LOG_DEFAULT, " loc #15");
utils.monodroid_runtime_invoke (domain, register_jni_natives, nullptr, args, nullptr);
log_info (LOG_DEFAULT, " loc #16");
#else // ndef NET
#if !defined (ANDROID)
log_info (LOG_DEFAULT, " loc #17");
mono_runtime_invoke (register_jni_natives, nullptr, args, nullptr);
log_info (LOG_DEFAULT, " loc #18");
#else
jnienv_register_jni_natives (managedType_ptr, managedType_len, nativeClass, methods_ptr, methods_len);
#endif // ndef ANDROID
Expand Down

0 comments on commit 5781643

Please sign in to comment.