Skip to content

Commit

Permalink
fix: Override WasmPWAManifestFile properly
Browse files Browse the repository at this point in the history
(cherry picked from commit 0960586)
  • Loading branch information
ebariche authored and mergify[bot] committed Jul 16, 2024
1 parent 862cb24 commit a129f06
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
9 changes: 5 additions & 4 deletions src/.nuspec/Uno.Resizetizer.targets
Original file line number Diff line number Diff line change
Expand Up @@ -507,15 +507,16 @@
<_UnoResizetizerCollectedImages Condition="'@(CopiedResources)' == ''" Include="$(_UnoIntermediateImages)**\*"/>
<_UnoResizetizerCollectedAppIcons Include="$(_UnoIntermediateAppIcon)**\*"/>

<!-- If the PWA manifest is empty we can try to find it on the disk -->
<_UnoUnoResizetizerPwaManifestItemGroup Condition="'$(UnoResizetizerPwaManifest)' ==''" Include="$(_UnoIntermediateAppIcon)**\*.json"/>
<!-- If the AppIcon property is empty we can try to find it on the disk -->
<_AppIconItemGroup Condition="'$(AppIconPath)' == ''" Include="$(_UnoResizetizerIntermediateOutputRoot)**\*.ico"/>
</ItemGroup>

<PropertyGroup>
<!-- If the PWA manifest is empty we can try to find it on the disk -->
<UnoResizetizerPwaManifest Condition="'$(UnoResizetizerPwaManifest)' ==''">%(_UnoUnoResizetizerPwaManifestItemGroup.FullPath)</UnoResizetizerPwaManifest>
<!-- If the PWA manifest is empty we can try to find it on disk -->
<_UnoResizetizerPwaManifest>$(_UnoIntermediateAppIcon)..\$([System.IO.Path]::GetFileName($(WasmPWAManifestFile)))</_UnoResizetizerPwaManifest>
<UnoResizetizerPwaManifest Condition="
'$(UnoResizetizerPwaManifest)'=='' and
Exists('$(_UnoResizetizerPwaManifest)')">$(_UnoResizetizerPwaManifest)</UnoResizetizerPwaManifest>
<!-- If the AppIcon property is empty we can try to find it on the disk -->
<AppIconPath Condition="'$(AppIconPath)' == ''">%(_AppIconItemGroup.Identity)</AppIconPath>
</PropertyGroup>
Expand Down
13 changes: 4 additions & 9 deletions src/.nuspec/Uno.Resizetizer.wasm.targets
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@
Condition="'$(DesignTimeBuild)' != 'true'">

<!-- Wasm -->
<PropertyGroup>
<WasmPWAManifestFile Condition="'$(UnoResizetizerPwaManifest)'!=''">$(UnoResizetizerPwaManifest)</WasmPWAManifestFile>
</PropertyGroup>

<ItemGroup>
<Content Include="@(_UnoResizetizerCollectedImages->FullPath())"
Link="%(_UnoResizetizerCollectedImages.RecursiveDir)%(_UnoResizetizerCollectedImages.Filename)%(_UnoResizetizerCollectedImages.Extension)">
Expand All @@ -64,14 +68,5 @@

<FileWrites Include="@(_UnoResizetizerCollectedImages)"/>
</ItemGroup>

<ItemGroup Condition="'$(UnoResizetizerPwaManifest)' != ''">
<Content Remove="$(WasmPWAManifestFile)"/>
<Content Include="$(UnoResizetizerPwaManifest)"
CopyToOutputDirectory="PreserveNewest"
ExcludeFromSingleFile="True"
CopyToPublishDirectory="PreserveNewest"
Link="$(WasmPWAManifestFile)"/>
</ItemGroup>
</Target>
</Project>

0 comments on commit a129f06

Please sign in to comment.