Skip to content

[Android] InvariantGlobalization support for CoreCLR Android builds #117542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jul 16, 2025
Merged

[Android] InvariantGlobalization support for CoreCLR Android builds #117542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
75a0012
Propagate InvariantGlobalization
davidnguyen-tech Jul 11, 2025
0e7dbf3
Create InvariantGlobalization property
davidnguyen-tech Jul 11, 2025
72bb9f7
Pass the InvariantGlobalization to apkBuilder
davidnguyen-tech Jul 11, 2025
3df358b
Pass the InvariantGlobalization to envVariables
davidnguyen-tech Jul 11, 2025
90e2245
Pass InvariantGlobalization to AndroidAppBuilderTask
davidnguyen-tech Jul 11, 2025
05a72a4
Increase property count to make space for invariant globalization
davidnguyen-tech Jul 11, 2025
fe581ca
Set the invariant globalization AppContext to match the env variable
davidnguyen-tech Jul 11, 2025
1e89547
Remove Invariant.Tests.csproj exclusion
davidnguyen-tech Jul 11, 2025
3b9064c
Remove setting the invariant globalization in AppContext, since setti…
davidnguyen-tech Jul 11, 2025
729d70c
Remove comment
davidnguyen-tech Jul 11, 2025
66f8c01
Remove globalization tests exclusions
davidnguyen-tech Jul 14, 2025
9aef454
Exclude globalizations tests again (undo changes)
davidnguyen-tech Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@

<ItemGroup Condition="'$(TargetOS)' == 'android' and '$(RuntimeFlavor)' == 'CoreCLR' and '$(RunDisablediOSTests)' != 'true'">
<!-- https://github.com/dotnet/runtime/issues/114951 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Globalization.Tests\Invariant\Invariant.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Http\tests\FunctionalTests\System.Net.Http.Functional.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource\tests\TestWithConfigSwitches\System.Diagnostics.DiagnosticSource.Switches.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.MetadataLoadContext\tests\System.Reflection.MetadataLoadContext.Tests.csproj" />
Expand Down
1 change: 1 addition & 0 deletions src/mono/msbuild/android/build/AndroidBuild.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@
ForceAOT="$(RunAOTCompilation)"
ForceFullAOT="$(ForceFullAOT)"
ForceInterpreter="$(MonoForceInterpreter)"
InvariantGlobalization="$(InvariantGlobalization)"
IsLibraryMode="$(_IsLibraryMode)"
MainLibraryFileName="$(MainLibraryFileName)"
RuntimeHeaders="@(RuntimeHeaders)"
Expand Down
6 changes: 6 additions & 0 deletions src/tasks/AndroidAppBuilder/AndroidAppBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ public class AndroidAppBuilderTask : Task

public bool ForceInterpreter { get; set; }

/// <summary>
/// Indicates whether we want to use invariant globalization mode.
/// </summary>
public bool InvariantGlobalization { get; set; }

[Output]
public string ApkBundlePath { get; set; } = ""!;

Expand Down Expand Up @@ -141,6 +146,7 @@ public override bool Execute()
apkBuilder.NativeDependencies = NativeDependencies;
apkBuilder.ExtraLinkerArguments = ExtraLinkerArguments;
apkBuilder.RuntimeFlavor = RuntimeFlavor;
apkBuilder.InvariantGlobalization = InvariantGlobalization;
(ApkBundlePath, ApkPackageId) = apkBuilder.BuildApk(RuntimeIdentifier, MainLibraryFileName, RuntimeHeaders);

return true;
Expand Down
5 changes: 5 additions & 0 deletions src/tasks/AndroidAppBuilder/ApkBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,11 @@ public ApkBuilder(TaskLoggingHelper logger)
envVariables += $"\t\tsetEnv(\"{name}\", \"{value}\");\n";
}

if (InvariantGlobalization)
{
envVariables += $"\t\tsetEnv(\"DOTNET_SYSTEM_GLOBALIZATION_INVARIANT\", \"true\");\n";
}

string jniLibraryName = (IsLibraryMode) ? ProjectName! :
(StaticLinkedRuntime && IsCoreCLR) ? "monodroid" : "System.Security.Cryptography.Native.Android";
string monoRunner = Utils.GetEmbeddedResource("MonoRunner.java")
Expand Down
1 change: 1 addition & 0 deletions src/tests/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@
AppDir="$(BuildDir)"
DiagnosticPorts="$(DiagnosticPorts)"
ForceInterpreter="$(MonoInterp)"
InvariantGlobalization="$(InvariantGlobalization)"
RuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)/native/include/mono-2.0"
OutputDir="$(AppDir)"
ProjectName="$(Category)"
Expand Down
Loading