From dff3be794f93249a09f2e507f0ff8897c0be4401 Mon Sep 17 00:00:00 2001
From: "Andrew Coates (REDMOND)" <acoates@microsoft.com>
Date: Tue, 14 Apr 2020 11:43:00 -0700
Subject: [PATCH 1/8] Make default template build non-dev bundle when not using
 debug configuration

---
 packages/playground/windows/playground/Playground.vcxproj | 8 +++++++-
 vnext/PropertySheets/Bundle.Common.targets                | 2 +-
 .../templates/cpp/proj-experimental/MyApp.vcxproj         | 4 +++-
 .../generator-windows/templates/cpp/proj/MyApp.vcxproj    | 4 +++-
 .../generator-windows/templates/cs/proj/MyApp.csproj      | 4 +++-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/playground/windows/playground/Playground.vcxproj b/packages/playground/windows/playground/Playground.vcxproj
index b88008699a6..8db7dc22201 100644
--- a/packages/playground/windows/playground/Playground.vcxproj
+++ b/packages/playground/windows/playground/Playground.vcxproj
@@ -172,8 +172,10 @@
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
+    <UseDevBundle Condition="'$(Configuration)' == 'Debug'">true</UseDevBundle>
+    <UseDevBundle Condition="'$(Configuration)' != 'Debug'">false</UseDevBundle>
     <BundleCommand>
-      npx --no-install react-native bundle --platform windows --entry-file Samples/rntester.tsx --bundle-output $(MSBuildThisFileDirectory)/Bundle/index.windows.bundle --assets-dest $(MSBuildThisFileDirectory)/Bundle
+      npx --no-install react-native bundle --platform windows --entry-file Samples/rntester.tsx --bundle-output $(MSBuildThisFileDirectory)/Bundle/Samples/rntester.bundle --assets-dest $(MSBuildThisFileDirectory)/Bundle --dev $(UseDevBundle)
     </BundleCommand>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
   </PropertyGroup>
@@ -190,4 +192,8 @@
     <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets'))" />
   </Target>
+    <Target Name="EnsureBundleDir" BeforeTargets="MakeBundle" 
+      Condition="'$(UseBundle)' == 'true'">
+        <MakeDir Directories="Bundle\Samples" Condition="!Exists('Bundle\Samples')"/>
+    </Target>
 </Project>
\ No newline at end of file
diff --git a/vnext/PropertySheets/Bundle.Common.targets b/vnext/PropertySheets/Bundle.Common.targets
index 971bf63aecf..8ca28082b4d 100644
--- a/vnext/PropertySheets/Bundle.Common.targets
+++ b/vnext/PropertySheets/Bundle.Common.targets
@@ -8,7 +8,7 @@
 
   <Target Name="MakeBundle" BeforeTargets="PrepareForBuild" 
       Condition="'$(UseBundle)' == 'true'">
-        <MakeDir Directories="$(BundleContentRoot)" Condition=" !Exists('$(BundleContentRoot') and '$(BundleContentRoot)' != '' " />
+        <MakeDir Directories="$(BundleContentRoot)" Condition=" !Exists('$(BundleContentRoot)') and '$(BundleContentRoot)' != '' " />
         <Warning Text="BundleCommand is not defined, and you should execute 'react-native bundle' by yourself" Condition="'$(BundleCommand)' == ''" />
         <Exec Condition="'$(BundleCommand)' != ''" Command="$(BundleCommand)" ConsoleToMSBuild="true" WorkingDirectory="$([System.IO.Path]::GetDirectoryName($(ProjectDir)))" />
   </Target>
diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj-experimental/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj-experimental/MyApp.vcxproj
index 3e6ccd65be1..a15c0f1c25e 100644
--- a/vnext/local-cli/generator-windows/templates/cpp/proj-experimental/MyApp.vcxproj
+++ b/vnext/local-cli/generator-windows/templates/cpp/proj-experimental/MyApp.vcxproj
@@ -152,8 +152,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 
   <PropertyGroup>
+    <UseDevBundle Condition="'$(Configuration)' == 'Debug'">true</UseDevBundle>
+    <UseDevBundle Condition="'$(Configuration)' != 'Debug'">false</UseDevBundle>
     <BundleCommand>
-      npx --no-install react-native bundle --platform windows --entry-file index.js --bundle-output $(MSBuildThisFileDirectory)/Bundle/index.windows.bundle --assets-dest $(MSBuildThisFileDirectory)/Bundle
+      npx --no-install react-native bundle --platform windows --entry-file index.js --bundle-output $(MSBuildThisFileDirectory)/Bundle/index.windows.bundle --assets-dest $(MSBuildThisFileDirectory)/Bundle --dev $(UseDevBundle)
     </BundleCommand>
   </PropertyGroup>
   <Import Project="..\..\node_modules\react-native-windows\PropertySheets\Bundle.Cpp.targets"/>
diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj
index da48fb3cb65..b957ce91d14 100644
--- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj
+++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj
@@ -157,8 +157,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 
   <PropertyGroup>
+    <UseDevBundle Condition="'$(Configuration)' == 'Debug'">true</UseDevBundle>
+    <UseDevBundle Condition="'$(Configuration)' != 'Debug'">false</UseDevBundle>
     <BundleCommand>
