From a77ede5f7c9ce7fc2dfe55034da34dcd2d84cfd2 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 25 Dec 2024 19:11:55 +0100
Subject: [PATCH] Bump Win2D dependencies

---
 components/ImageCropper/src/Dependencies.props |  4 ++--
 components/Media/src/Dependencies.props        | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/components/ImageCropper/src/Dependencies.props b/components/ImageCropper/src/Dependencies.props
index d46a2f3a..682bbcdd 100644
--- a/components/ImageCropper/src/Dependencies.props
+++ b/components/ImageCropper/src/Dependencies.props
@@ -11,7 +11,7 @@
 <Project>
     <!-- WinUI 2 / UWP -->
     <ItemGroup Condition="'$(IsUwp)' == 'true'">
-        <PackageReference Include="Win2D.uwp" Version="1.28.0"/>
+        <PackageReference Include="Win2D.uwp" Version="1.28.1"/>
     </ItemGroup>
 
     <!-- WinUI 2 / Uno -->
@@ -21,7 +21,7 @@
 
     <!-- WinUI 3 / WinAppSdk -->
     <ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
-        <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.0"/>
+        <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.1"/>
     </ItemGroup>
     
     <!-- WinUI 3 / Uno -->
diff --git a/components/Media/src/Dependencies.props b/components/Media/src/Dependencies.props
index fad06d5e..7b27ab73 100644
--- a/components/Media/src/Dependencies.props
+++ b/components/Media/src/Dependencies.props
@@ -1,5 +1,5 @@
 <!--
-    WinUI 2 under UWP uses TargetFramework uap10.0.*
+    WinUI 2 under UWP uses TargetFramework uap10.0.* or net8.0-windows10.*
     WinUI 3 under WinAppSdk uses TargetFramework net6.0-windows10.*
     However, under Uno-powered platforms, both WinUI 2 and 3 can share the same TargetFramework.
     
@@ -11,12 +11,15 @@
 <Project>
   <!-- WinUI 2 / UWP -->
   <ItemGroup Condition="'$(IsUwp)' == 'true'">
-    <PackageReference Include="Win2D.uwp" Version="1.28.0" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
+    <PackageReference Include="Win2D.uwp" Version="1.28.1" />
+
+    <!-- Only include this polyfill package when not targeting .NET 8 or above -->
+    <PackageReference Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))"
+                      Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
   </ItemGroup>
 
   <!-- WinUI 3 / WinAppSdk -->
   <ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
-    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.0" />
+    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.1" />
   </ItemGroup>
 </Project>