From 841e27a9112d676b6cc377a5f584955a9d2c5963 Mon Sep 17 00:00:00 2001
From: Jon Thysell <jthysell@microsoft.com>
Date: Wed, 6 Jan 2021 11:17:23 -0800
Subject: [PATCH] fix: calculation for RNW root folder (#3052)

Switches to search for `node_modules/react-native-windows` to the
root of the (app) solution being built, not the camera project, to
ensure libraries build off the same version of RNW as the app

Co-authored-by: Mateus Andrade <15278828+MateusAndrade@users.noreply.github.com>
---
 windows/ReactNativeCameraCPP/ReactNativeCameraCPP.vcxproj     | 2 +-
 windows/ReactNativeCameraCPP61/ReactNativeCameraCPP61.vcxproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/windows/ReactNativeCameraCPP/ReactNativeCameraCPP.vcxproj b/windows/ReactNativeCameraCPP/ReactNativeCameraCPP.vcxproj
index 02b3d6b7c..d5392c2d3 100644
--- a/windows/ReactNativeCameraCPP/ReactNativeCameraCPP.vcxproj
+++ b/windows/ReactNativeCameraCPP/ReactNativeCameraCPP.vcxproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="ReactNativeWindowsProps">
-    <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\</ReactNativeWindowsDir>
+    <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\</ReactNativeWindowsDir>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
diff --git a/windows/ReactNativeCameraCPP61/ReactNativeCameraCPP61.vcxproj b/windows/ReactNativeCameraCPP61/ReactNativeCameraCPP61.vcxproj
index d90bbd24c..55b6a30f6 100644
--- a/windows/ReactNativeCameraCPP61/ReactNativeCameraCPP61.vcxproj
+++ b/windows/ReactNativeCameraCPP61/ReactNativeCameraCPP61.vcxproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="ReactNativeWindowsProps">
-    <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\</ReactNativeWindowsDir>
+    <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\</ReactNativeWindowsDir>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">