-      npx --no-install react-native bundle --platform windows --entry-file index.js --bundle-output $(MSBuildThisFileDirectory)/Bundle/index.windows.bundle --assets-dest $(MSBuildThisFileDirectory)/Bundle
+      npx --no-install react-native bundle --platform windows --entry-file index.js --bundle-output $(MSBuildThisFileDirectory)/Bundle/index.windows.bundle --assets-dest $(MSBuildThisFileDirectory)/Bundle --dev $(UseDevBundle)
     </BundleCommand>
   </PropertyGroup>
   <Import Project="..\..\node_modules\react-native-windows\PropertySheets\Bundle.Cpp.targets"/>
diff --git a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj
index 2b598cbc339..f77d0121172 100644
--- a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj
+++ b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj
@@ -165,8 +165,10 @@
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <PropertyGroup>
+    <UseDevBundle Condition="'$(Configuration)' == 'Debug'">true</UseDevBundle>
+    <UseDevBundle Condition="'$(Configuration)' != 'Debug'">false</UseDevBundle>
     <BundleCommand>
-      npx --no-install react-native bundle --platform windows --entry-file index.js --bundle-output $(MSBuildThisFileDirectory)/Bundle/index.windows.bundle --assets-dest $(MSBuildThisFileDirectory)/Bundle
+      npx --no-install react-native bundle --platform windows --entry-file index.js --bundle-output $(MSBuildThisFileDirectory)/Bundle/index.windows.bundle --assets-dest $(MSBuildThisFileDirectory)/Bundle --dev $(UseDevBundle)
     </BundleCommand>
   </PropertyGroup>
   <Import Project="..\..\node_modules\react-native-windows\PropertySheets\Bundle.targets" />

From e0976f28ce5208f3754693688d051cdd2e3a6191 Mon Sep 17 00:00:00 2001
From: "Andrew Coates (REDMOND)" <acoates@microsoft.com>
Date: Tue, 14 Apr 2020 11:43:18 -0700
Subject: [PATCH 2/8] Change files

---
 ...-native-windows-2020-04-14-11-43-18-releasebundle.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 change/react-native-windows-2020-04-14-11-43-18-releasebundle.json

diff --git a/change/react-native-windows-2020-04-14-11-43-18-releasebundle.json b/change/react-native-windows-2020-04-14-11-43-18-releasebundle.json
new file mode 100644
index 00000000000..cddc40b0588
--- /dev/null
+++ b/change/react-native-windows-2020-04-14-11-43-18-releasebundle.json
@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Make default template build non-dev bundle when not using debug configuration",
+  "packageName": "react-native-windows",
+  "email": "acoates@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-04-14T18:43:18.289Z"
+}
\ No newline at end of file

From d414283b9021e0b272df4b2e40e74d3b7958f303 Mon Sep 17 00:00:00 2001
From: "Andrew Coates (REDMOND)" <acoates@microsoft.com>
Date: Wed, 15 Apr 2020 09:55:16 -0700
Subject: [PATCH 3/8] review feedback

---
 .../windows/ReactUWPTestApp/ReactUWPTestApp.csproj    |  4 ++--
 .../windows/SampleAppCPP/SampleAppCpp.vcxproj         |  1 +
 .../windows/SampleAppCS/SampleAppCS.csproj            |  1 +
 .../playground/windows/playground/Playground.vcxproj  | 10 ++++------
 vnext/PropertySheets/Bundle.Common.targets            |  2 --
 vnext/PropertySheets/Bundle.props                     |  7 +++++++
 vnext/include/Include.vcxitems.filters                |  1 +
 .../templates/cpp/proj-experimental/MyApp.vcxproj     | 11 ++---------
 .../templates/cpp/proj/MyApp.vcxproj                  | 11 ++---------
 .../generator-windows/templates/cs/proj/MyApp.csproj  | 10 ++--------
 10 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
index 4c3f53bfa5a..c60fe0659e8 100644
--- a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
+++ b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
@@ -176,10 +176,10 @@
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <PropertyGroup>
     <BundleCommand>
-    echo WorkingDir %CD%
-    npx --no-install yarn run bundle
+      npx --no-install yarn run bundle
     </BundleCommand>
   </PropertyGroup>
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj
index c18ff844d50..5f87a3c1e72 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj
@@ -203,6 +203,7 @@
       npx --no-install yarn run bundle-cpp
     </BundleCommand>
   </PropertyGroup>
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.Cpp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj
index 2e97b136b5b..e4fde8b9168 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj
@@ -179,6 +179,7 @@
       npx --no-install yarn run bundle-cs
     </BundleCommand>
   </PropertyGroup>
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/packages/playground/windows/playground/Playground.vcxproj b/packages/playground/windows/playground/Playground.vcxproj
index 8db7dc22201..38ff4b1c507 100644
--- a/packages/playground/windows/playground/Playground.vcxproj
+++ b/packages/playground/windows/playground/Playground.vcxproj
@@ -172,14 +172,12 @@
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
-    <UseDevBundle Condition="'$(Configuration)' == 'Debug'">true</UseDevBundle>
-    <UseDevBundle Condition="'$(Configuration)' != 'Debug'">false</UseDevBundle>
-    <BundleCommand>
-      npx --no-install react-native bundle --platform windows --entry-file Samples/rntester.tsx --bundle-output $(MSBuildThisFileDirectory)/Bundle/Samples/rntester.bundle --assets-dest $(MSBuildThisFileDirectory)/Bundle --dev $(UseDevBundle)
-    </BundleCommand>
+    <BundleEntryFile>Samples/rntester.tsx</BundleEntryFile>
+    <BundleOutputPath>Bundle/Samples/rntester.bundle</BundleOutputPath>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
   </PropertyGroup>
