Skip to content

[0.68] Fix RuntimeOptions for RNW Desktop (#10016) - #10032

Merged
Vladimir Morozov (vmoroz) merged 1 commit into
microsoft:0.68-stablefrom
vmoroz:PR/0.68_FixRuntimeOptions
May 28, 2022
Merged

[0.68] Fix RuntimeOptions for RNW Desktop (#10016)#10032
Vladimir Morozov (vmoroz) merged 1 commit into
microsoft:0.68-stablefrom
vmoroz:PR/0.68_FixRuntimeOptions

Conversation

@vmoroz

@vmoroz Vladimir Morozov (vmoroz) commented May 27, 2022

Copy link
Copy Markdown
Member

Cherry pick PR #10016. Original PR description:

Description

Fix new RuntimeOptions.h API declarations added in PR #9983.

Type of Change

  • Bug fix (non-breaking change which fixes an issue)

Why

This PR fixes API issues introduced by PR #9983.
The RuntimeOptions.h code there has the following issues:

  • It does not provide extern "C" for the exported functions that causes linker error when the code is used.
  • MicrosoftReactGetRuntimeOptionString function misses the __cdecl calling conventions.
  • Unnecessary const for the results returned by value.

What

This PR fixes the issues mentioned above.

Testing

The issue was identified when I tried to use the RNW Desktop NuGet package version 0.66.19 in Office.
After these changes and additional changes to Office code related to the IWebSocketResource namespace changes, I could compile and run the Office code.

Microsoft Reviewers: Open in CodeFlow

@tudorms tudorms left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

:shipit:

@vmoroz
Vladimir Morozov (vmoroz) merged commit b7201e3 into microsoft:0.68-stable May 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants