From d8484fd6f6270d73e5a4d84db773dfdd464ff752 Mon Sep 17 00:00:00 2001
From: Aaron Schultz <aschultz@microsoft.com>
Date: Tue, 18 Feb 2020 13:08:29 -0800
Subject: [PATCH] Fix for NormalizePath resolving IntDir based on current
 working directory (#4108)

* Fix issues with relative IntDir breaking builds

* formatting

* Change files

* Re-order path resolution calls. NormalizePath/NormalizeDirectory are the culprits here -- they normalize to an absolute path based on current working directory.
---
 ...windows-2020-02-14-16-56-53-users-aschultz-build.json | 9 +++++++++
 vnext/PropertySheets/ReactPackageDirectories.props       | 4 ++++
 vnext/ReactUWP/ReactUWP.vcxproj                          | 3 ++-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 change/react-native-windows-2020-02-14-16-56-53-users-aschultz-build.json

diff --git a/change/react-native-windows-2020-02-14-16-56-53-users-aschultz-build.json b/change/react-native-windows-2020-02-14-16-56-53-users-aschultz-build.json
new file mode 100644
index 00000000000..fe10756a1c3
--- /dev/null
+++ b/change/react-native-windows-2020-02-14-16-56-53-users-aschultz-build.json
@@ -0,0 +1,9 @@
+{
+  "type": "prerelease",
+  "comment": "Fix issues with relative IntDir breaking builds",
+  "packageName": "react-native-windows",
+  "email": "aschultz@microsoft.com",
+  "commit": "7ce4e87f02db6eb98f9d42214e8a770b64a07022",
+  "dependentChangeType": "patch",
+  "date": "2020-02-15T00:56:53.034Z"
+}
\ No newline at end of file
diff --git a/vnext/PropertySheets/ReactPackageDirectories.props b/vnext/PropertySheets/ReactPackageDirectories.props
index a878560f369..e48f5ffb6c3 100644
--- a/vnext/PropertySheets/ReactPackageDirectories.props
+++ b/vnext/PropertySheets/ReactPackageDirectories.props
@@ -15,6 +15,10 @@
     <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$(MSBuildThisFileDirectory)\..\</ReactNativeWindowsDir>
     <ReactNativePackageDir Condition="'$(ReactNativePackageDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native\package.json'))\node_modules\react-native\</ReactNativePackageDir>
     <ReactNativeDir Condition="'$(ReactNativeDir)' == ''">$(IntDir)\react-native-patched\</ReactNativeDir>
+    
+    <!-- For relative paths, make it relative to MSBuildProjectDirectory not CurrentWorkingDirectory. -->
+    <ReactNativeDir>$([MSBuild]::NormalizeDirectory( $([System.IO.Path]::Combine( $(MSBuildProjectDirectory), $(ReactNativeDir) )) ))</ReactNativeDir>
+
     <YogaDir Condition="'$(YogaDir)' == ''">$(ReactNativeDir)\ReactCommon\yoga</YogaDir>
     <FollyDir Condition="'$(FollyDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativePackageDir)..\..\node_modules))')">$(ReactNativePackageDir)..\..\node_modules\.folly\folly-2019.09.30.00</FollyDir>
   </PropertyGroup>
diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj
index 04cbc67992a..032c1aa3177 100644
--- a/vnext/ReactUWP/ReactUWP.vcxproj
+++ b/vnext/ReactUWP/ReactUWP.vcxproj
@@ -50,7 +50,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UnmergedWinmdDirectory>$([MSBuild]::NormalizePath($(IntDir)UnmergedWinMD))</UnmergedWinmdDirectory>
+    <!-- For relative paths, make it relative to MSBuildProjectDirectory not CurrentWorkingDirectory -->
+    <UnmergedWinmdDirectory>$([MSBuild]::NormalizeDirectory( $([System.IO.Path]::Combine( $(MSBuildProjectDirectory), $(IntDir)UnmergedWinMD )) ))</UnmergedWinmdDirectory>
     <!-- MDMERGE.EXE fails if output dir has trailing slash. -->
     <MergedWinmdDirectory>$(OutDir.TrimEnd("/\"))</MergedWinmdDirectory>
     <IdlHeaderDirectory>$(MSBuildThisFileDirectory)GeneratedWinmdHeader</IdlHeaderDirectory>