From 46f4396665eea22b8d2342dd4a8e64f420c499be Mon Sep 17 00:00:00 2001
From: Nick Gerleman <nick@nickgerleman.com>
Date: Wed, 15 Jan 2020 22:56:36 -0800
Subject: [PATCH 1/3] Fix Layout-Headers for Publish Try 2

Add a missing directory separator that wasn't in the env variable. Add
LayoutHeaders to a build flavor in the PR matrix so we can find this
earlier.
---
 .ado/windows-vs-pr.yml               | 1 +
 vnext/Scripts/Tfs/Layout-Headers.ps1 | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml
index 3af8ebb365e..23049d2d8d3 100644
--- a/.ado/windows-vs-pr.yml
+++ b/.ado/windows-vs-pr.yml
@@ -47,6 +47,7 @@ jobs:
           BuildConfiguration: Release
           BuildPlatform: x86
           UseRNFork: true
+          LayoutHeaders: true
         ArmRelease:
           BuildConfiguration: Release
           BuildPlatform: arm
diff --git a/vnext/Scripts/Tfs/Layout-Headers.ps1 b/vnext/Scripts/Tfs/Layout-Headers.ps1
index f0b5fda3697..55bf53be170 100644
--- a/vnext/Scripts/Tfs/Layout-Headers.ps1
+++ b/vnext/Scripts/Tfs/Layout-Headers.ps1
@@ -12,14 +12,14 @@ param(
 )
 
 if (!$ReactNativeRoot) {
-    $intermediateBuildDir =  if ($env:BaseIntDir) { $env:BaseIntDir } else { "$SourceRoot\vnext\build\" }
+    $intermediateBuildDir =  if ($env:BaseIntDir) { $env:BaseIntDir } else { "$SourceRoot\vnext\build" }
     $relativeRnDir = @(gci $intermediateBuildDir react-native-patched -Recurse -Directory -Name)[0]
 
     if (!$relativeRnDir) {
         throw "Cannot find patched React Native Directory (has a project been built?)"
     }
 
-    $ReactNativeRoot = $intermediateBuildDir + $relativeRnDir
+    $ReactNativeRoot = $intermediateBuildDir + "\" + $relativeRnDir
 }
 
 Write-Host "Source root: [$SourceRoot]"

From 7496edb5aba690ada3783acd66abedac1cfe7862 Mon Sep 17 00:00:00 2001
From: Nick Gerleman <nick@nickgerleman.com>
Date: Wed, 15 Jan 2020 22:58:18 -0800
Subject: [PATCH 2/3] Change files

---
 .../react-native-windows-2020-01-15-22-58-18-master.json  | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 change/react-native-windows-2020-01-15-22-58-18-master.json

diff --git a/change/react-native-windows-2020-01-15-22-58-18-master.json b/change/react-native-windows-2020-01-15-22-58-18-master.json
new file mode 100644
index 00000000000..b72f4226c46
--- /dev/null
+++ b/change/react-native-windows-2020-01-15-22-58-18-master.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Fix Layout-Headers for Publish Try 2",
+  "packageName": "react-native-windows",
+  "email": "nick@nickgerleman.com",
+  "commit": "46f4396665eea22b8d2342dd4a8e64f420c499be",
+  "date": "2020-01-16T06:58:18.186Z"
+}
\ No newline at end of file

From 3b63abb02a47c5e0e12a1fb1b359ab62a57a9ed0 Mon Sep 17 00:00:00 2001
From: Nick Gerleman <nick@nickgerleman.com>
Date: Thu, 16 Jan 2020 00:37:05 -0800
Subject: [PATCH 3/3] Use Join-Path, do not add LayoutHeaders to build matrix

---
 .ado/windows-vs-pr.yml               | 1 -
 vnext/Scripts/Tfs/Layout-Headers.ps1 | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml
index 23049d2d8d3..3af8ebb365e 100644
--- a/.ado/windows-vs-pr.yml
+++ b/.ado/windows-vs-pr.yml
@@ -47,7 +47,6 @@ jobs:
           BuildConfiguration: Release
           BuildPlatform: x86
           UseRNFork: true
-          LayoutHeaders: true
         ArmRelease:
           BuildConfiguration: Release
           BuildPlatform: arm
diff --git a/vnext/Scripts/Tfs/Layout-Headers.ps1 b/vnext/Scripts/Tfs/Layout-Headers.ps1
index 55bf53be170..3dc06859ebc 100644
--- a/vnext/Scripts/Tfs/Layout-Headers.ps1
+++ b/vnext/Scripts/Tfs/Layout-Headers.ps1
@@ -12,14 +12,14 @@ param(
 )
 
 if (!$ReactNativeRoot) {
-    $intermediateBuildDir =  if ($env:BaseIntDir) { $env:BaseIntDir } else { "$SourceRoot\vnext\build" }
+    $intermediateBuildDir = if ($env:BaseIntDir) { $env:BaseIntDir } else { "$SourceRoot\vnext\build" }
     $relativeRnDir = @(gci $intermediateBuildDir react-native-patched -Recurse -Directory -Name)[0]
 
     if (!$relativeRnDir) {
         throw "Cannot find patched React Native Directory (has a project been built?)"
     }
 
-    $ReactNativeRoot = $intermediateBuildDir + "\" + $relativeRnDir
+    $ReactNativeRoot = Join-Path $intermediateBuildDir $relativeRnDir
 }
 
 Write-Host "Source root: [$SourceRoot]"