diff --git a/change/react-native-windows-2019-11-14-11-22-09-add-turbomodule.json b/change/react-native-windows-2019-11-14-11-22-09-add-turbomodule.json
new file mode 100644
index 00000000000..0cdf4af71f7
--- /dev/null
+++ b/change/react-native-windows-2019-11-14-11-22-09-add-turbomodule.json
@@ -0,0 +1,8 @@
+{
+ "type": "prerelease",
+ "comment": "Add TurboModule and JsCallInvoker files to ReactCommon only when targeting to microsoft/react-native",
+ "packageName": "react-native-windows",
+ "email": "zihanc@microsoft.com",
+ "commit": "8a97fed007dbf4516a2b414723a6dc908ad357bf",
+ "date": "2019-11-14T19:22:09.917Z"
+}
\ No newline at end of file
diff --git a/change/react-native-windows-extended-2019-11-14-11-22-09-add-turbomodule.json b/change/react-native-windows-extended-2019-11-14-11-22-09-add-turbomodule.json
new file mode 100644
index 00000000000..35fdd295d87
--- /dev/null
+++ b/change/react-native-windows-extended-2019-11-14-11-22-09-add-turbomodule.json
@@ -0,0 +1,8 @@
+{
+ "type": "patch",
+ "comment": "Add TurboModule and JsCallInvoker files to ReactCommon only when targeting to microsoft/react-native",
+ "packageName": "react-native-windows-extended",
+ "email": "zihanc@microsoft.com",
+ "commit": "8a97fed007dbf4516a2b414723a6dc908ad357bf",
+ "date": "2019-11-14T19:22:00.297Z"
+}
\ No newline at end of file
diff --git a/packages/E2ETest/package.json b/packages/E2ETest/package.json
index 4253d51a9ba..19d0d740516 100644
--- a/packages/E2ETest/package.json
+++ b/packages/E2ETest/package.json
@@ -53,4 +53,4 @@
"metro-react-native-babel-preset": "0.55.0",
"react-test-renderer": "16.8.6"
}
-}
+}
\ No newline at end of file
diff --git a/packages/microsoft-reactnative-sampleapps/package.json b/packages/microsoft-reactnative-sampleapps/package.json
index cc74165cf2e..540f7036000 100644
--- a/packages/microsoft-reactnative-sampleapps/package.json
+++ b/packages/microsoft-reactnative-sampleapps/package.json
@@ -26,4 +26,4 @@
"metro-react-native-babel-preset": "0.55.0",
"react-test-renderer": "16.8.6"
}
-}
+}
\ No newline at end of file
diff --git a/packages/playground/package.json b/packages/playground/package.json
index 3b9ca8a3664..de5e002e6e3 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -26,4 +26,4 @@
"metro-react-native-babel-preset": "0.55.0",
"react-test-renderer": "16.8.6"
}
-}
+}
\ No newline at end of file
diff --git a/packages/react-native-windows-extended/package.json b/packages/react-native-windows-extended/package.json
index a227bb772b6..aaba0db57c2 100644
--- a/packages/react-native-windows-extended/package.json
+++ b/packages/react-native-windows-extended/package.json
@@ -47,4 +47,4 @@
"minor"
]
}
-}
+}
\ No newline at end of file
diff --git a/vnext/CHANGELOG.json b/vnext/CHANGELOG.json
index dac863b5c0d..17bd45ec667 100644
--- a/vnext/CHANGELOG.json
+++ b/vnext/CHANGELOG.json
@@ -10,7 +10,7 @@
{
"comment": "fix TextInput and Switch component colors",
"author": "robmeyer@microsoft.com",
- "commit": "ab50b2508092d9faa2b796821dfbbf0f0847ed7b"
+ "commit": "ab50b2508092d9faa2b796821dfbbf0f0847ed
}
]
}
diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj
index 8aacde11a28..7ff043d93a7 100644
--- a/vnext/ReactCommon/ReactCommon.vcxproj
+++ b/vnext/ReactCommon/ReactCommon.vcxproj
@@ -65,7 +65,7 @@
NotUsing
false
true
- $(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeDir)\ReactCommon\jsiexecutor;$(FollyDir);$(ReactNativeWindowsDir)stubs;;$(ReactNativeWindowsDir)\ReactWindowsCore\tracing;%(AdditionalIncludeDirectories)
+ $(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeDir)\ReactCommon\jscallinvoker;$(ReactNativeDir)\ReactCommon\jsiexecutor;$(FollyDir);$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)\ReactWindowsCore\tracing;%(AdditionalIncludeDirectories)
ENABLE_NATIVE_SYSTRACE;WITH_FBSYSTRACE;%(PreprocessorDefinitions)
ENABLE_JS_SYSTRACE;WITH_FBSYSTRACE;%(PreprocessorDefinitions)
ENABLE_TRACE_POSTPROCESSING;%(PreprocessorDefinitions)
@@ -137,11 +137,11 @@
-
-
-
-
-
+
+
+
+
+
true
@@ -156,6 +156,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vnext/ReactCommon/ReactCommon.vcxproj.filters b/vnext/ReactCommon/ReactCommon.vcxproj.filters
index 0a0d316a02f..6538d2ea366 100644
--- a/vnext/ReactCommon/ReactCommon.vcxproj.filters
+++ b/vnext/ReactCommon/ReactCommon.vcxproj.filters
@@ -1,4 +1,4 @@
-
+
@@ -28,6 +28,18 @@
{9c8e7a7a-c77d-479d-8611-1ece3cdacad7}
+
+ {23b0c36f-4a4b-4380-9e4c-f8cb0c2f2714}
+
+
+ {c4d010df-7391-4171-8658-9048078a5523}
+
+
+ {d52a2ed0-f060-446c-a049-1dae4aca1194}
+
+
+ {5bf47134-bd38-4ada-a2bb-9438240d70cf}
+
@@ -111,6 +123,24 @@
yoga
+
+ turbomodule\core
+
+
+ turbomodule\core
+
+
+ turbomodule\core
+
+
+ turbomodule\core
+
+
+ turbomodule\core
+
+
+ jscallinvoker\jsireact
+
@@ -230,6 +260,27 @@
privatedata
+
+ turbomodule\core
+
+
+ turbomodule\core
+
+
+ turbomodule\core
+
+
+ turbomodule\core
+
+
+ turbomodule\core
+
+
+ jscallinvoker\jsireact
+
+
+ jscallinvoker\jsireact
+
diff --git a/vnext/ReactUWP/EndPoints/dll/react-native-uwp.arm.def b/vnext/ReactUWP/EndPoints/dll/react-native-uwp.arm.def
index 1a9c6357654..4b945fd6e90 100644
--- a/vnext/ReactUWP/EndPoints/dll/react-native-uwp.arm.def
+++ b/vnext/ReactUWP/EndPoints/dll/react-native-uwp.arm.def
@@ -49,3 +49,9 @@ rallocxWeak
sallocxWeak
sdallocxWeak
xallocxWeak
+?set@HostObject@jsi@facebook@@UAAXAAVRuntime@23@ABVPropNameID@23@ABVValue@23@@Z
+?getPropertyNames@HostObject@jsi@facebook@@UAA?AV?$vector@VPropNameID@jsi@facebook@@V?$allocator@VPropNameID@jsi@facebook@@@std@@@std@@AAVRuntime@23@@Z
+??1Value@jsi@facebook@@QAA@XZ
+??0TurboModule@react@facebook@@QAA@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$shared_ptr@VJSCallInvoker@react@facebook@@@4@@Z
+??1TurboModule@react@facebook@@UAA@XZ
+?get@TurboModule@react@facebook@@UAA?AVValue@jsi@3@AAVRuntime@53@ABVPropNameID@53@@Z
diff --git a/vnext/ReactUWP/EndPoints/dll/react-native-uwp.x64.def b/vnext/ReactUWP/EndPoints/dll/react-native-uwp.x64.def
index 0f99b599d72..31fc48763f6 100644
--- a/vnext/ReactUWP/EndPoints/dll/react-native-uwp.x64.def
+++ b/vnext/ReactUWP/EndPoints/dll/react-native-uwp.x64.def
@@ -77,3 +77,9 @@ rallocxWeak
sallocxWeak
sdallocxWeak
xallocxWeak
+?set@HostObject@jsi@facebook@@UEAAXAEAVRuntime@23@AEBVPropNameID@23@AEBVValue@23@@Z
+?getPropertyNames@HostObject@jsi@facebook@@UEAA?AV?$vector@VPropNameID@jsi@facebook@@V?$allocator@VPropNameID@jsi@facebook@@@std@@@std@@AEAVRuntime@23@@Z
+??1Value@jsi@facebook@@QEAA@XZ
+??0TurboModule@react@facebook@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$shared_ptr@VJSCallInvoker@react@facebook@@@4@@Z
+??1TurboModule@react@facebook@@UEAA@XZ
+?get@TurboModule@react@facebook@@UEAA?AVValue@jsi@3@AEAVRuntime@53@AEBVPropNameID@53@@Z
diff --git a/vnext/ReactUWP/EndPoints/dll/react-native-uwp.x86.def b/vnext/ReactUWP/EndPoints/dll/react-native-uwp.x86.def
index b74e3e775e3..249b4506b71 100644
--- a/vnext/ReactUWP/EndPoints/dll/react-native-uwp.x86.def
+++ b/vnext/ReactUWP/EndPoints/dll/react-native-uwp.x86.def
@@ -77,3 +77,9 @@ rallocxWeak
sallocxWeak
sdallocxWeak
xallocxWeak
+?set@HostObject@jsi@facebook@@UAEXAAVRuntime@23@ABVPropNameID@23@ABVValue@23@@Z
+?getPropertyNames@HostObject@jsi@facebook@@UAE?AV?$vector@VPropNameID@jsi@facebook@@V?$allocator@VPropNameID@jsi@facebook@@@std@@@std@@AAVRuntime@23@@Z
+??1Value@jsi@facebook@@QAE@XZ
+??0TurboModule@react@facebook@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$shared_ptr@VJSCallInvoker@react@facebook@@@4@@Z
+??1TurboModule@react@facebook@@UAE@XZ
+?get@TurboModule@react@facebook@@UAE?AVValue@jsi@3@AAVRuntime@53@ABVPropNameID@53@@Z
diff --git a/vnext/package.json b/vnext/package.json
index ec4a7a0a712..870de35b0b5 100644
--- a/vnext/package.json
+++ b/vnext/package.json
@@ -63,4 +63,4 @@
"patch"
]
}
-}
+}
\ No newline at end of file