From 703f7d4f116abbb7d40d74681f40e9d8d0a036ce Mon Sep 17 00:00:00 2001
From: CanHua Li <licanhua@live.com>
Date: Mon, 30 Dec 2019 12:15:59 -0800
Subject: [PATCH 1/3] add InjectBundleContent target

---
 .ado/templates/e2e-test-job.yml         |  8 +-------
 vnext/PropertySheets/Bundle.Cpp.targets | 16 ++++++++++------
 vnext/PropertySheets/Bundle.targets     | 12 +++++++-----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.ado/templates/e2e-test-job.yml b/.ado/templates/e2e-test-job.yml
index b6e61d42af7..4088abd50fc 100644
--- a/.ado/templates/e2e-test-job.yml
+++ b/.ado/templates/e2e-test-job.yml
@@ -40,13 +40,7 @@ jobs:
           command: restore
           restoreSolution: packages/E2ETest/windows/ReactUWPTestApp.sln
           verbosityRestore: Detailed # Options: quiet, normal, detailed
-
-      - task: CmdLine@2
-        displayName: Create bundle
-        inputs:
-          script: yarn run bundle
-          workingDirectory: packages/E2ETest
-          
+         
       - task: CmdLine@2
         displayName: run-windows
         inputs:
diff --git a/vnext/PropertySheets/Bundle.Cpp.targets b/vnext/PropertySheets/Bundle.Cpp.targets
index d4bb65f57e6..2112850329d 100644
--- a/vnext/PropertySheets/Bundle.Cpp.targets
+++ b/vnext/PropertySheets/Bundle.Cpp.targets
@@ -6,12 +6,16 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)\Bundle.Common.targets"/>
 
-  <ItemGroup Condition="'$(UseBundle)' == 'true' and '$(BundleContent)' != '' and '$(BundleContentRoot)' != '' ">
-    <None Include="$(BundleContent)">
-      <Link>$(BundleContentRoot)\%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-  </ItemGroup>
+  <Target Name="InjectBundleContent" BeforeTargets="PrepareForBuild" AfterTargets="MakeBundle">
+    <ItemGroup Condition="'$(UseBundle)' == 'true' and '$(BundleContent)' != '' and '$(BundleContentRoot)' != '' ">
+	    <BundleContentToBePackaged Include="$(BundleContent)" />
+      <None Include="@(BundleContentToBePackaged)">
+        <Link>$(BundleContentRoot)\%(RecursiveDir)%(Filename)%(Extension)</Link>
+        <DeploymentContent>true</DeploymentContent>
+      </None>
+   </ItemGroup>
+  </Target>
+
   <ItemDefinitionGroup Condition=" '$(UseBundle)' == 'true' ">
     <ClCompile>
       <PreprocessorDefinitions>BUNDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/vnext/PropertySheets/Bundle.targets b/vnext/PropertySheets/Bundle.targets
index b247466fdc5..b4a29033bb9 100644
--- a/vnext/PropertySheets/Bundle.targets
+++ b/vnext/PropertySheets/Bundle.targets
@@ -6,9 +6,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)\Bundle.Common.targets"/>
 
-  <ItemGroup Condition="'$(UseBundle)' == 'true' and '$(BundleContent)' != ''">
-    <Content Include="$(BundleContent)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
+  <Target Name="InjectBundleContent" BeforeTargets="PrepareForBuild" AfterTargets="MakeBundle">
+    <ItemGroup Condition="'$(UseBundle)' == 'true' and '$(BundleContent)' != ''">
+      <Content Include="$(BundleContent)">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file

From 71fcfb31aaa39e82debe5fb3603b8840e2df3b91 Mon Sep 17 00:00:00 2001
From: CanHua Li <licanhua@live.com>
Date: Mon, 30 Dec 2019 12:16:47 -0800
Subject: [PATCH 2/3] Change files

---
 ...ct-native-windows-2019-12-30-12-16-46-bundlecrash.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 change/react-native-windows-2019-12-30-12-16-46-bundlecrash.json

diff --git a/change/react-native-windows-2019-12-30-12-16-46-bundlecrash.json b/change/react-native-windows-2019-12-30-12-16-46-bundlecrash.json
new file mode 100644
index 00000000000..6919ae2d56c
--- /dev/null
+++ b/change/react-native-windows-2019-12-30-12-16-46-bundlecrash.json
@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Avoid app crash because content is not bundled for the first time",
+  "packageName": "react-native-windows",
+  "email": "licanhua@live.com",
+  "commit": "703f7d4f116abbb7d40d74681f40e9d8d0a036ce",
+  "date": "2019-12-30T20:16:46.912Z"
+}
\ No newline at end of file

From b55a631cc48c78d4c5b80431f2144e45f3d4851a Mon Sep 17 00:00:00 2001
From: CanHua Li <licanhua@live.com>
Date: Mon, 30 Dec 2019 12:23:18 -0800
Subject: [PATCH 3/3] format

---
 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 2112850329d..1ad7e09acf6 100644
--- a/vnext/PropertySheets/Bundle.Cpp.targets
+++ b/vnext/PropertySheets/Bundle.Cpp.targets
@@ -8,7 +8,7 @@
 
   <Target Name="InjectBundleContent" BeforeTargets="PrepareForBuild" AfterTargets="MakeBundle">
     <ItemGroup Condition="'$(UseBundle)' == 'true' and '$(BundleContent)' != '' and '$(BundleContentRoot)' != '' ">
-	    <BundleContentToBePackaged Include="$(BundleContent)" />
+      <BundleContentToBePackaged Include="$(BundleContent)" />
       <None Include="@(BundleContentToBePackaged)">
         <Link>$(BundleContentRoot)\%(RecursiveDir)%(Filename)%(Extension)</Link>
         <DeploymentContent>true</DeploymentContent>