-  <Import Project="..\..\..\..\vnext\PropertySheets\Bundle.Cpp.targets" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
     <Import Project="..\packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets')" />
diff --git a/vnext/PropertySheets/Bundle.Common.targets b/vnext/PropertySheets/Bundle.Common.targets
index 8ca28082b4d..b8cb200d2da 100644
--- a/vnext/PropertySheets/Bundle.Common.targets
+++ b/vnext/PropertySheets/Bundle.Common.targets
@@ -4,8 +4,6 @@
  Licensed under the MIT License.. 
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)\Bundle.props"/>
-
   <Target Name="MakeBundle" BeforeTargets="PrepareForBuild" 
       Condition="'$(UseBundle)' == 'true'">
         <MakeDir Directories="$(BundleContentRoot)" Condition=" !Exists('$(BundleContentRoot)') and '$(BundleContentRoot)' != '' " />
diff --git a/vnext/PropertySheets/Bundle.props b/vnext/PropertySheets/Bundle.props
index 64f7c7eb244..9bdbe58214b 100644
--- a/vnext/PropertySheets/Bundle.props
+++ b/vnext/PropertySheets/Bundle.props
@@ -10,6 +10,13 @@
     <UseBundle Condition=" '$(Configuration)' == 'Release' and '$(UseBundle)' == '' ">true</UseBundle>
     <BundleContentRoot Condition=" '$(BundleContentRoot)' == '' ">Bundle</BundleContentRoot>
     <BundleContent Condition = " '$(BundleContent)' == '' and '$(BundleContentRoot)' != '' ">$(BundleContentRoot)\**\*</BundleContent>
+    <UseDevBundle Condition="'$(UseDevBundle)' == '' and '$(Configuration)' == 'Debug'">true</UseDevBundle>
+    <UseDevBundle Condition="'$(UseDevBundle)' == '' and '$(Configuration)' != 'Debug'">false</UseDevBundle>
+    <BundleEntryFile Condition="'$(BundleEntryFile)' == ''">index.js</BundleEntryFile>
+    <BundleOutputPath Condition="'$(BundleOutputPath)' == ''">Bundle/index.windows.bundle</BundleOutputPath>
+    <BundleCommand Condition="'$(BundleCommand)' == ''">
+      npx --no-install react-native bundle --platform windows --entry-file $(BundleEntryFile) --bundle-output $(BundleOutputPath) --assets-dest $(BundleContentRoot) --dev $(UseDevBundle)
+    </BundleCommand>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/vnext/include/Include.vcxitems.filters b/vnext/include/Include.vcxitems.filters
index 9e5b13ff3fd..3de9e65a5de 100644
--- a/vnext/include/Include.vcxitems.filters
+++ b/vnext/include/Include.vcxitems.filters
@@ -86,6 +86,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\UwpScriptStore.h">
       <Filter>ReactUWP\Utils</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)ReactWindowsCore\cdebug.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="ReactUWP">
diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj-experimental/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj-experimental/MyApp.vcxproj
index a15c0f1c25e..e2436a5aa3c 100644
--- a/vnext/local-cli/generator-windows/templates/cpp/proj-experimental/MyApp.vcxproj
+++ b/vnext/local-cli/generator-windows/templates/cpp/proj-experimental/MyApp.vcxproj
@@ -150,15 +150,8 @@
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-
-  <PropertyGroup>
-    <UseDevBundle Condition="'$(Configuration)' == 'Debug'">true</UseDevBundle>
-    <UseDevBundle Condition="'$(Configuration)' != 'Debug'">false</UseDevBundle>
-    <BundleCommand>
-      npx --no-install react-native bundle --platform windows --entry-file index.js --bundle-output $(MSBuildThisFileDirectory)/Bundle/index.windows.bundle --assets-dest $(MSBuildThisFileDirectory)/Bundle --dev $(UseDevBundle)
-    </BundleCommand>
-  </PropertyGroup>
-  <Import Project="..\..\node_modules\react-native-windows\PropertySheets\Bundle.Cpp.targets"/>
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props"/>
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.Cpp.targets"/>
 
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj
index b957ce91d14..86ccaa8cf0f 100644
--- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj
+++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj
@@ -155,15 +155,8 @@
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-
-  <PropertyGroup>
-    <UseDevBundle Condition="'$(Configuration)' == 'Debug'">true</UseDevBundle>
-    <UseDevBundle Condition="'$(Configuration)' != 'Debug'">false</UseDevBundle>
-    <BundleCommand>
-      npx --no-install react-native bundle --platform windows --entry-file index.js --bundle-output $(MSBuildThisFileDirectory)/Bundle/index.windows.bundle --assets-dest $(MSBuildThisFileDirectory)/Bundle --dev $(UseDevBundle)
-    </BundleCommand>
-  </PropertyGroup>
-  <Import Project="..\..\node_modules\react-native-windows\PropertySheets\Bundle.Cpp.targets"/>
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.Cpp.targets"/>
 
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
diff --git a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj
index f77d0121172..fdd445964fc 100644
--- a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj
+++ b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj
@@ -164,14 +164,8 @@
     <VisualStudioVersion>16.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <PropertyGroup>
