Add configurable ResizeQuality for Resizetizer

src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs

@@ -32,7 +32,7 @@ namespace Microsoft.Maui.DeviceTests
 	[Trait(RendererHandlerVariant.TraitName, RendererHandlerVariant.AndroidShellRenderer)] // See RendererHandlerVariant.cs
 	public partial class ModalTests : ControlsHandlerTestBase
 	{
-		void SetupBuilder(bool includeNavigationViewHandler = true)
+		protected virtual void SetupBuilder(bool includeNavigationViewHandler = true)
 		{
 			EnsureHandlerCreated(builder =>
 			{

src/Controls/tests/DeviceTests/Elements/Shell/ShellHandlerSubclasses.Android.cs

@@ -99,7 +99,7 @@ MaterialToolbar GetShellHandlerToolbar(IElementHandler handler)
 	[Trait(RendererHandlerVariant.TraitName, RendererHandlerVariant.AndroidShellHandler)] // See RendererHandlerVariant.cs
 	public partial class ModalHandlerTests : ModalTests
 	{
-		protected override void SetupBuilder()
+		protected override void SetupBuilder(bool includeNavigationViewHandler = true)
 		{
 			EnsureHandlerCreated(builder =>
 			{

src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.iOS.cs

@@ -7,6 +7,7 @@
 using Microsoft.Maui.Controls.Handlers.Compatibility;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Hosting;
 using Microsoft.Maui.Platform;
 using Microsoft.Maui.DeviceTests.Stubs;
 using UIKit;

src/Maui.InTree.props

@@ -1,10 +1,15 @@
 <Project>
 
-  <ImportGroup Condition="Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.Build.Tasks.dll') and Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.dll')">
+  <PropertyGroup>
+    <_MauiCoreBuildTasksProps>$(_MauiBuildTasksLocation)Microsoft.Maui.Core.props</_MauiCoreBuildTasksProps>
+    <_MauiCoreBuildTasksProps Condition="'$(_MauiTargetPlatformIsWindows)' == 'true'">$(_MauiBuildTasksLocation)net$(_MauiMinimumSupportedDotNetTfm)-windows$(MinimumWindowsTargetFrameworkVersion)\Microsoft.Maui.Core.props</_MauiCoreBuildTasksProps>
+    <_MauiBuildTasksPropsReady Condition="Exists('$(_MauiCoreBuildTasksProps)') and Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.Build.Tasks.dll') and Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.dll')">true</_MauiBuildTasksPropsReady>
+  </PropertyGroup>
+
+  <ImportGroup Condition="'$(_MauiBuildTasksPropsReady)' == 'true'">
 
     <!-- Microsoft.Maui.Core.props -->
-    <Import Project="$(_MauiBuildTasksLocation)net$(_MauiMinimumSupportedDotNetTfm)-windows$(MinimumWindowsTargetFrameworkVersion)\Microsoft.Maui.Core.props" Condition="'$(_MauiTargetPlatformIsWindows)' == 'true'" />
-    <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Core.props" Condition="'$(_MauiTargetPlatformIsWindows)' != 'true'" />
+    <Import Project="$(_MauiCoreBuildTasksProps)" />
 
     <!-- Microsoft.Maui.Controls.Build.Tasks.props -->
     <Import Project="$(_MauiBuildTasksLocation)net6.0-ios10.0\Microsoft.Maui.Controls.Build.Tasks.props" Condition="'$(_MauiTargetPlatformIsiOS)' == 'true'" />

src/Maui.InTree.targets

@@ -10,14 +10,19 @@
 
   <ItemGroup>
     <ProjectCapability Include="MauiRepository" />
-    <ProjectCapability Include="MauiRepositorySampleProject" Contition="'$(SampleProject)' == 'true'" />
+    <ProjectCapability Include="MauiRepositorySampleProject" Condition="'$(SampleProject)' == 'true'" />
   </ItemGroup>
 
-  <ImportGroup Condition="Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.Build.Tasks.dll') and Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.dll')">
+  <PropertyGroup>
+    <_MauiCoreBuildTasksTargets>$(_MauiBuildTasksLocation)Microsoft.Maui.Core.targets</_MauiCoreBuildTasksTargets>
+    <_MauiCoreBuildTasksTargets Condition="'$(_MauiTargetPlatformIsWindows)' == 'true'">$(_MauiBuildTasksLocation)net$(_MauiMinimumSupportedDotNetTfm)-windows$(MinimumWindowsTargetFrameworkVersion)\Microsoft.Maui.Core.targets</_MauiCoreBuildTasksTargets>
+    <_MauiBuildTasksTargetsReady Condition="Exists('$(_MauiCoreBuildTasksTargets)') and Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Core.After.targets') and Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.Build.Tasks.dll') and Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.dll')">true</_MauiBuildTasksTargetsReady>
+  </PropertyGroup>
+
+  <ImportGroup Condition="'$(_MauiBuildTasksPropsReady)' == 'true' and '$(_MauiBuildTasksTargetsReady)' == 'true'">
 
     <!-- Microsoft.Maui.Core.targets -->
-    <Import Project="$(_MauiBuildTasksLocation)net$(_MauiMinimumSupportedDotNetTfm)-windows$(MinimumWindowsTargetFrameworkVersion)\Microsoft.Maui.Core.targets" Condition="'$(_MauiTargetPlatformIsWindows)' == 'true'" />
-    <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Core.targets" Condition="'$(_MauiTargetPlatformIsWindows)' != 'true'" />
+    <Import Project="$(_MauiCoreBuildTasksTargets)" />
 
     <!-- Microsoft.Maui.Controls.Build.Tasks.targets -->
     <Import Project="$(_MauiBuildTasksLocation)net6.0-ios10.0\Microsoft.Maui.Controls.Build.Tasks.targets" Condition="'$(_MauiTargetPlatformIsiOS)' == 'true'" />
@@ -31,7 +36,7 @@
   </ImportGroup>
 
   <Target Name="VerifyMauiBuildTasksBuilt" BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
-    <Error Condition="!Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.Build.Tasks.dll') or !Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.dll')"
+    <Error Condition="'$(_MauiBuildTasksPropsReady)' != 'true' or '$(_MauiBuildTasksTargetsReady)' != 'true'"
            Text="We have detected that the required MSBuild tasks are not yet built or they are out of date. (Expand to see more info) 
 You will need to exit Visual Studio and wait for it to completely close. 
 After the process has ended, run the build command on the CLI with the .NET MAUI repository as the working directory:

src/SingleProject/Resizetizer/src/AndroidAdaptiveIconGenerator.cs

@@ -7,18 +7,21 @@ namespace Microsoft.Maui.Resizetizer
 {
 	internal class AndroidAdaptiveIconGenerator
 	{
-		public AndroidAdaptiveIconGenerator(ResizeImageInfo info, string appIconName, string intermediateOutputPath, ILogger logger)
+		public AndroidAdaptiveIconGenerator(ResizeImageInfo info, string appIconName, string intermediateOutputPath, string inputsFile, ILogger logger)
 		{
 			Info = info;
 			Logger = logger;
 			IntermediateOutputPath = intermediateOutputPath;
 			AppIconName = appIconName;
+			InputsFile = inputsFile;
 		}
 
 		public ResizeImageInfo Info { get; }
 
 		public string IntermediateOutputPath { get; }
 
+		public string InputsFile { get; }
+
 		public ILogger Logger { get; private set; }
 
 		public string AppIconName { get; }
@@ -65,7 +68,7 @@ public IEnumerable<ResizedImageInfo> Generate()
 		void ProcessBackground(List<ResizedImageInfo> results, DirectoryInfo fullIntermediateOutputPath)
 		{
 			var backgroundFile = Info.Filename;
-			var (backgroundExists, backgroundModified) = Utils.FileExists(backgroundFile);
+			var (backgroundExists, _) = Utils.FileExists(backgroundFile);
 			var backgroundDestFilename = AppIconName + "_background.png";
 
 			if (backgroundExists)
@@ -77,12 +80,10 @@ void ProcessBackground(List<ResizedImageInfo> results, DirectoryInfo fullInterme
 			{
 				var dir = Path.Combine(fullIntermediateOutputPath.FullName, dpi.Path);
 				var destination = Path.Combine(dir, backgroundDestFilename);
-				var (destinationExists, destinationModified) = Utils.FileExists(destination);
 				Directory.CreateDirectory(dir);
 
-				if (destinationModified > backgroundModified)
+				if (Resizer.IsUpToDate(new[] { backgroundFile }, destination, InputsFile, Logger, backgroundFile))
 				{
-					Logger.Log($"Skipping `{backgroundFile}` => `{destination}` file is up to date.");
 					results.Add(new ResizedImageInfo { Dpi = dpi, Filename = destination });
 					continue;
 				}
@@ -92,7 +93,7 @@ void ProcessBackground(List<ResizedImageInfo> results, DirectoryInfo fullInterme
 				if (backgroundExists)
 				{
 					// resize the background
-					var tools = SkiaSharpTools.Create(Info.IsVector, Info.Filename, dpi.Size, Info.Color, null, Logger);
+					var tools = SkiaSharpTools.Create(Info.IsVector, Info.Filename, dpi.Size, Info.Color, null, Info.Quality, Logger);
 					tools.Resize(dpi, destination, dpiSizeIsAbsolute: true);
 				}
 				else
@@ -109,7 +110,7 @@ void ProcessBackground(List<ResizedImageInfo> results, DirectoryInfo fullInterme
 		void ProcessForeground(List<ResizedImageInfo> results, DirectoryInfo fullIntermediateOutputPath)
 		{
 			var foregroundFile = Info.ForegroundFilename;
-			var (foregroundExists, foregroundModified) = Utils.FileExists(foregroundFile);
+			var (foregroundExists, _) = Utils.FileExists(foregroundFile);
 			var foregroundDestFilename = AppIconName + "_foreground.png";
 
 			if (foregroundExists)
@@ -121,12 +122,10 @@ void ProcessForeground(List<ResizedImageInfo> results, DirectoryInfo fullInterme
 			{
 				var dir = Path.Combine(fullIntermediateOutputPath.FullName, dpi.Path);
 				var destination = Path.Combine(dir, foregroundDestFilename);
-				var (destinationExists, destinationModified) = Utils.FileExists(destination);
 				Directory.CreateDirectory(dir);
 
-				if (destinationModified > foregroundModified)
+				if (Resizer.IsUpToDate(new[] { foregroundFile }, destination, InputsFile, Logger, foregroundFile))
 				{
-					Logger.Log($"Skipping `{foregroundFile}` => `{destination}` file is up to date.");
 					results.Add(new ResizedImageInfo { Dpi = dpi, Filename = destination });
 					continue;
 				}
@@ -135,8 +134,8 @@ void ProcessForeground(List<ResizedImageInfo> results, DirectoryInfo fullInterme
 
 				if (foregroundExists)
 				{
-					// resize the forground
-					var tools = SkiaSharpTools.Create(Info.ForegroundIsVector, Info.ForegroundFilename, dpi.Size, null, Info.TintColor, Logger);
+					// resize the foreground
+					var tools = SkiaSharpTools.Create(Info.ForegroundIsVector, Info.ForegroundFilename, dpi.Size, null, Info.TintColor, Info.Quality, Logger);
 					tools.Resize(dpi, destination, Info.ForegroundScale, dpiSizeIsAbsolute: true);
 				}
 				else
@@ -153,7 +152,7 @@ void ProcessForeground(List<ResizedImageInfo> results, DirectoryInfo fullInterme
 		void ProcessMonochrome(List<ResizedImageInfo> results, DirectoryInfo fullIntermediateOutputPath)
 		{
 			var monochromeFile = Info.MonochromeFilename;
-			var (monochromeExists, monochromeModified) = Utils.FileExists(monochromeFile);
+			var (monochromeExists, _) = Utils.FileExists(monochromeFile);
 			var monochromeDestFilename = AppIconName + "_monochrome.png";
 
 			if (monochromeExists)
@@ -165,12 +164,10 @@ void ProcessMonochrome(List<ResizedImageInfo> results, DirectoryInfo fullInterme
 			{
 				var dir = Path.Combine(fullIntermediateOutputPath.FullName, dpi.Path);
 				var destination = Path.Combine(dir, monochromeDestFilename);
-				var (destinationExists, destinationModified) = Utils.FileExists(destination);
 				Directory.CreateDirectory(dir);
 
-				if (destinationModified > monochromeModified)
+				if (Resizer.IsUpToDate(new[] { monochromeFile }, destination, InputsFile, Logger, monochromeFile))
 				{
-					Logger.Log($"Skipping `{monochromeFile}` => `{destination}` file is up to date.");
 					results.Add(new ResizedImageInfo { Dpi = dpi, Filename = destination });
 					continue;
 				}
@@ -179,7 +176,7 @@ void ProcessMonochrome(List<ResizedImageInfo> results, DirectoryInfo fullInterme
 
 				if (monochromeExists)
 				{
-					var tools = SkiaSharpTools.Create(Info.MonochromeIsVector, Info.MonochromeFilename, dpi.Size, null, null, Logger);
+					var tools = SkiaSharpTools.Create(Info.MonochromeIsVector, Info.MonochromeFilename, dpi.Size, null, null, Info.Quality, Logger);
 					tools.Resize(dpi, destination, dpiSizeIsAbsolute: true);
 				}
 				else

src/SingleProject/Resizetizer/src/ResizeImageInfo.cs

@@ -10,6 +10,8 @@ namespace Microsoft.Maui.Resizetizer
 {
 	internal class ResizeImageInfo
 	{
+		public const ResizeQuality DefaultResizeQuality = ResizeQuality.Auto;
+
 		public string? ItemSpec { get; set; }
 
 		public string? Alias { get; set; }
@@ -54,6 +56,8 @@ internal class ResizeImageInfo
 
 		public bool MonochromeIsVector => IsVectorFilename(MonochromeFilename);
 
+		public ResizeQuality Quality { get; set; } = DefaultResizeQuality;
+
 		private static bool IsVectorFilename(string? filename)
 			=> IsVectorExtension(Path.GetExtension(filename));
 
@@ -118,6 +122,10 @@ public static ResizeImageInfo Parse(ITaskItem image)
 			if (float.TryParse(image.GetMetadata("ForegroundScale"), NumberStyles.Number, CultureInfo.InvariantCulture, out var fsc))
 				info.ForegroundScale = fsc;
 
+			if (Enum.TryParse<ResizeQuality>(image.GetMetadata("ResizeQuality"), ignoreCase: true, out var quality) &&
+				Enum.IsDefined(typeof(ResizeQuality), quality))
+				info.Quality = quality;
+
 			var fgFile = image.GetMetadata("ForegroundFile");
 			if (!string.IsNullOrEmpty(fgFile))
 			{

src/SingleProject/Resizetizer/src/ResizeQuality.cs

@@ -0,0 +1,28 @@
+namespace Microsoft.Maui.Resizetizer
+{
+	/// <summary>
+	/// Controls the quality of image resampling during resize operations.
+	/// </summary>
+	internal enum ResizeQuality
+	{
+		/// <summary>
+		/// Default behavior, preserving existing image output.
+		/// Uses bilinear interpolation with mipmaps.
+		/// </summary>
+		Auto = 0,
+
+		/// <summary>
+		/// Highest quality output using Mitchell cubic resampler.
+		/// Provides high-fidelity scaling when preserving smooth detail is critical.
+		/// Uses cubic resampling for smoother results than the default bilinear output.
+		/// </summary>
+		Best = 1,
+
+		/// <summary>
+		/// Fastest processing with nearest-neighbor interpolation.
+		/// May appear pixelated when scaling, but is ideal for pixel art.
+		/// Use it when build speed matters more than visual fidelity.
+		/// </summary>
+		Fastest = 2,
+	}
+}

src/SingleProject/Resizetizer/src/Resizer.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
 using SkiaSharp;
 
 namespace Microsoft.Maui.Resizetizer
@@ -25,7 +26,7 @@ public Resizer(ResizeImageInfo info, string intermediateOutputPath, ILogger logg
 		public SKSize? BaseSize => Info.BaseSize;
 
 		protected SkiaSharpTools Tools =>
-			tools ??= SkiaSharpTools.Create(Info.IsVector, Info.Filename, Info.BaseSize, Info.Color, Info.TintColor, Logger);
+			tools ??= SkiaSharpTools.Create(Info.IsVector, Info.Filename, Info.BaseSize, Info.Color, Info.TintColor, Info.Quality, Logger);
 
 		public string GetRasterFileDestination(DpiPath dpi, bool includeIntermediate = true, bool includeScale = true)
 			=> GetRasterFileDestination(Info, dpi, includeIntermediate ? IntermediateOutputPath : null, includeScale);
@@ -75,21 +76,42 @@ public ResizedImageInfo CopyFile(DpiPath dpi, string inputsFile)
 			return new ResizedImageInfo { Filename = destination, Dpi = dpi };
 		}
 
-		static bool IsUpToDate(string inputFile, string outputFile, string inputsFile, ILogger logger)
+		internal static bool IsUpToDate(string inputFile, string outputFile, string inputsFile, ILogger logger)
 		{
-			var fileIn = new FileInfo(inputFile);
+			return IsUpToDate(new[] { inputFile }, outputFile, inputsFile, logger, inputFile);
+		}
+
+		internal static bool IsUpToDate(IEnumerable<string> inputFiles, string outputFile, string inputsFile, ILogger logger, string inputDescription = null)
+		{
+			var fileInputs = string.IsNullOrEmpty(inputsFile) ? null : new FileInfo(inputsFile);
+			if (fileInputs?.Exists != true)
+				return false;
+
 			var fileOut = new FileInfo(outputFile);
-			var fileInputs = inputsFile is null ? null : new FileInfo(inputsFile);
+			if (!fileOut.Exists)
+				return false;
 
-			if (fileIn.Exists && fileOut.Exists && fileInputs?.Exists == true
-				&& fileIn.LastWriteTimeUtc <= fileOut.LastWriteTimeUtc
-				&& fileInputs.LastWriteTimeUtc <= fileOut.LastWriteTimeUtc)
+			var newestInput = fileInputs.LastWriteTimeUtc;
+
+			foreach (var inputFile in inputFiles)
 			{
-				logger.Log($"Skipping '{inputFile}' as output '{outputFile}' is already up to date.");
-				return true;
+				if (string.IsNullOrEmpty(inputFile))
+					continue;
+
+				var fileIn = new FileInfo(inputFile);
+				if (!fileIn.Exists)
+					return false;
+
+				if (fileIn.LastWriteTimeUtc > newestInput)
+					newestInput = fileIn.LastWriteTimeUtc;
 			}
 
-			return false;
+			if (newestInput > fileOut.LastWriteTimeUtc)
+				return false;
+
+			var description = string.IsNullOrEmpty(inputDescription) ? "inputs" : inputDescription;
+			logger.Log($"Skipping '{description}' as output '{outputFile}' is already up to date.");
+			return true;
 		}
 
 		public ResizedImageInfo Resize(DpiPath dpi, string inputsFile)

src/SingleProject/Resizetizer/src/ResizetizeImages.cs

@@ -178,7 +178,7 @@ void ProcessAppIcon(ResizeImageInfo img, ConcurrentBag<ResizedImageInfo> resized
 
 				appIconName = appIconName.ToLowerInvariant();
 
-				var adaptiveIconGen = new AndroidAdaptiveIconGenerator(img, appIconName, IntermediateOutputPath, this);
+				var adaptiveIconGen = new AndroidAdaptiveIconGenerator(img, appIconName, IntermediateOutputPath, InputsFile, this);
 				var iconsGenerated = adaptiveIconGen.Generate();
 
 				foreach (var iconGenerated in iconsGenerated)
@@ -199,14 +199,15 @@ void ProcessAppIcon(ResizeImageInfo img, ConcurrentBag<ResizedImageInfo> resized
 			{
 				LogDebugMessage($"Windows Icon Generator");
 
-				var windowsIconGen = new WindowsIconGenerator(img, IntermediateOutputPath, this);
+				var windowsIconGen = new WindowsIconGenerator(img, IntermediateOutputPath, InputsFile, this);
 
 				resizedImages.Add(windowsIconGen.Generate());
 			}
 
 			LogDebugMessage($"Generating App Icon Bitmaps for DPIs");
 
 			var appTool = new SkiaSharpAppIconTools(img, this);
+			var appIconSourceFiles = GetAppIconSourceFiles(img);
 
 			LogDebugMessage($"App Icon: Intermediate Path " + IntermediateOutputPath);
 
@@ -216,14 +217,11 @@ void ProcessAppIcon(ResizeImageInfo img, ConcurrentBag<ResizedImageInfo> resized
 
 				var destination = Resizer.GetRasterFileDestination(img, dpi, IntermediateOutputPath)
 					.Replace("{name}", appIconName);
-				var (sourceExists, sourceModified) = Utils.FileExists(img.Filename);
-				var (destinationExists, destinationModified) = Utils.FileExists(destination);
 
 				LogDebugMessage($"App Icon Destination: " + destination);
 
-				if (destinationModified > sourceModified)
+				if (Resizer.IsUpToDate(appIconSourceFiles, destination, InputsFile, Logger, img.ItemSpec))
 				{
-					Logger.Log($"Skipping `{img.Filename}` => `{destination}` file is up to date.");
 					resizedImages.Add(new ResizedImageInfo() { Dpi = dpi, Filename = destination });
 					continue;
 				}
@@ -233,6 +231,9 @@ void ProcessAppIcon(ResizeImageInfo img, ConcurrentBag<ResizedImageInfo> resized
 			}
 		}
 
+		static string[] GetAppIconSourceFiles(ResizeImageInfo img) =>
+			new[] { img.Filename, img.ForegroundFilename };
+
 		void ProcessImageResize(ResizeImageInfo img, DpiPath[] dpis, ConcurrentBag<ResizedImageInfo> resizedImages)
 		{
 			var resizer = new Resizer(img, IntermediateOutputPath, this);

src/SingleProject/Resizetizer/src/SkiaSharpAppIconTools.cs

@@ -21,9 +21,9 @@ public SkiaSharpAppIconTools(ResizeImageInfo info, ILogger? logger)
 				throw new InvalidOperationException("An app icon needs at least one image.");
 
 			if (hasBackground)
-				backgroundTools = SkiaSharpTools.Create(info.IsVector, info.Filename, null, null, null, logger);
+				backgroundTools = SkiaSharpTools.Create(info.IsVector, info.Filename, null, null, null, info.Quality, logger);
 			if (hasForeground)
-				foregroundTools = SkiaSharpTools.Create(info.ForegroundIsVector, info.ForegroundFilename, null, null, info.TintColor, logger);
+				foregroundTools = SkiaSharpTools.Create(info.ForegroundIsVector, info.ForegroundFilename, null, null, info.TintColor, info.Quality, logger);
 		}
 
 		SkiaSharpTools? backgroundTools;

src/SingleProject/Resizetizer/src/SkiaSharpImaginaryTools.cs

@@ -11,7 +11,7 @@ public SkiaSharpImaginaryTools(ResizeImageInfo info, ILogger logger)
 		}
 
 		public SkiaSharpImaginaryTools(SKColor? backgroundColor, ILogger logger)
-			: base(null, new SKSize(1, 1), backgroundColor, null, logger)
+			: base(null, new SKSize(1, 1), backgroundColor, null, ResizeImageInfo.DefaultResizeQuality, logger)
 		{
 		}