Skip to content

Conversation

@aeulitz
Copy link
Contributor

@aeulitz aeulitz commented May 10, 2020

This change only adds a C++/WinRT façade and a simple activation test for it. The implementation (i.e. the connection between the façade and the appropriate Win32 calls) will follow later.

Microsoft Reviewers: Open in CodeFlow

@aeulitz aeulitz requested a review from a team as a code owner May 10, 2020 00:51
<AdditionalOptions>-minpdbpathlen:256</AdditionalOptions>
</Link>
<Midl>
<AdditionalIncludeDirectories>$(ReactNativeWindowsDir)\Microsoft.ReactNative;$(ReactNativeWindowsDir)\Microsoft.ReactNative.Cxx;</AdditionalIncludeDirectories>
Copy link
Member

@vmoroz vmoroz May 11, 2020

Choose a reason for hiding this comment

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

$(ReactNativeWindowsDir)\Microsoft.ReactNative.Cxx [](start = 83, length = 50)

I wonder why is it need for the MIDL directories.
It would be better to have this part in the Microsoft.ReactNative.Cxx shared project instead. #Pending

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's for
#include "NamespaceRedirect.h"
in Microsoft.ReactNative\IReactContext.idl

I think it's a backwards build dependency we should change.


In reply to: 423288009 [](ancestors = 423288009)