-    <UseDevBundle Condition="'$(Configuration)' == 'Debug'">true</UseDevBundle>
-    <UseDevBundle Condition="'$(Configuration)' != 'Debug'">false</UseDevBundle>
-    <BundleCommand>
-      npx --no-install react-native bundle --platform windows --entry-file index.js --bundle-output $(MSBuildThisFileDirectory)/Bundle/index.windows.bundle --assets-dest $(MSBuildThisFileDirectory)/Bundle --dev $(UseDevBundle)
-    </BundleCommand>
-  </PropertyGroup>
-  <Import Project="..\..\node_modules\react-native-windows\PropertySheets\Bundle.targets" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.targets" />
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>

From b407b4d42e8687cadb1399b28022104b75394902 Mon Sep 17 00:00:00 2001
From: "Andrew Coates (REDMOND)" <acoates@microsoft.com>
Date: Wed, 15 Apr 2020 10:26:44 -0700
Subject: [PATCH 4/8] ReactNativeWindows location shouldn't be hard coded in
 template project, since RNW could be hoisted

---
 .../templates/cpp/proj-experimental/MyApp.vcxproj          | 5 ++++-
 .../generator-windows/templates/cpp/proj/MyApp.vcxproj     | 7 +++++--
 .../generator-windows/templates/cs/proj/MyApp.csproj       | 7 +++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj-experimental/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj-experimental/MyApp.vcxproj
index e2436a5aa3c..f6a21a959da 100644
--- a/vnext/local-cli/generator-windows/templates/cpp/proj-experimental/MyApp.vcxproj
+++ b/vnext/local-cli/generator-windows/templates/cpp/proj-experimental/MyApp.vcxproj
@@ -19,6 +19,9 @@
     <%=certificateThumbprint%>
     <PackageCertificatePassword>password</PackageCertificatePassword>
   </PropertyGroup>
+  <PropertyGroup>
+    <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\</ReactNativeWindowsDir>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
@@ -71,7 +74,7 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems" Label="Shared" />
+    <Import Project="$(ReactNativeWindowsDir)\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems" Label="Shared" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj
index 86ccaa8cf0f..d6970f786da 100644
--- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj
+++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj
@@ -19,6 +19,9 @@
     <%=certificateThumbprint%>
     <PackageCertificatePassword>password</PackageCertificatePassword>
   </PropertyGroup>
+  <PropertyGroup>
+    <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\</ReactNativeWindowsDir>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
@@ -71,7 +74,7 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems" Label="Shared" />
+    <Import Project="$(ReactNativeWindowsDir)\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems" Label="Shared" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -149,7 +152,7 @@
     </Text>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\node_modules\react-native-windows\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj">
+    <ProjectReference Include="$(ReactNativeWindowsDir)\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj">
       <Project>{f7d32bd0-2749-483e-9a0d-1635ef7e3136}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj
index fdd445964fc..e7010aff763 100644
--- a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj
+++ b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj
@@ -22,6 +22,9 @@
     <PackageCertificatePassword>password</PackageCertificatePassword>
     <AppxGeneratePrisForPortableLibrariesEnabled>false</AppxGeneratePrisForPortableLibrariesEnabled>
   </PropertyGroup>
+  <PropertyGroup>
+    <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\</ReactNativeWindowsDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
@@ -151,7 +154,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\node_modules\react-native-windows\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj">
+    <ProjectReference Include="$(ReactNativeWindowsDir)\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj">
       <Project>{f7d32bd0-2749-483e-9a0d-1635ef7e3136}</Project>
       <Name>Microsoft.ReactNative</Name>
     </ProjectReference>
@@ -159,7 +162,7 @@
       <Version>2.3.191129002</Version>
     </PackageReference>
   </ItemGroup>
-  <Import Project="..\..\node_modules\react-native-windows\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems" Label="Shared" />
+  <Import Project="$(ReactNativeWindowsDir)\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems" Label="Shared" />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
     <VisualStudioVersion>16.0</VisualStudioVersion>
   </PropertyGroup>

From d29db09fdc38be5b1e65174b53734b7513b2511b Mon Sep 17 00:00:00 2001
From: "Andrew Coates (REDMOND)" <acoates@microsoft.com>
Date: Mon, 20 Apr 2020 09:31:01 -0700
Subject: [PATCH 5/8] Align bundle props with gradle build options

---
 .../ReactUWPTestApp/ReactUWPTestApp.csproj    |  6 +--
 .../TreeDumpLibrary/TreeDumpLibrary.csproj    |  4 +-
 .../windows/SampleAppCPP/SampleAppCpp.vcxproj |  5 ---
 .../windows/SampleAppCS/SampleAppCS.csproj    |  5 ---
 vnext/PropertySheets/Bundle.Common.targets    |  6 ++-
 vnext/PropertySheets/Bundle.props             | 44 ++++++++++++++++---
 6 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
index c60fe0659e8..d9b8888803b 100644
--- a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
+++ b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
@@ -174,12 +174,10 @@
     <VisualStudioVersion>16.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
   <PropertyGroup>
-    <BundleCommand>
-      npx --no-install yarn run bundle
-    </BundleCommand>
+    <BundleEntryFile>dist/app/index.js</BundleEntryFile>
   </PropertyGroup>
-  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpLibrary.csproj b/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpLibrary.csproj
index 0b24b8cc6fa..89307c84c47 100644
--- a/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpLibrary.csproj
+++ b/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpLibrary.csproj
@@ -112,7 +112,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.8</Version>
+      <Version>6.2.10</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -137,4 +137,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj
index 5f87a3c1e72..e11f22797a5 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj
@@ -198,11 +198,6 @@
     <Import Project="..\packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets')" />
     <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
