Skip to content

Commit ddaeb6b

Browse files
authored
fix: Add support for merging files in heads (#17)
1 parent a78dae5 commit ddaeb6b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ Then select the resource dictionaries to be merged:
2828
</ItemGroup>
2929
```
3030

31-
Then add the following block at the end your project library:
31+
Then add the following block at the end your project library or app:
3232

3333
```xml
3434
<Import Project="$(NuGetPackageRoot)uno.xamlmerge.task\$(_Uno_XamlMerge_Task_Version)\build\Uno.XamlMerge.Task.targets"
35-
Condition="'$(TargetFramework)' == '' and exists('$(NuGetPackageRoot)\uno.xamlmerge.task\$(_Uno_XamlMerge_Task_Version)')" />
35+
Condition="'$(TargetFramework)' == '' and '$(TargetFrameworks)'!='' and exists('$(NuGetPackageRoot)\uno.xamlmerge.task\$(_Uno_XamlMerge_Task_Version)')" />
3636
```
3737

3838
The generated file is called `Generated\mergedpages.xaml` by default, but can be overriden as follows:

src/Uno.XamlMerge.Task/build/Uno.XamlMerge.Task.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<Target Name="GenerateMergedXaml"
12-
BeforeTargets="_ComputeTargetFrameworkItems" Condition="'$(TargetFramework)' == ''">
12+
BeforeTargets="_ComputeTargetFrameworkItems;BeforeBuild" Condition="'$(TargetFramework)' == '' or '$(TargetFrameworks)'==''">
1313
<ItemGroup>
1414
<_FilteredXamlMergeInput
1515
Include="@(XamlMergeInput)"

0 commit comments

Comments
 (0)