App projects only builds from clean (i.e. the first time only) (#4983)

* Fix deploy issue causing 2nd+ builds to break due to bug in appxrecipe which gets imported * Change files
microsoft · May 22, 2020 · cd9206e · cd9206e
1 parent ed7ee2d
commit cd9206e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/change/react-native-windows-2020-05-21-16-35-04-doubleBuild.json b/change/react-native-windows-2020-05-21-16-35-04-doubleBuild.json
@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Fix deploy issue causing 2nd+ builds to break due to bug in appxrecipe which gets imported",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2020-05-21T23:35:04.220Z"
+}
diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpApp.targets b/vnext/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpApp.targets
@@ -21,8 +21,8 @@
   <Import Project="$(ProjectDir)\AutolinkedNativeModules.g.targets" Condition="Exists('$(ProjectDir)\AutolinkedNativeModules.g.targets')" />
 
   <Import Project="$(MSBuildProjectDirectory)\$(OutputPath)\$(AssemblyName).Build.appxrecipe"  
-          Condition="Exists('$(MSBuildProjectDirectory)\$(OutputPath)\$(AssemblyName).Build.appxrecipe')" />
-  <Target Name="Deploy">
+          Condition="Exists('$(MSBuildProjectDirectory)\$(OutputPath)\$(AssemblyName).Build.appxrecipe') And '$(DeployLayout)'=='true'" />
+  <Target Name="Deploy" Condition="'$(DeployLayout)'=='true'">
     <Error Condition="!Exists('$(MSBuildProjectDirectory)\$(OutputPath)\$(AssemblyName).Build.appxrecipe')" 
            Text="You must first build the project before deploying it" />
     <Copy SourceFiles="%(AppxPackagedFile.Identity)" 

diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.targets b/vnext/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.targets
@@ -16,9 +16,8 @@
   <Import Project="$(ProjectDir)\AutolinkedNativeModules.g.targets" Condition="Exists('$(ProjectDir)\AutolinkedNativeModules.g.targets')" />
 
   <Import Project="$(OutputPath)\$(AssemblyName).Build.appxrecipe"  
-          Condition="Exists('$(OutputPath)\$(AssemblyName).Build.appxrecipe')" />
-  <Target Name="Deploy">
-    <Message Text="OutputPath=$(OutputPath)" /> 
+          Condition="Exists('$(OutputPath)\$(AssemblyName).Build.appxrecipe') And '$(DeployLayout)'=='true'" />
+  <Target Name="Deploy" Condition="'$(DeployLayout)'=='true'">
     <Error Condition="!Exists('$(OutputPath)\$(AssemblyName).Build.appxrecipe')" 
            Text="You must first build the project before deploying it" />
     <Copy SourceFiles="%(AppxPackagedFile.Identity)" 

diff --git a/vnext/local-cli/runWindows/utils/deploy.js b/vnext/local-cli/runWindows/utils/deploy.js
@@ -258,7 +258,7 @@ async function deployToDesktop(options, verbose, slnFile) {
       slnFile,
       options.release ? 'Release' : 'Debug',
       options.arch,
-      null,
+      {DeployLayout: true},
       options.verbose,
       'Deploy',
     );