Skip to content
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.

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

Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests #53172

Merged
merged 2 commits into from
May 24, 2021

Conversation

filipnavara
Copy link
Member

Fixes #50573
Fixes #51394

It's quite unexpected to me that overriding methods through runtimeconfig.template.json doesn't work on WASM/iOS/Android. Some of the properties can be specified with both MSBuild properties and the JSON config file. The MSBuild properties take precedence over the user specified JSON file. Since the new SDKs specify defaults for the MSBuild properties the defaults always override the JSON config mechanism.

@ghost
Copy link

ghost commented May 24, 2021

Tagging subscribers to this area: @tarekgh, @krwq, @eiriktsarpalis, @layomia
See info in area-owners.md if you want to be subscribed.

Issue Details

Fixes #50573
Fixes #51394

It's quite unexpected to me that overriding methods through runtimeconfig.template.json doesn't work on WASM/iOS/Android. Some of the properties can be specified with both MSBuild properties and the JSON config file. The MSBuild properties take precedence over the user specified JSON file. Since the new SDKs specify defaults for the MSBuild properties the defaults always override the JSON config mechanism.

Author: filipnavara
Assignees: -
Labels:

area-System.Text.Encoding

Milestone: -

@filipnavara filipnavara marked this pull request as ready for review May 24, 2021 13:34
@steveisok
Copy link
Member

The android failures are a known issue dotnet/xharness#597

The wasm failure is also know #50965

@steveisok steveisok self-requested a review May 24, 2021 14:49
Copy link
Member

@steveisok steveisok left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. The linker tests are impacted somehow with the path to the runtimeconfig task.

@filipnavara
Copy link
Member Author

I'll look at the linker tests... or just condition the task/target to only run on mobile.

Copy link
Contributor

@CoffeeFlux CoffeeFlux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Native bits LGTM, thanks!

@@ -239,6 +239,8 @@ mono_droid_runtime_init (const char* executable, int managed_argc, char* managed
arg->kind = 0;
arg->runtimeconfig.name.path = file_path;
monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
} else {
free (file_path);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks.

@marek-safar marek-safar merged commit 4514327 into dotnet:main May 24, 2021
@filipnavara filipnavara deleted the runtimeconfig-ios-android branch May 24, 2021 18:12
Copy link
Member

@fanyang-mono fanyang-mono left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change looks good to me. Thanks for adding runtimeconfig.json support to AppleAppBuilder.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

System.Text.Encoding.Tests Fails on iOS/tvOS System.Text.Encoding.Tests fail on Android
5 participants