Skip to content

[coreclr] fix string runtimeconfig.json values #10669

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
jonathanpeppers merged 3 commits into from
Jan 8, 2026
Merged

[coreclr] fix string runtimeconfig.json values #10669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab652c6
[coreclr] fix string `runtimeconfig.json` values
jonathanpeppers Jan 8, 2026
7230b4a
casing!
jonathanpeppers Jan 8, 2026
fd628b7
Merge branch 'main' into dev/peppers/coreclr-runtimeconfig
jonathanpeppers Jan 8, 2026
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
14 changes: 13 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Utilities/RuntimePropertiesParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,21 @@ class RuntimePropertiesParser
JsonElement properties = runtimeOptions.GetProperty ("configProperties");
var ret = new Dictionary<string, string> (StringComparer.OrdinalIgnoreCase);
foreach (JsonProperty prop in properties.EnumerateObject ()) {
ret[prop.Name] = prop.Value.GetRawText ();
string? value = GetJsonValueAsString (prop.Value);
if (value is not null) {
ret[prop.Name] = value;
}
}

return ret;
}

static string? GetJsonValueAsString (JsonElement element) =>
element.ValueKind switch {
JsonValueKind.String => element.GetString (),
JsonValueKind.True => "true",
JsonValueKind.False => "false",
JsonValueKind.Number or JsonValueKind.Object or JsonValueKind.Array => element.GetRawText (),
_ => null, // Null or Undefined
};
}
2 changes: 1 addition & 1 deletion tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
NetworkInterfaces excluded: https://github.com/dotnet/runtime/issues/75155
-->
<!-- TODO: https://github.com/dotnet/android/issues/10069 -->
<ExcludeCategories Condition=" '$(UseMonoRuntime)' != 'true' ">$(ExcludeCategories):CoreCLRIgnore:NTLM:RuntimeConfig</ExcludeCategories>
<ExcludeCategories Condition=" '$(UseMonoRuntime)' != 'true' ">$(ExcludeCategories):CoreCLRIgnore:NTLM</ExcludeCategories>
<!-- TODO: https://github.com/dotnet/android/issues/10079 -->
<ExcludeCategories Condition=" '$(PublishAot)' == 'true' ">$(ExcludeCategories):NativeAOTIgnore:SSL:NTLM:AndroidClientHandler:Export:NativeTypeMap</ExcludeCategories>
<!-- FIXME: LLVMIgnore https://github.com/dotnet/runtime/issues/89190 -->
Expand Down
Loading