-  <PropertyGroup>
-    <BundleCommand>
-      npx --no-install yarn run bundle-cpp
-    </BundleCommand>
-  </PropertyGroup>
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.Cpp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj
index e4fde8b9168..f684575e3ec 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj
@@ -174,11 +174,6 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
     <VisualStudioVersion>16.0</VisualStudioVersion>
   </PropertyGroup>
-  <PropertyGroup>
-    <BundleCommand>
-      npx --no-install yarn run bundle-cs
-    </BundleCommand>
-  </PropertyGroup>
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
diff --git a/vnext/PropertySheets/Bundle.Common.targets b/vnext/PropertySheets/Bundle.Common.targets
index b8cb200d2da..50af12830cb 100644
--- a/vnext/PropertySheets/Bundle.Common.targets
+++ b/vnext/PropertySheets/Bundle.Common.targets
@@ -7,7 +7,9 @@
   <Target Name="MakeBundle" BeforeTargets="PrepareForBuild" 
       Condition="'$(UseBundle)' == 'true'">
         <MakeDir Directories="$(BundleContentRoot)" Condition=" !Exists('$(BundleContentRoot)') and '$(BundleContentRoot)' != '' " />
-        <Warning Text="BundleCommand is not defined, and you should execute 'react-native bundle' by yourself" Condition="'$(BundleCommand)' == ''" />
-        <Exec Condition="'$(BundleCommand)' != ''" Command="$(BundleCommand)" ConsoleToMSBuild="true" WorkingDirectory="$([System.IO.Path]::GetDirectoryName($(ProjectDir)))" />
+        <MakeDir Directories="$(BundleSourceMapDir)" Condition=" !Exists('$(BundleSourceMapDir)') and '$(BundleSourceMapDir)' != '' " />
+        <Message Importance="High" Text="Running [$(BundleCliCommand) --platform windows --entry-file $(BundleEntryFile) --bundle-output $([MSBuild]::NormalizeDirectory('$(BundleOutputPath)\$(BundleAssetName)')) --assets-dest $(BundleContentRoot) --dev $(UseDevBundle) --reset-cache --sourcemap-output $([MSBuild]::NormalizeDirectory('$(BundleSourceMapDir)\$(BundleAssetName).map')) $(BundlerExtraArgs)] to build bundle file." />
+        <!-- Hermes will need more code here to build source maps (Call to node_modules/react-native/scripts/compose-source-maps.js) -->
+        <Exec Command="$(BundleCliCommand) --platform windows --entry-file $(BundleEntryFile) --bundle-output $([MSBuild]::NormalizeDirectory('$(BundleOutputPath)\$(BundleAssetName)')) --assets-dest $(BundleContentRoot) --dev $(UseDevBundle) --reset-cache --sourcemap-output $([MSBuild]::NormalizeDirectory('$(BundleSourceMapDir)\$(BundleAssetName).map')) $(BundlerExtraArgs)" ConsoleToMSBuild="true" WorkingDirectory="$(BundleCommandWorkingDir)" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/vnext/PropertySheets/Bundle.props b/vnext/PropertySheets/Bundle.props
index 9bdbe58214b..1593ff8ca35 100644
--- a/vnext/PropertySheets/Bundle.props
+++ b/vnext/PropertySheets/Bundle.props
@@ -6,17 +6,49 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
+
+    <!-- 
+      UseBundle causes the bundle to be created and included inside the application install.  And defines the BUNDLE #define in code,
+      which causes the app to load from the bundle file rather than loading the bundle from a bundle server
+    -->
     <UseBundle Condition=" '$(Configuration)' == 'Debug' and '$(UseBundle)' == '' ">false</UseBundle>
     <UseBundle Condition=" '$(Configuration)' == 'Release' and '$(UseBundle)' == '' ">true</UseBundle>
-    <BundleContentRoot Condition=" '$(BundleContentRoot)' == '' ">Bundle</BundleContentRoot>
-    <BundleContent Condition = " '$(BundleContent)' == '' and '$(BundleContentRoot)' != '' ">$(BundleContentRoot)\**\*</BundleContent>
+
+    <!-- Root directory where bundle assets will be copied to, be sure to update BundleContent if you change this -->
+    <BundleContentRoot Condition=" '$(BundleContentRoot)' == '' ">$([MSBuild]::NormalizeDirectory('$(ProjectDir)\Bundle'))</BundleContentRoot>
+
+    <!-- Files included in BundleContent will be included in the application install - by default this includes the bundle file, and assets from the bundler  -->
+    <BundleContent Condition=" '$(BundleContent)' == '' and '$(BundleContentRoot)' != '' ">$(BundleContentRoot)\**\*</BundleContent>
+
+    <!-- The name of the JS bundle assert to be placed in $(BundleOutputPath)-->
+    <BundleAssetName Condition="'$(BundleAssetName)' == ''">index.windows.bundle</BundleAssetName>
+
+    <!-- Where should be final JS bundle be written to -->
+    <BundleOutputPath Condition="'$(BundleOutputPath)' == ''">$([MSBuild]::NormalizeDirectory('$(ProjectDir)\Bundle'))</BundleOutputPath>
+
+    <!-- Should the bundle created be a dev bundle -->
     <UseDevBundle Condition="'$(UseDevBundle)' == '' and '$(Configuration)' == 'Debug'">true</UseDevBundle>
     <UseDevBundle Condition="'$(UseDevBundle)' == '' and '$(Configuration)' != 'Debug'">false</UseDevBundle>
