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

Jump to bottom

Fix Window Icon Extensions #137

Merged
merged 3 commits into from
May 17, 2023
Merged

Fix Window Icon Extensions #137

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
fea9e4b
fix: ensure target runs before xamlprecompile
dansiegel May 17, 2023
e30f134
chore: normalize white space
dansiegel May 17, 2023
b29d654
fix: Correct build issue with
nickrandolph May 17, 2023
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
7 changes: 7 additions & 0 deletions samples/NewTemplate/Resizetizer.Extensions.Sample.Base/AppHead.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using Microsoft.Extensions.Logging;
using Microsoft.UI.Xaml;
using Uno.Resizetizer;

namespace Resizetizer.Extensions.Sample;

Expand All @@ -18,6 +19,12 @@ public AppHead()
this.InitializeComponent();
}

protected override void OnLaunched(LaunchActivatedEventArgs args)
{
base.OnLaunched(args);
_window?.SetWindowIcon();
}

/// <summary>
/// Configures global Uno Platform logging
/// </summary>
Expand Down
32 changes: 20 additions & 12 deletions src/.nuspec/Uno.Resizetizer.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,10 +334,10 @@
</ItemGroup>
<ItemGroup>
<_SkiaManifest Include="@(EmbeddedResource)"
Condition="%(Extension) == '.appxmanifest'"/>
Condition="%(Extension) == '.appxmanifest'"/>

<EmbeddedResource Remove="@(EmbeddedResource)"
Condition="%(Extension) == '.appxmanifest'"/>
Condition="%(Extension) == '.appxmanifest'"/>
</ItemGroup>
</Target>

Expand Down Expand Up @@ -401,7 +401,7 @@
<ItemGroup Condition="$(_ResizetizerIsWasmApp) == 'True' And $(UserAppManifest) != ''">
<EmbeddedResource Remove="$(UserAppManifest)" />
<EmbeddedResource Include="$(_UnoIntermediateAppManifestWasm)"
Link="$(UserAppManifest)"/>
Link="$(UserAppManifest)"/>
</ItemGroup>

<!-- Android -->
Expand Down Expand Up @@ -653,14 +653,14 @@

<!--If there's no LogicalName, we use the default name-->
<EmbeddedResource Include="$(_UnoIntermediateManifest)Package.appxmanifest"
Link="%(_SkiaManifest.Link)"
LogicalName="Package.appxmanifest"
Condition="%(_SkiaManifest.LogicalName) == '' "/>
Link="%(_SkiaManifest.Link)"
LogicalName="Package.appxmanifest"
Condition="%(_SkiaManifest.LogicalName) == '' "/>

<EmbeddedResource Include="$(_UnoIntermediateManifest)Package.appxmanifest"
Link="%(_SkiaManifest.Link)"
LogicalName="%(_SkiaManifest.LogicalName)"
Condition="%(_SkiaManifest.LogicalName) != '' "/>
Link="%(_SkiaManifest.Link)"
LogicalName="%(_SkiaManifest.LogicalName)"
Condition="%(_SkiaManifest.LogicalName) != '' "/>

</ItemGroup>
<ItemGroup Condition="'@(_UnoAppxManifest)' != ''">
Expand All @@ -682,7 +682,8 @@
</Target>

<Target Name="_GenerateWindowUnoIconExtension"
BeforeTargets="Build;CoreCompile"
Condition="'$(_ResizetizerIsCompatibleApp)' == 'True'"
BeforeTargets="Build;CoreCompile;XamlPreCompile"
Inputs="@(UnoIcon)"
Outputs="@(_WindowIconExtension)">
<WindowIconGeneratorTask_v0
Expand All @@ -692,9 +693,16 @@
TaskParameter="GeneratedClass"/>
<Output ItemName="FilesWrite"
TaskParameter="GeneratedClass"/>
<Output ItemName="Compile"
TaskParameter="GeneratedClass"/>
</WindowIconGeneratorTask_v0>
</Target>

<Target Name="_AddResizetizerWindowIconExtensions"
Condition="'$(_ResizetizerIsCompatibleApp)' == 'True'"
AfterTargets="_GenerateWindowUnoIconExtension"
BeforeTargets="Build;CoreCompile;XamlPreCompile">
<ItemGroup Condition="Exists('@(_WindowIconExtension->FullPath())')">
<Compile Include="@(_WindowIconExtension)" />
</ItemGroup>
</Target>

</Project>