From fea9e4b04b901e3fa03636af4bc9e17940ca0950 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 16 May 2023 21:38:42 -0600
Subject: [PATCH 1/3] fix: ensure target runs before xamlprecompile

---
 .../AppHead.xaml.cs                                   |  7 +++++++
 src/.nuspec/Uno.Resizetizer.targets                   | 11 ++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/samples/NewTemplate/Resizetizer.Extensions.Sample.Base/AppHead.xaml.cs b/samples/NewTemplate/Resizetizer.Extensions.Sample.Base/AppHead.xaml.cs
index c179baf0..e120b836 100644
--- a/samples/NewTemplate/Resizetizer.Extensions.Sample.Base/AppHead.xaml.cs
+++ b/samples/NewTemplate/Resizetizer.Extensions.Sample.Base/AppHead.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml;
+using Uno.Resizetizer;
 
 namespace Resizetizer.Extensions.Sample;
 
@@ -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>
diff --git a/src/.nuspec/Uno.Resizetizer.targets b/src/.nuspec/Uno.Resizetizer.targets
index d66bc6e7..c1b80fbe 100644
--- a/src/.nuspec/Uno.Resizetizer.targets
+++ b/src/.nuspec/Uno.Resizetizer.targets
@@ -682,7 +682,6 @@
 	</Target>
 
 	<Target Name="_GenerateWindowUnoIconExtension"
-			BeforeTargets="Build;CoreCompile"
 			Inputs="@(UnoIcon)"
 			Outputs="@(_WindowIconExtension)">
 		<WindowIconGeneratorTask_v0
@@ -692,9 +691,15 @@
 				TaskParameter="GeneratedClass"/>
 			<Output ItemName="FilesWrite"
 				TaskParameter="GeneratedClass"/>
-			<Output ItemName="Compile"
-				TaskParameter="GeneratedClass"/>
 		</WindowIconGeneratorTask_v0>
 	</Target>
 
+	<Target Name="_AddResizetizerWindowIconExtensions"
+			AfterTargets="_GenerateWindowUnoIconExtension"
+			BeforeTargets="Build;CoreCompile;XamlPreCompile">
+		<ItemGroup Condition="Exists('$(_ResizetizerIntermediateOutputRoot)Uno.Resizetizer.WindowIconExtensions.g.cs')">
+			<Compile Include="$(_ResizetizerIntermediateOutputRoot)Uno.Resizetizer.WindowIconExtensions.g.cs" />
+		</ItemGroup>
+	</Target>
+
 </Project>

From e30f13482a53e29827afb135c9fe6408c17e06a8 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 16 May 2023 21:38:55 -0600
Subject: [PATCH 2/3] chore: normalize white space

---
 src/.nuspec/Uno.Resizetizer.targets | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/.nuspec/Uno.Resizetizer.targets b/src/.nuspec/Uno.Resizetizer.targets
index c1b80fbe..baa0d6db 100644
--- a/src/.nuspec/Uno.Resizetizer.targets
+++ b/src/.nuspec/Uno.Resizetizer.targets
@@ -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>
 
@@ -401,7 +401,7 @@
 		<ItemGroup Condition="$(_ResizetizerIsWasmApp) == 'True' And $(UserAppManifest) != ''">
 			<EmbeddedResource Remove="$(UserAppManifest)" />
 			<EmbeddedResource Include="$(_UnoIntermediateAppManifestWasm)"
-							  Link="$(UserAppManifest)"/>
+								Link="$(UserAppManifest)"/>
 		</ItemGroup>
 
 		<!-- Android -->
@@ -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)' != ''">

From b29d65497aa46141109e9f1d02ff3734bf06f9fe Mon Sep 17 00:00:00 2001
From: Nick Randolph <nick@builttoroam.com>
Date: Wed, 17 May 2023 14:52:16 +1000
Subject: [PATCH 3/3] fix: Correct build issue with

---
 src/.nuspec/Uno.Resizetizer.targets | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/.nuspec/Uno.Resizetizer.targets b/src/.nuspec/Uno.Resizetizer.targets
index baa0d6db..db18cddf 100644
--- a/src/.nuspec/Uno.Resizetizer.targets
+++ b/src/.nuspec/Uno.Resizetizer.targets
@@ -682,6 +682,8 @@
 	</Target>
 
 	<Target Name="_GenerateWindowUnoIconExtension"
+			Condition="'$(_ResizetizerIsCompatibleApp)' == 'True'"
+			BeforeTargets="Build;CoreCompile;XamlPreCompile"
 			Inputs="@(UnoIcon)"
 			Outputs="@(_WindowIconExtension)">
 		<WindowIconGeneratorTask_v0
@@ -695,10 +697,11 @@
 	</Target>
 
 	<Target Name="_AddResizetizerWindowIconExtensions"
+			Condition="'$(_ResizetizerIsCompatibleApp)' == 'True'"
 			AfterTargets="_GenerateWindowUnoIconExtension"
 			BeforeTargets="Build;CoreCompile;XamlPreCompile">
-		<ItemGroup Condition="Exists('$(_ResizetizerIntermediateOutputRoot)Uno.Resizetizer.WindowIconExtensions.g.cs')">
-			<Compile Include="$(_ResizetizerIntermediateOutputRoot)Uno.Resizetizer.WindowIconExtensions.g.cs" />
+		<ItemGroup Condition="Exists('@(_WindowIconExtension->FullPath())')">
+			<Compile Include="@(_WindowIconExtension)" />
 		</ItemGroup>
 	</Target>