+
+    <!-- Extra arguments to pass to the bundler command -->
+    <BundlerExtraArgs Condition="'$(BundlerExtraArgs)' == ''"></BundlerExtraArgs>
+
+    <!-- Command to use to create a bundle -->
+    <BundleCliCommand Condition="'$(BundleCliCommand)' == ''">npx --no-install react-native bundle</BundleCliCommand>
+
+    <!-- This should be the app package root, this is where the bundle command will be run from -->
+    <BundleCommandWorkingDir Condition="'$(BundleCommandWorkingDir)' == ''">$([System.IO.Path]::GetDirectoryName('$([System.IO.Path]::GetDirectoryName('$(ProjectDir)'))'))</BundleCommandWorkingDir>
+
+    <!-- Entry file of the JS bundle. Defaults to use index.windows.js if it exists, otherwise index.js -->
+    <BundleEntryFile Condition="'$(BundleEntryFile)' == '' and Exists('$(BundleCommandWorkingDir)\index.windows.js')">index.windows.js</BundleEntryFile>
     <BundleEntryFile Condition="'$(BundleEntryFile)' == ''">index.js</BundleEntryFile>
-    <BundleOutputPath Condition="'$(BundleOutputPath)' == ''">Bundle/index.windows.bundle</BundleOutputPath>
-    <BundleCommand Condition="'$(BundleCommand)' == ''">
-      npx --no-install react-native bundle --platform windows --entry-file $(BundleEntryFile) --bundle-output $(BundleOutputPath) --assets-dest $(BundleContentRoot) --dev $(UseDevBundle)
-    </BundleCommand>
+
+    <!-- Optional config file for the bundle command (metro will use metro.config.js by default) -->
+    <BundleConfigFile Condition="'$(BundleConfigFile)' == ''"></BundleConfigFile>
+
+    <!-- Location where source map file for the JS bundle will be created -->
+    <BundleSourceMapDir Condition="'$(BundleSourceMapDir)' == ''">$([MSBuild]::NormalizeDirectory('$(ProjectDir)\$(OutDir)\sourcemaps\react'))</BundleSourceMapDir>
+
   </PropertyGroup>
 
   <PropertyGroup>

From 3a4a926a47e5bf550815f322dcd9e143f708387f Mon Sep 17 00:00:00 2001
From: "Andrew Coates (REDMOND)" <acoates@microsoft.com>
Date: Mon, 20 Apr 2020 10:49:06 -0700
Subject: [PATCH 6/8] Fix playground app

---
 packages/playground/windows/.gitignore                    | 1 +
 packages/playground/windows/playground/Bundle/.gitignore  | 2 --
 packages/playground/windows/playground/Playground.vcxproj | 8 +-------
 vnext/PropertySheets/Bundle.Common.targets                | 6 +++---
 vnext/PropertySheets/Bundle.props                         | 6 +++---
 vnext/local-cli/generator-windows/index.js                | 2 +-
 vnext/local-cli/generator-windows/templates/b_gitignore   | 3 +--
 7 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 packages/playground/windows/playground/Bundle/.gitignore

