diff --git a/change/react-native-windows-93dc5150-2e70-4130-8320-43d6b1d0656c.json b/change/react-native-windows-93dc5150-2e70-4130-8320-43d6b1d0656c.json new file mode 100644 index 00000000000..2e275acae16 --- /dev/null +++ b/change/react-native-windows-93dc5150-2e70-4130-8320-43d6b1d0656c.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Fix OfficeReact.Win32 Nuget layout", + "packageName": "react-native-windows", + "email": "vmorozov@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/vnext/Scripts/Tfs/Layout-MSRN-Headers.ps1 b/vnext/Scripts/Tfs/Layout-MSRN-Headers.ps1 index 4d52c0a3921..a27e774004c 100644 --- a/vnext/Scripts/Tfs/Layout-MSRN-Headers.ps1 +++ b/vnext/Scripts/Tfs/Layout-MSRN-Headers.ps1 @@ -45,6 +45,14 @@ Copy-Item -Force -Recurse -Path $ReactWindowsRoot\Microsoft.ReactNative.Cxx -Des # Copy native module spec files Copy-Item -Force -Recurse -Path $ReactWindowsRoot\codegen -Destination $TargetRoot\inc +# Overwrite ReactCommon\jsi\jsi files. It must be called before the ReactCommon overrides +Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\decorator.h -Destination $ReactNativeRoot\ReactCommon\jsi\jsi\ +Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\instrumentation.h -Destination $ReactNativeRoot\ReactCommon\jsi\jsi\ +Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\jsi.cpp -Destination $ReactNativeRoot\ReactCommon\jsi\jsi\ +Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\jsi.h -Destination $ReactNativeRoot\ReactCommon\jsi\jsi\ +Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\jsi-inl.h -Destination $ReactNativeRoot\ReactCommon\jsi\jsi\ +Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\threadsafe.h -Destination $ReactNativeRoot\ReactCommon\jsi\jsi\ + # Overwrite temporary ReactCommon files (since this script can runs on a different machine than where ReactCommon was built) Copy-Item -Force -Recurse -Path $ReactCommonOverrideRoot\* -Destination $ReactNativeRoot\ReactCommon\ @@ -61,6 +69,8 @@ New-Item $TargetRoot\Microsoft.ReactNative.Cxx\node-api -ItemType Directory -For Copy-Item -Force -Path $NodeApiJsiRoot\node-api\js_native_api.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\ Copy-Item -Force -Path $NodeApiJsiRoot\node-api\js_native_api_types.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\ Copy-Item -Force -Path $NodeApiJsiRoot\node-api\js_runtime_api.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\ +Copy-Item -Force -Path $NodeApiJsiRoot\node-api\node_api.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\ +Copy-Item -Force -Path $NodeApiJsiRoot\node-api\node_api_types.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\ # Microsoft.ReactNative.CXX project Node-API JSI files New-Item $TargetRoot\Microsoft.ReactNative.Cxx\ApiLoaders -ItemType Directory -Force