From fe4a26550e5ca73fb5d1da1e972266836bcd3065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Folles=C3=B8?= Date: Sat, 8 Feb 2025 13:28:37 +0100 Subject: [PATCH 1/5] Remove net7.0 and add net9.0 as target frameworks Remove net7.0 since it is obsolete and went out of support on May 14th, 2024. --- samples/Sample/Sample.Droid.Nuget.csproj | 4 ++-- samples/Sample/Sample.Droid.csproj | 4 ++-- samples/Sample/Sample.Win.Nuget.csproj | 4 ++-- samples/Sample/Sample.Win.csproj | 4 ++-- samples/Sample/Sample.csproj | 2 -- source/FFImageLoading.Maui/FFImageLoading.Maui.csproj | 10 ++++------ 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/samples/Sample/Sample.Droid.Nuget.csproj b/samples/Sample/Sample.Droid.Nuget.csproj index 1d493e2..fc91f72 100644 --- a/samples/Sample/Sample.Droid.Nuget.csproj +++ b/samples/Sample/Sample.Droid.Nuget.csproj @@ -31,10 +31,10 @@ Device;Simulator;AnyCPU - + false - + false diff --git a/samples/Sample/Sample.Droid.csproj b/samples/Sample/Sample.Droid.csproj index f2dff4b..ddab074 100644 --- a/samples/Sample/Sample.Droid.csproj +++ b/samples/Sample/Sample.Droid.csproj @@ -30,10 +30,10 @@ Device;Simulator;AnyCPU - + false - + false diff --git a/samples/Sample/Sample.Win.Nuget.csproj b/samples/Sample/Sample.Win.Nuget.csproj index b3e4a0d..73fb21e 100644 --- a/samples/Sample/Sample.Win.Nuget.csproj +++ b/samples/Sample/Sample.Win.Nuget.csproj @@ -30,10 +30,10 @@ Device;Simulator;AnyCPU - + false - + false diff --git a/samples/Sample/Sample.Win.csproj b/samples/Sample/Sample.Win.csproj index 72b09d9..dcfd1ed 100644 --- a/samples/Sample/Sample.Win.csproj +++ b/samples/Sample/Sample.Win.csproj @@ -30,10 +30,10 @@ Device;Simulator;AnyCPU - + false - + false diff --git a/samples/Sample/Sample.csproj b/samples/Sample/Sample.csproj index 98062c3..e9ae008 100644 --- a/samples/Sample/Sample.csproj +++ b/samples/Sample/Sample.csproj @@ -3,8 +3,6 @@ net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst; $(TargetFrameworks);net8.0-windows10.0.19041.0 - - Exe Sample true diff --git a/source/FFImageLoading.Maui/FFImageLoading.Maui.csproj b/source/FFImageLoading.Maui/FFImageLoading.Maui.csproj index e50f029..b735a4a 100644 --- a/source/FFImageLoading.Maui/FFImageLoading.Maui.csproj +++ b/source/FFImageLoading.Maui/FFImageLoading.Maui.csproj @@ -1,10 +1,8 @@  - net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0;net8.0-windows10.0.19041.0 - - + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.;net9.0-windows10.0.19041.0 true true enable @@ -29,7 +27,7 @@ Latest 14.2 - 14.0 + 15.0 21.0 10.0.17763.0 10.0.17763.0 @@ -60,4 +58,4 @@ - + \ No newline at end of file From f1adaaa41addf2101be168721968d74e9aeb6b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Folles=C3=B8?= Date: Sat, 8 Feb 2025 14:04:38 +0100 Subject: [PATCH 2/5] Fix failing unit tests The ImageServiceBaseTests was failing due to MemoryCache either not being set on the PlatformImageLoaderTask, or by the ImageService returning a new instance of the mock cache for every access to the property. --- source/FFImageLoading.Maui/Foundations/Mock/ImageService.cs | 2 +- .../Foundations/Mock/PlatformImageLoaderTask.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/FFImageLoading.Maui/Foundations/Mock/ImageService.cs b/source/FFImageLoading.Maui/Foundations/Mock/ImageService.cs index 8715924..e6a786e 100644 --- a/source/FFImageLoading.Maui/Foundations/Mock/ImageService.cs +++ b/source/FFImageLoading.Maui/Foundations/Mock/ImageService.cs @@ -35,7 +35,7 @@ public ImageService( { } - public override IMemoryCache MemoryCache => new MockImageCache(); + public override IMemoryCache MemoryCache => MockImageCache.Instance; public static IImageLoaderTask CreateTask(TaskParameter parameters, ITarget target) where TImageView : class { diff --git a/source/FFImageLoading.Maui/Foundations/Mock/PlatformImageLoaderTask.cs b/source/FFImageLoading.Maui/Foundations/Mock/PlatformImageLoaderTask.cs index 85bc679..340036a 100644 --- a/source/FFImageLoading.Maui/Foundations/Mock/PlatformImageLoaderTask.cs +++ b/source/FFImageLoading.Maui/Foundations/Mock/PlatformImageLoaderTask.cs @@ -13,6 +13,7 @@ public class PlatformImageLoaderTask : ImageLoaderTask target, TaskParameter parameters, IImageService imageService) : base(imageService, target, parameters) { + MemoryCache = MockImageCache.Instance; } protected override int DpiToPixels(int size, double scale) From 1086f843479fbfffdd40946e41cb1602985225ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Folles=C3=B8?= Date: Sat, 8 Feb 2025 14:11:53 +0100 Subject: [PATCH 3/5] Update Svg.Skia to latest version --- source/FFImageLoading.Maui/FFImageLoading.Maui.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/FFImageLoading.Maui/FFImageLoading.Maui.csproj b/source/FFImageLoading.Maui/FFImageLoading.Maui.csproj index b735a4a..3b3a753 100644 --- a/source/FFImageLoading.Maui/FFImageLoading.Maui.csproj +++ b/source/FFImageLoading.Maui/FFImageLoading.Maui.csproj @@ -56,6 +56,6 @@ - + \ No newline at end of file From e10447ac17ed5bcc09279c021758ff85c9299040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Folles=C3=B8?= Date: Sat, 8 Feb 2025 14:12:06 +0100 Subject: [PATCH 4/5] Update unit testing dependencies to latest version --- source/Tests/FFImageLoading.Tests.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/Tests/FFImageLoading.Tests.csproj b/source/Tests/FFImageLoading.Tests.csproj index 785ae19..fe4826c 100644 --- a/source/Tests/FFImageLoading.Tests.csproj +++ b/source/Tests/FFImageLoading.Tests.csproj @@ -15,15 +15,15 @@ - - runtime; build; native; contentfiles; analyzers; buildtransitive + + runtime; build; native; contentfiles; analyzers; buildtransitive all - runtime; build; native; contentfiles; analyzers; buildtransitive + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + From 5383cf474156a6b44b1099f7462536a65aad5f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Folles=C3=B8?= Date: Sat, 8 Feb 2025 14:17:56 +0100 Subject: [PATCH 5/5] Update Sample app to MAUI 9 --- samples/Sample/Platforms/iOS/Info.plist | 2 +- samples/Sample/Sample.csproj | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/samples/Sample/Platforms/iOS/Info.plist b/samples/Sample/Platforms/iOS/Info.plist index da1466f..8bf0cc7 100644 --- a/samples/Sample/Platforms/iOS/Info.plist +++ b/samples/Sample/Platforms/iOS/Info.plist @@ -11,7 +11,7 @@ LSRequiresIPhoneOS MinimumOSVersion - 11.0 + 12.2 UIDeviceFamily 1 diff --git a/samples/Sample/Sample.csproj b/samples/Sample/Sample.csproj index e9ae008..d81df03 100644 --- a/samples/Sample/Sample.csproj +++ b/samples/Sample/Sample.csproj @@ -1,9 +1,9 @@  - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst; - $(TargetFrameworks);net8.0-windows10.0.19041.0 - Exe + net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst; + $(TargetFrameworks);net9.0-windows10.0.19041.0 + Exe Sample true true @@ -21,20 +21,20 @@ 1.0 1 - 11.0 + 12.2 13.1 21.0 - 10.0.17763.0 - 10.0.17763.0 + 10.0.19041.0 + 10.0.19041.0 6.5 Debug;Release Device;Simulator;AnyCPU - + false - + false @@ -78,8 +78,8 @@ - - + +