diff --git a/packages/playground/windows/.gitignore b/packages/playground/windows/.gitignore
index 4ea0c7b5a35..cdb229b3b3a 100644
--- a/packages/playground/windows/.gitignore
+++ b/packages/playground/windows/.gitignore
@@ -90,3 +90,4 @@ packages/
 #Files generated by the VS build
 **/Generated Files/**
 
+playground/Bundle
diff --git a/packages/playground/windows/playground/Bundle/.gitignore b/packages/playground/windows/playground/Bundle/.gitignore
deleted file mode 100644
index d6b7ef32c84..00000000000
--- a/packages/playground/windows/playground/Bundle/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/packages/playground/windows/playground/Playground.vcxproj b/packages/playground/windows/playground/Playground.vcxproj
index 38ff4b1c507..b4f37c4a9e6 100644
--- a/packages/playground/windows/playground/Playground.vcxproj
+++ b/packages/playground/windows/playground/Playground.vcxproj
@@ -171,12 +171,10 @@
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
   <PropertyGroup>
     <BundleEntryFile>Samples/rntester.tsx</BundleEntryFile>
-    <BundleOutputPath>Bundle/Samples/rntester.bundle</BundleOutputPath>
-    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
   </PropertyGroup>
-  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
@@ -190,8 +188,4 @@
     <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets'))" />
   </Target>
-    <Target Name="EnsureBundleDir" BeforeTargets="MakeBundle" 
-      Condition="'$(UseBundle)' == 'true'">
-        <MakeDir Directories="Bundle\Samples" Condition="!Exists('Bundle\Samples')"/>
-    </Target>
 </Project>
\ No newline at end of file
diff --git a/vnext/PropertySheets/Bundle.Common.targets b/vnext/PropertySheets/Bundle.Common.targets
index 50af12830cb..c3f08007f8b 100644
--- a/vnext/PropertySheets/Bundle.Common.targets
+++ b/vnext/PropertySheets/Bundle.Common.targets
@@ -7,9 +7,9 @@
   <Target Name="MakeBundle" BeforeTargets="PrepareForBuild" 
       Condition="'$(UseBundle)' == 'true'">
         <MakeDir Directories="$(BundleContentRoot)" Condition=" !Exists('$(BundleContentRoot)') and '$(BundleContentRoot)' != '' " />
-        <MakeDir Directories="$(BundleSourceMapDir)" Condition=" !Exists('$(BundleSourceMapDir)') and '$(BundleSourceMapDir)' != '' " />
-        <Message Importance="High" Text="Running [$(BundleCliCommand) --platform windows --entry-file $(BundleEntryFile) --bundle-output $([MSBuild]::NormalizeDirectory('$(BundleOutputPath)\$(BundleAssetName)')) --assets-dest $(BundleContentRoot) --dev $(UseDevBundle) --reset-cache --sourcemap-output $([MSBuild]::NormalizeDirectory('$(BundleSourceMapDir)\$(BundleAssetName).map')) $(BundlerExtraArgs)] to build bundle file." />
+        <MakeDir Directories="$([MSBuild]::MakeRelative($(ProjectDir), $(BundleSourceMapDir)))" Condition=" !Exists('$([MSBuild]::MakeRelative($(ProjectDir), $(BundleSourceMapDir)))') and '$(BundleSourceMapDir)' != '' " />
+        <Message Importance="High" Text="Running [$(BundleCliCommand) --platform windows --entry-file $(BundleEntryFile) --bundle-output $([MSBuild]::NormalizePath('$(BundleOutputPath)\$(BundleAssetName)')) --assets-dest $(BundleContentRoot) --dev $(UseDevBundle) --reset-cache --sourcemap-output $([MSBuild]::MakeRelative($(BundleCommandWorkingDir), $([MSBuild]::NormalizePath('$(BundleSourceMapDir)\$(BundleAssetName).map')))) $(BundlerExtraArgs)] to build bundle file." />
         <!-- Hermes will need more code here to build source maps (Call to node_modules/react-native/scripts/compose-source-maps.js) -->
-        <Exec Command="$(BundleCliCommand) --platform windows --entry-file $(BundleEntryFile) --bundle-output $([MSBuild]::NormalizeDirectory('$(BundleOutputPath)\$(BundleAssetName)')) --assets-dest $(BundleContentRoot) --dev $(UseDevBundle) --reset-cache --sourcemap-output $([MSBuild]::NormalizeDirectory('$(BundleSourceMapDir)\$(BundleAssetName).map')) $(BundlerExtraArgs)" ConsoleToMSBuild="true" WorkingDirectory="$(BundleCommandWorkingDir)" />
+        <Exec Command="$(BundleCliCommand) --platform windows --entry-file $(BundleEntryFile) --bundle-output $([MSBuild]::NormalizePath('$(BundleOutputPath)\$(BundleAssetName)')) --assets-dest $(BundleContentRoot) --dev $(UseDevBundle) --reset-cache --sourcemap-output $([MSBuild]::MakeRelative($(BundleCommandWorkingDir), $([MSBuild]::NormalizePath('$(BundleSourceMapDir)\$(BundleAssetName).map')))) $(BundlerExtraArgs)" ConsoleToMSBuild="true" WorkingDirectory="$(BundleCommandWorkingDir)" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/vnext/PropertySheets/Bundle.props b/vnext/PropertySheets/Bundle.props
index 1593ff8ca35..ab0a3c87ef2 100644
--- a/vnext/PropertySheets/Bundle.props
+++ b/vnext/PropertySheets/Bundle.props
@@ -15,7 +15,7 @@
     <UseBundle Condition=" '$(Configuration)' == 'Release' and '$(UseBundle)' == '' ">true</UseBundle>
 
     <!-- Root directory where bundle assets will be copied to, be sure to update BundleContent if you change this -->
-    <BundleContentRoot Condition=" '$(BundleContentRoot)' == '' ">$([MSBuild]::NormalizeDirectory('$(ProjectDir)\Bundle'))</BundleContentRoot>
+    <BundleContentRoot Condition=" '$(BundleContentRoot)' == '' ">$([MSBuild]::NormalizePath('$(ProjectDir)\Bundle'))</BundleContentRoot>
 
     <!-- Files included in BundleContent will be included in the application install - by default this includes the bundle file, and assets from the bundler  -->
     <BundleContent Condition=" '$(BundleContent)' == '' and '$(BundleContentRoot)' != '' ">$(BundleContentRoot)\**\*</BundleContent>
@@ -24,7 +24,7 @@
     <BundleAssetName Condition="'$(BundleAssetName)' == ''">index.windows.bundle</BundleAssetName>
 
     <!-- Where should be final JS bundle be written to -->
-    <BundleOutputPath Condition="'$(BundleOutputPath)' == ''">$([MSBuild]::NormalizeDirectory('$(ProjectDir)\Bundle'))</BundleOutputPath>
+    <BundleOutputPath Condition="'$(BundleOutputPath)' == ''">$([MSBuild]::NormalizePath('$(ProjectDir)\Bundle'))</BundleOutputPath>
 
     <!-- Should the bundle created be a dev bundle -->
     <UseDevBundle Condition="'$(UseDevBundle)' == '' and '$(Configuration)' == 'Debug'">true</UseDevBundle>
@@ -47,7 +47,7 @@
     <BundleConfigFile Condition="'$(BundleConfigFile)' == ''"></BundleConfigFile>
 
     <!-- Location where source map file for the JS bundle will be created -->
-    <BundleSourceMapDir Condition="'$(BundleSourceMapDir)' == ''">$([MSBuild]::NormalizeDirectory('$(ProjectDir)\$(OutDir)\sourcemaps\react'))</BundleSourceMapDir>
+    <BundleSourceMapDir Condition="'$(BundleSourceMapDir)' == ''">$(OutDir)\sourcemaps\react</BundleSourceMapDir>
 
   </PropertyGroup>
 
diff --git a/vnext/local-cli/generator-windows/index.js b/vnext/local-cli/generator-windows/index.js
index c59293bd56a..bd13b645fc4 100644
--- a/vnext/local-cli/generator-windows/index.js
+++ b/vnext/local-cli/generator-windows/index.js
@@ -97,7 +97,7 @@ function copyProjectTemplateAndReplace(
   [
     { from: path.join(srcRootPath, 'metro.config.js'), to: 'metro.config.js' },
     { from: path.join(srcRootPath, '_gitignore'), to: path.join(windowsDir, '.gitignore') },
-    { from: path.join(srcRootPath, 'b_gitignore'), to: path.join(windowsDir, newProjectName, bundleDir, '.gitignore') },
+    { from: path.join(srcRootPath, 'b_gitignore'), to: path.join(windowsDir, newProjectName, '.gitignore') },
     { from: path.join(srcRootPath, 'index.windows.bundle'), to: path.join(windowsDir, newProjectName, bundleDir, 'index.windows.bundle') },
     { from: path.join(srcPath, projDir, 'MyApp.sln'), to: path.join(windowsDir, newProjectName + '.sln') },
   ].forEach((mapping) => copyAndReplaceWithChangedCallback(mapping.from, destPath, mapping.to, templateVars, options.overwrite));
diff --git a/vnext/local-cli/generator-windows/templates/b_gitignore b/vnext/local-cli/generator-windows/templates/b_gitignore
index d6b7ef32c84..917243bd7ae 100644
--- a/vnext/local-cli/generator-windows/templates/b_gitignore
+++ b/vnext/local-cli/generator-windows/templates/b_gitignore
@@ -1,2 +1 @@
-*
-!.gitignore
+/Bundle

From a1e466ae2a8bbd707f854f631d1df7a1f77373a8 Mon Sep 17 00:00:00 2001
From: "Andrew Coates (REDMOND)" <acoates@microsoft.com>
Date: Mon, 20 Apr 2020 12:57:30 -0700
Subject: [PATCH 7/8] minor change

---
 vnext/PropertySheets/Bundle.Cpp.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vnext/PropertySheets/Bundle.Cpp.targets b/vnext/PropertySheets/Bundle.Cpp.targets
index 1ad7e09acf6..ef11a97b368 100644
--- a/vnext/PropertySheets/Bundle.Cpp.targets
+++ b/vnext/PropertySheets/Bundle.Cpp.targets
@@ -10,7 +10,7 @@
     <ItemGroup Condition="'$(UseBundle)' == 'true' and '$(BundleContent)' != '' and '$(BundleContentRoot)' != '' ">
       <BundleContentToBePackaged Include="$(BundleContent)" />
       <None Include="@(BundleContentToBePackaged)">
-        <Link>$(BundleContentRoot)\%(RecursiveDir)%(Filename)%(Extension)</Link>
+        <Link>$([MSBuild]::MakeRelative($(ProjectDir),'$(BundleContentRoot)\%(RecursiveDir)%(Filename)%(Extension)'))</Link>
         <DeploymentContent>true</DeploymentContent>
       </None>
    </ItemGroup>

From 3abe545ce74ae7f948d4c6f150469b2e62b57de3 Mon Sep 17 00:00:00 2001
From: "Andrew Coates (REDMOND)" <acoates@microsoft.com>
Date: Mon, 20 Apr 2020 14:46:39 -0700
Subject: [PATCH 8/8] Change how we find the packageroot

---
 .../windows/SampleAppCS/SampleAppCS.csproj                      | 2 +-
 vnext/PropertySheets/Bundle.props                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj
index f684575e3ec..39da02a581d 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj
@@ -174,9 +174,9 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
     <VisualStudioVersion>16.0</VisualStudioVersion>
   </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/vnext/PropertySheets/Bundle.props b/vnext/PropertySheets/Bundle.props
index ab0a3c87ef2..883379ace3d 100644
--- a/vnext/PropertySheets/Bundle.props
+++ b/vnext/PropertySheets/Bundle.props
@@ -37,7 +37,7 @@
     <BundleCliCommand Condition="'$(BundleCliCommand)' == ''">npx --no-install react-native bundle</BundleCliCommand>
 
     <!-- This should be the app package root, this is where the bundle command will be run from -->
-    <BundleCommandWorkingDir Condition="'$(BundleCommandWorkingDir)' == ''">$([System.IO.Path]::GetDirectoryName('$([System.IO.Path]::GetDirectoryName('$(ProjectDir)'))'))</BundleCommandWorkingDir>
+    <BundleCommandWorkingDir Condition="'$(BundleCommandWorkingDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(ProjectDir), 'package.json'))</BundleCommandWorkingDir>
 
     <!-- Entry file of the JS bundle. Defaults to use index.windows.js if it exists, otherwise index.js -->
     <BundleEntryFile Condition="'$(BundleEntryFile)' == '' and Exists('$(BundleCommandWorkingDir)\index.windows.js')">index.windows.js</BundleEntryFile>