Backport various fixes to 0.61 #4487
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fix crash when calling measure on non-framework element * Change files
* Set $(ReactNativeWindowsDir) before it is used * Change files
* Removed x86 override for msbuild tasks in CI, publish * Switch from MSBuild to VSBuild * Added `<AppxGeneratePrisForPortableLibrariesEnabled>false</AppxGeneratePrisForPortableLibrariesEnabled>` to C# app projects to fix build issues with msbuild x64 * Added `/p:AppxGeneratePrisForPortableLibrariesEnabled=false` for testcli build task
* Fix direct debugging * formatting * Change files
* Add a timeout to catch hangs during cert generation * Change files
vmoroz
approved these changes
Apr 3, 2020
acoates-ms
added
the
AutoMerge
|
Hello @acoates-ms! Because this pull request has the Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 60 minutes, a condition that will be fulfilled in about 16 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 (
|
ghost
merged commit
NickGerleman
added a commit
to NickGerleman/react-native-windows
that referenced
this pull request
Apr 3, 2020
This change ended up causing patched react native to land outside of the intermediate build directory, causing publish to fail. Revert it, since we seemed to not need it earlier (I think build logic after the branch changed where we defined ReactNativeWindowsDir). react-native-init CI will confirm whether this is okay to check in. Will need to followup to make sure publishing starts working after.
acoates-ms
pushed a commit
that referenced
this pull request
Apr 4, 2020
* Revert #4487 in 0.61-stable This change ended up causing patched react native to land outside of the intermediate build directory, causing publish to fail. Revert it, since we seemed to not need it earlier (I think build logic after the branch changed where we defined ReactNativeWindowsDir). react-native-init CI will confirm whether this is okay to check in. Will need to followup to make sure publishing starts working after. * Change files
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This backports the following changes:
Microsoft Reviewers: Open in CodeFlow