Skip to content

Conversation

@acoates-ms
Copy link
Contributor

@acoates-ms acoates-ms commented May 15, 2020

Split out from #4895 for just the platform fixes needed for XAML islands (that should also be included in 0.62)

One is a fix to allow the bundle path to be a file path rather than just a ms-appx path.
The 2nd is code to avoid a crash when calling into SystemNavigationManager when running from a Xaml island.

Microsoft Reviewers: Open in CodeFlow

Copy link
Member

@vmoroz vmoroz left a comment

Choose a reason for hiding this comment

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

:shipit:

#endif

#undef WINAPI_FAMILY
#define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP
Copy link
Member

Choose a reason for hiding this comment

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

make sure XBOX team isn't impacted

Copy link
Member

Choose a reason for hiding this comment

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

@namrog84 FYI

@acoates-ms acoates-ms added the AutoMerge Causes a PR to be automatically merged once all requirements are passed (label drives bot activity) label May 16, 2020
@ghost
Copy link

ghost commented May 16, 2020

Hello @acoates-ms!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 10 hours, a condition that will be fulfilled in about 2 hours 41 minutes. No worries though, I will be back when the time is right! 😉

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@NickGerleman
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ghost ghost merged commit 8fd9bf8 into microsoft:master May 18, 2020
NickGerleman pushed a commit to NickGerleman/react-native-windows that referenced this pull request May 19, 2020
…icrosoft#4919)

* Fixes for bundle loading and back handler crash using xaml islands

* Change files

* formatting

* missed a change

* Build fix for ReactUWP.
NickGerleman pushed a commit that referenced this pull request May 19, 2020
…4919)

* Fixes for bundle loading and back handler crash using xaml islands

* Change files

* formatting

* missed a change

* Build fix for ReactUWP.
@acoates-ms acoates-ms deleted the fixbackhandler branch May 21, 2020 17:17
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AutoMerge Causes a PR to be automatically merged once all requirements are passed (label drives bot activity)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants