Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
May 22, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7ef898
Fix deploy issue causing 2nd+ builds to break due to bug in appxrecip…
asklar May 21, 2020
3c54335
Change files
asklar May 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions change/react-native-windows-2020-05-21-16-35-04-doubleBuild.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 2 additions & 2 deletions vnext/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpApp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
5 changes: 2 additions & 3 deletions vnext/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
2 changes: 1 addition & 1 deletion vnext/local-cli/runWindows/utils/deploy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ async function deployToDesktop(options, verbose, slnFile) {
slnFile,
options.release ? 'Release' : 'Debug',
options.arch,
null,
asklar marked this conversation as resolved.
Show resolved Hide resolved
{DeployLayout: true},
options.verbose,
'Deploy',
);
Expand Down