Skip to content

Add InjectBundleContent target #3821

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

Merged
licanhua merged 3 commits into from
Dec 30, 2019
Merged

Add InjectBundleContent target #3821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
703f7d4
add InjectBundleContent target
licanhua Dec 30, 2019
71fcfb3
Change files
licanhua Dec 30, 2019
b55a631
format
licanhua Dec 30, 2019
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: 1 addition & 7 deletions .ado/templates/e2e-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 8 additions & 0 deletions change/react-native-windows-2019-12-30-12-16-46-bundlecrash.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "Avoid app crash because content is not bundled for the first time",
"packageName": "react-native-windows",
"email": "[email protected]",
"commit": "703f7d4f116abbb7d40d74681f40e9d8d0a036ce",
"date": "2019-12-30T20:16:46.912Z"
}
16 changes: 10 additions & 6 deletions vnext/PropertySheets/Bundle.Cpp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 7 additions & 5 deletions vnext/PropertySheets/Bundle.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>