diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index b3774e5e8..44f549c49 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -82,15 +82,6 @@ jobs:
run: npm install
working-directory: ./Package
-
-# - name: PATCH RNPermissions vcxproj
-# run: copy RNPermissions.vcxproj .\Apps\BRNPlayground\node_modules\react-native-permissions\windows\RNPermissions
-# working-directory: ./
-#
-# - name: PATCH RNPermissions packages.config
-# run: copy packages.config .\Apps\BRNPlayground\node_modules\react-native-permissions\windows\RNPermissions
-# working-directory: ./
-
- name: NPM Windows Project
run: npx install-windows-test-app
working-directory: ./Apps/BRNPlayground
@@ -104,7 +95,7 @@ jobs:
working-directory: ./Modules
- name: CMake BabylonNative
- run: cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows
+ run: cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows
working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64
- name: Nuget restore
diff --git a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt
index bfba9cb2c..bbe043098 100644
--- a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt
+++ b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt
@@ -14,8 +14,18 @@ include(${BABYLON_REACT_NATIVE_DIR}/shared/CMakeLists.txt)
# Note: We should avoid installing node_modules in the Module\@babylonjs\react-native folder.
# Installing react-native dependencies for both the Playground app and the @babylonjs\react-native package will generate a bad bundle/runtime errors.
set(NAPI_JAVASCRIPT_ENGINE "JSI" CACHE STRING "")
-get_filename_component(REACTNATIVE_DIR_CMAKE "${CMAKE_CURRENT_LIST_DIR}/../../../../Apps/BRNPlayground/node_modules/react-native" ABSOLUTE)
-get_filename_component(REACTNATIVE_WINDOWS_DIR_CMAKE "${CMAKE_CURRENT_LIST_DIR}/../../../../Apps/BRNPlayground/node_modules/react-native-windows/PropertySheets/External" ABSOLUTE)
+
+set(PLAYGROUND_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../Apps/Playground/Playground")
+set(PLAYGROUND_RNTA_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../Apps/BRNPlayground")
+
+if(EXISTS "${PLAYGROUND_DIR}/node_modules/react-native/package.json")
+ get_filename_component(REACTNATIVE_DIR_CMAKE "${PLAYGROUND_DIR}/node_modules/react-native" ABSOLUTE)
+elseif(EXISTS "${PLAYGROUND_RNTA_DIR}/node_modules/react-native/package.json")
+ get_filename_component(REACTNATIVE_DIR_CMAKE "${PLAYGROUND_RNTA_DIR}/node_modules/react-native" ABSOLUTE)
+else()
+ message(FATAL_ERROR "No Playground available")
+endif()
+
add_subdirectory("${REACTNATIVE_DIR_CMAKE}/ReactCommon/jsi/jsi" ${CMAKE_CURRENT_BINARY_DIR}/jsi)
target_include_directories(jsi INTERFACE ${REACTNATIVE_DIR_CMAKE}/ReactCommon/jsi)
@@ -51,17 +61,3 @@ target_link_libraries(BabylonNative
Canvas
${ADDITIONAL_LIBRARIES})
-set_target_properties(BabylonNative PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(arcana PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(GraphicsDevice PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(jsi PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(JsRuntime PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(NativeCapture PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(NativeEngine PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(NativeInput PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(NativeOptimizations PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(Window PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(XMLHttpRequest PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(Canvas PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(NativeXr PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
-set_target_properties(NativeCamera PROPERTIES VS_PROJECT_IMPORT "${REACTNATIVE_WINDOWS_DIR_CMAKE}/Microsoft.ReactNative.WindowsSdk.Default.props")
diff --git a/RNPermissions.vcxproj b/RNPermissions.vcxproj
deleted file mode 100644
index e68d242a2..000000000
--- a/RNPermissions.vcxproj
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
-
-
- true
- true
- true
- {99677b9d-a27b-4239-930e-c36c8d339c54}
- RNPermissions
- RNPermissions
- en-US
- 16.0
- true
- Windows Store
- 10.0
- 10.0.18362.0
- 10.0.17763.0
-
-
-
- $([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\
-
-
-
- Debug
- ARM
-
-
- Debug
- ARM64
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- ARM
-
-
- Release
- ARM64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- DynamicLibrary
- Unicode
- false
-
-
- true
- true
-
-
- false
- true
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Use
- pch.h
- $(IntDir)pch.pch
- Level4
- %(AdditionalOptions) /bigobj
-
- /DWINRT_NO_MAKE_DETECTION %(AdditionalOptions)
- 28204
- _WINRT_DLL;%(PreprocessorDefinitions)
- $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)
-
-
- Console
- true
- RNPermissions.def
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- ProgramDatabase
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
-
-
-
-
-
- ReactPackageProvider.idl
-
-
-
-
-
- Create
-
-
- ReactPackageProvider.idl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- This project references targets in your node_modules\react-native-windows folder. The missing file is {0}.
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/packages.config b/packages.config
deleted file mode 100644
index 52fd7154a..000000000
--- a/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file