namespace winrt::Microsoft::ReactNative::implementation {

struct ReactNativeHost : ReactNativeHostT<ReactNativeHost> {
Copy link
Member

@vmoroz vmoroz May 11, 2020

Choose a reason for hiding this comment

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

ReactNativeHost [](start = 7, length = 15)

It would be nice to reuse files from the Microsoft.ReactNative project in future. #WontFix

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will attempt this with the next change.


In reply to: 423289186 [](ancestors = 423289186)

#include "ActivationFactory.h"
#include "MessageQueueShim.h"

#include "ActivationFactory.h"
Copy link
Member

@vmoroz vmoroz May 11, 2020

Choose a reason for hiding this comment

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

The file seems to be included twice. #Resolved

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the catch, fixed.


In reply to: 423289819 [](ancestors = 423289819)

<CppWinRTDynamicProjectWinMDReferences Include="$(OutputPath)..\React.Windows.Desktop\facebook.react.winmd">
<WinMDPath>$(OutputPath)..\React.Windows.Desktop\facebook.react.winmd</WinMDPath>
</CppWinRTDynamicProjectWinMDReferences>
<CppWinRTDynamicProjectWinMDReferences Include="$(OutputPath)..\React.Windows.Desktop\Microsoft.ReactNative.winmd">
Copy link
Member

@vmoroz vmoroz May 11, 2020

Choose a reason for hiding this comment

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

CppWinRTDynamicProjectWinMDReferences [](start = 7, length = 37)

We also need to have a build dependency somewhere. The Microsoft.ReactNative.winmd must be created before the test project. #Pending

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We should get this indirectly through the dependency on the DLL in line 88.


In reply to: 423290781 [](ancestors = 423290781)

@@ -0,0 +1,26 @@
#include "pch.h"
Copy link
Member

@vmoroz vmoroz May 11, 2020

Choose a reason for hiding this comment

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

#i [](start = 0, length = 2)

nit: please add the copyright header. #Resolved

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.


In reply to: 423291311 [](ancestors = 423291311)

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:

@aeulitz aeulitz merged commit 49e6547 into microsoft:master May 12, 2020
ghost pushed a commit that referenced this pull request May 14, 2020
* improve treedump capabilities

* Reenable V8 for desktop projects (#4840)

* Delay load ChakraCore.dll

* Change files

* clean up unneeded project references

* Overwrite property after React.Cpp.props gets included

* Change files

* change file

* Fix WinUI3

* Reverse the conditional logic

* Revert some unnecessary changes. Consolidate the preprocessor defines in the props

Co-authored-by: tudorm <[email protected]>

* applying package updates ***NO_CI***

* update masters

* Improve run_wdio to print out failed tests (#4843)

* Improve run_wdio to print out failed tests

* Fire onLoad event when a bitmap image is opened (#4750)

* Fire onLoad event when a bitmap image is opeed

* Change files

* add imageFailed

* remove firing of onload events in the createImageBrush block so that load events don't fire twice.

* Expose ability for apps to provide their own RedBox implementation (#4786)

* Expose ability for apps to provide their own RedBox implementation

* Change files

* minor changes

* Code review feedback

* minor fix

* format fixes

* minor change

* minor fix

* minor fix

* minor fix

* Bump fp-ts from 2.5.4 to 2.6.0 (#4871)

Bumps [fp-ts](https://github.com/gcanti/fp-ts) from 2.5.4 to 2.6.0.
- [Release notes](https://github.com/gcanti/fp-ts/releases)
- [Changelog](https://github.com/gcanti/fp-ts/blob/master/CHANGELOG.md)
- [Commits](gcanti/fp-ts@2.5.4...2.6.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* applying package updates ***NO_CI***

* Fixed ReactContext copy/move semantic (#4870)

* Fixed ReactContext copy/move semantic

* Change files

* Fixed formatting

* Test to show how to use a delegate in ReactPropertyBag

* Add ReactNativeHost to Win32 C++/WinRT ABI  (#4848)

* create MS.ReactNative.IntegrationTests project

* RNHost activation succeeds

* update

* update

* Change files

* add JS function call test

* Change files

* fix formatting

* submit current state

* ReactNativeHost activation test succeeds

* Change files

* account for property bag addition

* sync, address code review feedback

* Use spec file for DevSettings NativeModule (#4873)

* Use spec file for DevSettings NativeModule

* Change files

* minor change

* Handle HTTP errors in DevSupportManager. (#4880)

* Handle HTTP connect exceptions in DevSupportManager

* Change files

* applying package updates ***NO_CI***

* Allow storing non-WinRT types in ReactPropertyBag (#4884)

* Allow storing non-WinRT types in ReactPropertyBag

* Change files

* Addressed PR feedback

* Use DispatcherQueue instead of CoreDispatcher for Mso::DispatchQueue (#4877)

* Use DispatcherQueue instead of CoreDispatcher for Mso::DispatchQueue

* Change files

* Removed 'Thread' from some new API names.

* Removed extra 'private' section in AppearanceModule

* Temporary: use CoreDispatcher to check the E2E test

* Avoid using DispatcherQueue::HasThreadAccess in earlier Windows versions.

* RNW dependencies (#4876)

* add rnw-dependencies.ps1

* Change files

* --sln

* run in CI

* print

* desktop appium is optional

* use agent directory

* 15GB is a ballpark estimate

* optional space

* .

* support running from web (#4892)

* Bump typescript from 3.8.3 to 3.9.2 (#4890)

* Bump lerna from 3.20.2 to 3.21.0 (#4889)

* BugFix:  fix default tabindex stomping over acceptsKeyboardFocus (#4893)

* Change files

* revert dfc57fc

* set default tab index to -1, the hope is to be in line with xbox assumption

* xbox doesn't seem to rely on this, changing default back to match xaml default

* Update e2e testing doc with CI debugging info (#4897)

* add instructions for CI debugging for e2e test app

* point e2e readme to e2e testing doc

* Update rnw-dependencies  (#4894)

* don't exit the powershell session and pause for keyboard input if interactive

* Change files

* enable Switch (fixed 4596)

* improve treedump capabilities

* update masters

* enable Switch (fixed 4596)

* protect against exceptions in run_wdio

* add another try block

* update e2e testing and masters, fixes 4680

* publish wdio report and fix run_wdio typo bug

* TreeDump should ignore collapsed object elements in an array

* add info about run_wdio

Co-authored-by: tudorms <[email protected]>
Co-authored-by: tudorm <[email protected]>
Co-authored-by: React-Native-Windows Bot <[email protected]>
Co-authored-by: lamxdoan <[email protected]>
Co-authored-by: Andrew Coates <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Vladimir Morozov <[email protected]>
Co-authored-by: Andreas Eulitz <[email protected]>
Co-authored-by: Julio César Rocha <[email protected]>
Co-authored-by: kmelmon <[email protected]>
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