From b80e23d4bf8cf7bf6f86ac2a6e6f857aaa9dee4f Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Fri, 17 May 2024 19:46:03 +0300
Subject: [PATCH] chore: Address review comments

---
 build/nuget/Uno.WinUI.DevServer.nuspec        |  16 +--
 build/nuget/Uno.WinUI.Lottie.nuspec           |  12 +-
 build/nuget/Uno.WinUI.MSAL.nuspec             |   8 +-
 build/nuget/Uno.WinUI.RemoteControl.nuspec    |   4 +-
 build/nuget/Uno.WinUI.Svg.nuspec              |  12 +-
 build/nuget/Uno.WinUI.XamlHost.nuspec         |  12 +-
 build/nuget/Uno.WinUI.nuspec                  | 118 +++++++++---------
 src/Directory.Build.props                     |   4 +-
 .../Uno.UI.Maps.netcoremobile.csproj          |   2 +-
 src/targetframework-override.props            |   2 +
 src/uno.mobile-cross-targeting-disable.props  |   4 +-
 11 files changed, 98 insertions(+), 96 deletions(-)

diff --git a/build/nuget/Uno.WinUI.DevServer.nuspec b/build/nuget/Uno.WinUI.DevServer.nuspec
index d35dc150be72..b301c8701ff9 100644
--- a/build/nuget/Uno.WinUI.DevServer.nuspec
+++ b/build/nuget/Uno.WinUI.DevServer.nuspec
@@ -25,8 +25,8 @@
 				<dependency id="Microsoft.IO.RecyclableMemoryStream" version="2.3.2" />
 			</group>
 
-			<!-- net8.0-maccatalyst -->
-			<group targetFramework="net8.0-maccatalyst">
+			<!-- net8.0-maccatalyst17.0 -->
+			<group targetFramework="net8.0-maccatalyst17.0">
 				<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
 				<dependency id="Uno.WinUI.DevServer.Messaging" version="1.29.0-dev.93" />
 
@@ -61,8 +61,8 @@
 				<dependency id="Microsoft.IO.RecyclableMemoryStream" version="2.3.2" />
 			</group>
 
-			<!-- net9.0-maccatalyst -->
-			<group targetFramework="net9.0-maccatalyst">
+			<!-- net9.0-maccatalyst17.2 -->
+			<group targetFramework="net9.0-maccatalyst17.2">
 				<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
 				<dependency id="Uno.WinUI.DevServer.Messaging" version="1.29.0-dev.93" />
 
@@ -136,8 +136,8 @@
 		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net8.0-ios17.0\Uno.UI.RemoteControl.dll" target="lib\net8.0-ios17.0" />
 		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net8.0-ios17.0\Uno.UI.RemoteControl.pdb" target="lib\net8.0-ios17.0" />
 
-		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.RemoteControl.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.RemoteControl.pdb" target="lib\net8.0-maccatalyst" />
+		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.RemoteControl.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.RemoteControl.pdb" target="lib\net8.0-maccatalyst17.0" />
 
 		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net8.0-macos\Uno.UI.RemoteControl.dll" target="lib\net8.0-macos" />
 		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net8.0-macos\Uno.UI.RemoteControl.pdb" target="lib\net8.0-macos" />
@@ -148,8 +148,8 @@
 		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-ios17.2\Uno.UI.RemoteControl.dll" target="lib\net9.0-ios17.2" />
 		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-ios17.2\Uno.UI.RemoteControl.pdb" target="lib\net9.0-ios17.2" />
 
-		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.RemoteControl.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.RemoteControl.pdb" target="lib\net9.0-maccatalyst" />
+		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.RemoteControl.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.RemoteControl.pdb" target="lib\net9.0-maccatalyst17.2" />
 
 		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-macos\Uno.UI.RemoteControl.dll" target="lib\net9.0-macos" />
 		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-macos\Uno.UI.RemoteControl.pdb" target="lib\net9.0-macos" />
diff --git a/build/nuget/Uno.WinUI.Lottie.nuspec b/build/nuget/Uno.WinUI.Lottie.nuspec
index 7f63c3f1b964..96d07d8ee659 100644
--- a/build/nuget/Uno.WinUI.Lottie.nuspec
+++ b/build/nuget/Uno.WinUI.Lottie.nuspec
@@ -47,7 +47,7 @@
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 				<dependency id="System.Json" version="4.7.1" />
 			</group>
-			<group targetFramework="net8.0-maccatalyst">
+			<group targetFramework="net8.0-maccatalyst17.0">
 				<dependency id="SkiaSharp.Skottie" version="2.88.7" />
 				<dependency id="SkiaSharp.Views.Uno" version="2.88.7" />
 				<dependency id="SkiaSharp.NativeAssets.maccatalyst" version="2.88.7" />
@@ -80,7 +80,7 @@
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 				<dependency id="System.Json" version="4.7.1" />
 			</group>
-			<group targetFramework="net9.0-maccatalyst">
+			<group targetFramework="net9.0-maccatalyst17.2">
 				<dependency id="SkiaSharp.Skottie" version="2.88.7" />
 				<dependency id="SkiaSharp.Views.Uno" version="2.88.7" />
 				<dependency id="SkiaSharp.NativeAssets.maccatalyst" version="2.88.7" />
@@ -102,7 +102,7 @@
 			<group targetFramework="net8.0-ios17.0">
 				<reference file="Uno.UI.Lottie.dll" />
 			</group>
-			<group targetFramework="net8.0-maccatalyst">
+			<group targetFramework="net8.0-maccatalyst17.0">
 				<reference file="Uno.UI.Lottie.dll" />
 			</group>
 			<group targetFramework="net8.0-macos">
@@ -114,7 +114,7 @@
 			<group targetFramework="net9.0-ios17.2">
 				<reference file="Uno.UI.Lottie.dll" />
 			</group>
-			<group targetFramework="net9.0-maccatalyst">
+			<group targetFramework="net9.0-maccatalyst17.2">
 				<reference file="Uno.UI.Lottie.dll" />
 			</group>
 			<group targetFramework="net9.0-macos">
@@ -139,11 +139,11 @@
 
 		<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net8.0-android\Uno.UI.Lottie.dll" target="lib\net8.0-android" />
 		<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net8.0-ios17.0\Uno.UI.Lottie.dll" target="lib\net8.0-ios17.0" />
-		<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.Lottie.dll" target="lib\net8.0-maccatalyst" />
+		<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.Lottie.dll" target="lib\net8.0-maccatalyst17.0" />
 
 		<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net9.0-android\Uno.UI.Lottie.dll" target="lib\net9.0-android" />
 		<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net9.0-ios17.2\Uno.UI.Lottie.dll" target="lib\net9.0-ios17.2" />
-		<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.Lottie.dll" target="lib\net9.0-maccatalyst" />
+		<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.Lottie.dll" target="lib\net9.0-maccatalyst17.2" />
 
 		<!-- Build targets -->
 		<file src="..\..\src\AddIns\Uno.UI.Lottie\buildTransitive\*" target="buildTransitive" />
diff --git a/build/nuget/Uno.WinUI.MSAL.nuspec b/build/nuget/Uno.WinUI.MSAL.nuspec
index c0f5632f8184..54f31c7450bb 100644
--- a/build/nuget/Uno.WinUI.MSAL.nuspec
+++ b/build/nuget/Uno.WinUI.MSAL.nuspec
@@ -42,7 +42,7 @@
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 				<dependency id="Microsoft.Identity.Client" version="4.47.0" />
 			</group>
-			<group targetFramework="net8.0-maccatalyst13.5">
+			<group targetFramework="net8.0-maccatalyst17.0">
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 				<dependency id="Microsoft.Identity.Client" version="4.47.0" />
 			</group>
@@ -58,7 +58,7 @@
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 				<dependency id="Microsoft.Identity.Client" version="4.47.0" />
 			</group>
-			<group targetFramework="net9.0-maccatalyst13.5">
+			<group targetFramework="net9.0-maccatalyst17.2">
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 				<dependency id="Microsoft.Identity.Client" version="4.47.0" />
 			</group>
@@ -85,12 +85,12 @@
 
 		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net8.0-android\Uno.UI.MSAL.*" target="lib\net8.0-android" />
 		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net8.0-ios17.0\Uno.UI.MSAL.*" target="lib\net8.0-ios17.0" />
-		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.MSAL.*" target="lib\net8.0-maccatalyst" />
+		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.MSAL.*" target="lib\net8.0-maccatalyst17.0" />
 		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net8.0-macos\Uno.UI.MSAL.*" target="lib\net8.0-macos" />
 
 		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-android\Uno.UI.MSAL.*" target="lib\net9.0-android" />
 		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-ios17.2\Uno.UI.MSAL.*" target="lib\net9.0-ios17.2" />
-		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.MSAL.*" target="lib\net9.0-maccatalyst" />
+		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.MSAL.*" target="lib\net9.0-maccatalyst17.2" />
 		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-macos\Uno.UI.MSAL.*" target="lib\net9.0-macos" />
 
 		<!-- Build targets -->
diff --git a/build/nuget/Uno.WinUI.RemoteControl.nuspec b/build/nuget/Uno.WinUI.RemoteControl.nuspec
index f2db8c6e2292..3bcd14168267 100644
--- a/build/nuget/Uno.WinUI.RemoteControl.nuspec
+++ b/build/nuget/Uno.WinUI.RemoteControl.nuspec
@@ -31,12 +31,12 @@
 		
 		<file src="_._" target="lib\net8.0-android" />
 		<file src="_._" target="lib\net8.0-ios17.0" />
-		<file src="_._" target="lib\net8.0-maccatalyst" />
+		<file src="_._" target="lib\net8.0-maccatalyst17.0" />
 		<file src="_._" target="lib\net8.0-macos" />
 		
 		<file src="_._" target="lib\net9.0-android" />
 		<file src="_._" target="lib\net9.0-ios17.2" />
-		<file src="_._" target="lib\net9.0-maccatalyst" />
+		<file src="_._" target="lib\net9.0-maccatalyst17.2" />
 		<file src="_._" target="lib\net9.0-macos" />
 	</files>
 </package>
diff --git a/build/nuget/Uno.WinUI.Svg.nuspec b/build/nuget/Uno.WinUI.Svg.nuspec
index 7a2dd9dfad83..e17eeee38227 100644
--- a/build/nuget/Uno.WinUI.Svg.nuspec
+++ b/build/nuget/Uno.WinUI.Svg.nuspec
@@ -41,7 +41,7 @@
 
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 			</group>
-			<group targetFramework="net8.0-maccatalyst">
+			<group targetFramework="net8.0-maccatalyst17.0">
 				<dependency id="Svg.Skia" version="1.0.0.1" />
 				<dependency id="SkiaSharp.Views.Uno" version="2.88.7" />
 				<dependency id="SkiaSharp.NativeAssets.maccatalyst" version="2.88.7" />
@@ -63,7 +63,7 @@
 
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 			</group>
-			<group targetFramework="net9.0-maccatalyst">
+			<group targetFramework="net9.0-maccatalyst17.2">
 				<dependency id="Svg.Skia" version="1.0.0.1" />
 				<dependency id="SkiaSharp.Views.Uno" version="2.88.7" />
 				<dependency id="SkiaSharp.NativeAssets.maccatalyst" version="2.88.7" />
@@ -76,7 +76,7 @@
 			<group targetFramework="net9.0-ios17.2">
 				<reference file="Uno.UI.Svg.dll" />
 			</group>
-			<group targetFramework="net9.0-maccatalyst">
+			<group targetFramework="net9.0-maccatalyst17.2">
 				<reference file="Uno.UI.Svg.dll" />
 			</group>
 			<group targetFramework="net9.0-android">
@@ -88,7 +88,7 @@
 			<group targetFramework="net8.0-ios17.0">
 				<reference file="Uno.UI.Svg.dll" />
 			</group>
-			<group targetFramework="net8.0-maccatalyst">
+			<group targetFramework="net8.0-maccatalyst17.0">
 				<reference file="Uno.UI.Svg.dll" />
 			</group>
 			<group targetFramework="net8.0-android">
@@ -106,11 +106,11 @@
 
 		<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net8.0-android\Uno.UI.Svg.dll" target="lib\net8.0-android" />
 		<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net8.0-ios17.0\Uno.UI.Svg.dll" target="lib\net8.0-ios17.0" />
-		<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.Svg.dll" target="lib\net8.0-maccatalyst" />
+		<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.Svg.dll" target="lib\net8.0-maccatalyst17.0" />
 
 		<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net9.0-android\Uno.UI.Svg.dll" target="lib\net9.0-android" />
 		<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net9.0-ios17.2\Uno.UI.Svg.dll" target="lib\net9.0-ios17.2" />
-		<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.Svg.dll" target="lib\net9.0-maccatalyst" />
+		<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.Svg.dll" target="lib\net9.0-maccatalyst17.2" />
 
 		<!-- Build targets -->
 		<file src="..\..\src\AddIns\Uno.UI.Svg\buildTransitive\*" target="buildTransitive" />
diff --git a/build/nuget/Uno.WinUI.XamlHost.nuspec b/build/nuget/Uno.WinUI.XamlHost.nuspec
index 06128e0390ef..4dc103c7e879 100644
--- a/build/nuget/Uno.WinUI.XamlHost.nuspec
+++ b/build/nuget/Uno.WinUI.XamlHost.nuspec
@@ -19,7 +19,7 @@
 			<group targetFramework="net8.0-ios17.0">
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 			</group>
-			<group targetFramework="net8.0-maccatalyst13.5">
+			<group targetFramework="net8.0-maccatalyst17.0">
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 			</group>
 			<group targetFramework="net8.0-macos10.15">
@@ -31,7 +31,7 @@
 			<group targetFramework="net9.0-ios17.2">
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 			</group>
-			<group targetFramework="net9.0-maccatalyst13.5">
+			<group targetFramework="net9.0-maccatalyst17.2">
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 			</group>
 			<group targetFramework="net9.0-macos10.15">
@@ -46,8 +46,8 @@
 		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-ios17.0\Uno.UI.XamlHost.dll" target="lib\net8.0-ios17.0" />
 		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-ios17.0\Uno.UI.XamlHost.pdb" target="lib\net8.0-ios17.0" />
 
-		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.XamlHost.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.XamlHost.pdb" target="lib\net8.0-maccatalyst" />
+		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.XamlHost.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.XamlHost.pdb" target="lib\net8.0-maccatalyst17.0" />
 
 		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-macos\Uno.UI.XamlHost.dll" target="lib\net8.0-macos" />
 		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-macos\Uno.UI.XamlHost.pdb" target="lib\net8.0-macos" />
@@ -58,8 +58,8 @@
 		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-ios17.2\Uno.UI.XamlHost.dll" target="lib\net9.0-ios17.2" />
 		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-ios17.2\Uno.UI.XamlHost.pdb" target="lib\net9.0-ios17.2" />
 
-		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.XamlHost.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.XamlHost.pdb" target="lib\net9.0-maccatalyst" />
+		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.XamlHost.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.XamlHost.pdb" target="lib\net9.0-maccatalyst17.2" />
 
 		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-macos\Uno.UI.XamlHost.dll" target="lib\net9.0-macos" />
 		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-macos\Uno.UI.XamlHost.pdb" target="lib\net9.0-macos" />
diff --git a/build/nuget/Uno.WinUI.nuspec b/build/nuget/Uno.WinUI.nuspec
index bbe79becaa00..93c4c4f936da 100644
--- a/build/nuget/Uno.WinUI.nuspec
+++ b/build/nuget/Uno.WinUI.nuspec
@@ -43,8 +43,8 @@
 				<dependency id="Uno.Fonts.Fluent" version="2.3.0" />
 			</group>
 
-			<!-- net9.0-maccatalyst -->
-			<group targetFramework="net9.0-maccatalyst">
+			<!-- net9.0-maccatalyst17.2 -->
+			<group targetFramework="net9.0-maccatalyst17.2">
 				<dependency id="Uno.Foundation.Logging" version="0.0.0" />
 				<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
 				<dependency id="Uno.Fonts.Fluent" version="2.3.0" />
@@ -76,8 +76,8 @@
 				<dependency id="Uno.Fonts.Fluent" version="2.3.0" />
 			</group>
 
-			<!-- net8.0-maccatalyst -->
-			<group targetFramework="net8.0-maccatalyst">
+			<!-- net8.0-maccatalyst17.0 -->
+			<group targetFramework="net8.0-maccatalyst17.0">
 				<dependency id="Uno.Foundation.Logging" version="0.0.0" />
 				<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
 				<dependency id="Uno.Fonts.Fluent" version="2.3.0" />
@@ -159,8 +159,8 @@
 				<reference file="Uno.UI.FluentTheme.v2.dll" />
 			</group>
 
-			<!-- net8.0-maccatalyst -->
-			<group targetFramework="net8.0-maccatalyst">
+			<!-- net8.0-maccatalyst17.0 -->
+			<group targetFramework="net8.0-maccatalyst17.0">
 				<reference file="Uno.Xaml.dll" />
 				<reference file="Uno.UI.dll" />
 				<reference file="Uno.UI.Composition.dll" />
@@ -221,7 +221,7 @@
 			</group>
 
 			<!-- net9.0-maccatalyst -->
-			<group targetFramework="net9.0-maccatalyst">
+			<group targetFramework="net9.0-maccatalyst17.2">
 				<reference file="Uno.Xaml.dll" />
 				<reference file="Uno.UI.dll" />
 				<reference file="Uno.UI.Composition.dll" />
@@ -301,7 +301,7 @@
 		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-ios17.0\Uno.pdb" target="lib\net8.0-ios17.0" />
 		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-ios17.0\Uno.Foundation.dll" target="lib\net8.0-ios17.0" />
 		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-ios17.0\Uno.Foundation.pdb" target="lib\net8.0-ios17.0" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-ios17.0\Uno.Foundation.Logging.dll" target="lib\net8.0-ios7.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-ios17.0\Uno.Foundation.Logging.dll" target="lib\net8.0-ios17.0" />
 		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-ios17.0\Uno.Foundation.Logging.pdb" target="lib\net8.0-ios17.0" />
 		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-ios17.0\Uno.UI.dll" target="lib\net8.0-ios17.0" />
 		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-ios17.0\Uno.UI.pdb" target="lib\net8.0-ios17.0" />
@@ -321,30 +321,30 @@
 		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net8.0-ios17.0\Uno.UI.Toolkit.dll" target="lib\net8.0-ios17.0" />
 		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net8.0-ios17.0\Uno.UI.Toolkit.pdb" target="lib\net8.0-ios17.0" />
 
-		<!-- net8.0-maccatalyst -->
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.pdb" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.Foundation.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.Foundation.pdb" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.Foundation.Logging.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.Foundation.Logging.pdb" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.pdb" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.Composition.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.Composition.pdb" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.Dispatching.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.Dispatching.pdb" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.Xaml.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\Uno.Xaml.pdb" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst\*.xml" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.FluentTheme.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.FluentTheme.pdb" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.FluentTheme.v1.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.FluentTheme.v1.pdb" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.FluentTheme.v2.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.FluentTheme.v2.pdb" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.Toolkit.dll" target="lib\net8.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.Toolkit.pdb" target="lib\net8.0-maccatalyst" />
+		<!-- net8.0-maccatalyst17.0 -->
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.pdb" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.Foundation.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.Foundation.pdb" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.Foundation.Logging.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.Foundation.Logging.pdb" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.pdb" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.Composition.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.Composition.pdb" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.Dispatching.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.Dispatching.pdb" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.Xaml.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.Xaml.pdb" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI\bin\Uno.UI.netcoremobile\Release\net8.0-maccatalyst17.0\*.xml" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.FluentTheme.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.FluentTheme.pdb" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.FluentTheme.v1.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.FluentTheme.v1.pdb" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.FluentTheme.v2.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.FluentTheme.v2.pdb" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.Toolkit.dll" target="lib\net8.0-maccatalyst17.0" />
+		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.Toolkit.pdb" target="lib\net8.0-maccatalyst17.0" />
 
 		<!-- net8.0-macos -->
 		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net8.0-macos\Uno.dll" target="lib\net8.0-macos" />
@@ -424,30 +424,30 @@
 		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net9.0-ios17.2\Uno.UI.Toolkit.dll" target="lib\net9.0-ios17.2" />
 		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net9.0-ios17.2\Uno.UI.Toolkit.pdb" target="lib\net9.0-ios17.2" />
 
-		<!-- net9.0-maccatalyst -->
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.pdb" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.Foundation.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.Foundation.pdb" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.Foundation.Logging.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.Foundation.Logging.pdb" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.pdb" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.Composition.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.Composition.pdb" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.Dispatching.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.Dispatching.pdb" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.Xaml.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\Uno.Xaml.pdb" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI\bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst\*.xml" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.FluentTheme.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.FluentTheme.pdb" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.FluentTheme.v1.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.FluentTheme.v1.pdb" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.FluentTheme.v2.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.FluentTheme.v2.pdb" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.Toolkit.dll" target="lib\net9.0-maccatalyst" />
-		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.Toolkit.pdb" target="lib\net9.0-maccatalyst" />
+		<!-- net9.0-maccatalyst17.2 -->
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.pdb" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.Foundation.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.Foundation.pdb" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.Foundation.Logging.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.Foundation.Logging.pdb" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.pdb" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.Composition.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.Composition.pdb" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.Dispatching.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.Dispatching.pdb" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.Xaml.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.Xaml.pdb" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI\bin\Uno.UI.netcoremobile\Release\net9.0-maccatalyst17.2\*.xml" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.FluentTheme.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.FluentTheme.pdb" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.FluentTheme.v1.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.FluentTheme.v1.pdb" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.FluentTheme.v2.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.FluentTheme.v2.pdb" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.Toolkit.dll" target="lib\net9.0-maccatalyst17.2" />
+		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.Toolkit.pdb" target="lib\net9.0-maccatalyst17.2" />
 
 		<!-- net9.0-macos -->
 		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos\Uno.dll" target="lib\net9.0-macos" />
@@ -659,7 +659,7 @@
 		<file src="Uno.WinUI.targets" target="buildTransitive\net8.0" />
 		<file src="Uno.WinUI.targets" target="buildTransitive\net8.0-android30.0" />
 		<file src="Uno.WinUI.targets" target="buildTransitive\net8.0-ios17.0" />
-		<file src="Uno.WinUI.targets" target="buildTransitive\net8.0-maccatalyst" />
+		<file src="Uno.WinUI.targets" target="buildTransitive\net8.0-maccatalyst17.0" />
 		<file src="Uno.WinUI.targets" target="buildTransitive\net8.0-macos" />
 		<file src="Uno.WinUI.targets" target="buildTransitive\net9.0-android30.0" />
 		<file src="Uno.WinUI.targets" target="buildTransitive\net9.0-ios17.2" />
@@ -670,11 +670,11 @@
 		<file src="Uno.WinUI.props" target="buildTransitive\net8.0" />
 		<file src="Uno.WinUI.props" target="buildTransitive\net8.0-android30.0" />
 		<file src="Uno.WinUI.props" target="buildTransitive\net8.0-ios17.0" />
-		<file src="Uno.WinUI.props" target="buildTransitive\net8.0-maccatalyst" />
+		<file src="Uno.WinUI.props" target="buildTransitive\net8.0-maccatalyst17.0" />
 		<file src="Uno.WinUI.props" target="buildTransitive\net8.0-macos" />
 		<file src="Uno.WinUI.props" target="buildTransitive\net9.0-android30.0" />
 		<file src="Uno.WinUI.props" target="buildTransitive\net9.0-ios17.2" />
-		<file src="Uno.WinUI.props" target="buildTransitive\net9.0-maccatalyst" />
+		<file src="Uno.WinUI.props" target="buildTransitive\net9.0-maccatalyst17.0" />
 		<file src="Uno.WinUI.props" target="buildTransitive\net9.0-macos" />
 		<file src="Uno.WinUI.props" target="buildTransitive\net9.0-windows" />
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 1432c57dac10..de36d3baa29c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -54,8 +54,8 @@
 		<NetCurrent>net9.0</NetCurrent>
 		<NetPrevious>net8.0</NetPrevious>
 
-		<NetCurrentNetCoreMobile>$(NetCurrent)-android;$(NetCurrent)-ios17.2;$(NetCurrent)-maccatalyst;$(NetCurrent)-macos</NetCurrentNetCoreMobile>
-		<NetPreviousNetCoreMobile>$(NetPrevious)-android;$(NetPrevious)-ios17.0;$(NetPrevious)-maccatalyst;$(NetPrevious)-macos</NetPreviousNetCoreMobile>
+		<NetCurrentNetCoreMobile>$(NetCurrent)-android;$(NetCurrent)-ios17.2;$(NetCurrent)-maccatalyst17.2;$(NetCurrent)-macos</NetCurrentNetCoreMobile>
+		<NetPreviousNetCoreMobile>$(NetPrevious)-android;$(NetPrevious)-ios17.0;$(NetPrevious)-maccatalyst17.0;$(NetPrevious)-macos</NetPreviousNetCoreMobile>
 
 		<NetPreviousWpf>$(NetPrevious)-windows</NetPreviousWpf>
 		<NetCurrentWpf>$(NetCurrent)-windows</NetCurrentWpf>
diff --git a/src/Uno.UI.Maps/Uno.UI.Maps.netcoremobile.csproj b/src/Uno.UI.Maps/Uno.UI.Maps.netcoremobile.csproj
index 812cfd0a3baf..5aedaab9f06d 100644
--- a/src/Uno.UI.Maps/Uno.UI.Maps.netcoremobile.csproj
+++ b/src/Uno.UI.Maps/Uno.UI.Maps.netcoremobile.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>$(NetPrevious)-android;$(NetPrevious)-ios;$(NetPrevious)-maccatalyst</TargetFrameworks>
+		<TargetFrameworks>$(NetPrevious)-android;$(NetPrevious)-ios17.0;$(NetPrevious)-maccatalyst17.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="../targetframework-override-netprevious.props" />
diff --git a/src/targetframework-override.props b/src/targetframework-override.props
index 66961a510e7d..aff2be8f666d 100644
--- a/src/targetframework-override.props
+++ b/src/targetframework-override.props
@@ -4,6 +4,8 @@
 	<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
 	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-ios'">net8.0-ios17.0</TargetFrameworks>
 	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net9.0-ios'">net9.0-ios17.2</TargetFrameworks>
+	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-maccatalyst'">net8.0-maccatalyst17.0</TargetFrameworks>
+	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net9.0-maccatalyst'">net9.0-maccatalyst.2</TargetFrameworks>
   </PropertyGroup>
 
 </Project>
diff --git a/src/uno.mobile-cross-targeting-disable.props b/src/uno.mobile-cross-targeting-disable.props
index df6580524534..caa5fc21a223 100644
--- a/src/uno.mobile-cross-targeting-disable.props
+++ b/src/uno.mobile-cross-targeting-disable.props
@@ -1,7 +1,7 @@
 <Project>
 	<!-- CI helper to split net8 and net9 builds and actually build on net8 the net8.0-* targets -->
 	<PropertyGroup Condition="'$(UnoDisableNetPreviousMobile)'=='true'">
-		<_UnoFilteredTargetFrameworks>$(TargetFrameworks.Replace('net8.0-ios17.0','').Replace('net8.0-android','').Replace('net8.0-maccatalyst','').Replace('net8.0-macos','').Trim(';'))</_UnoFilteredTargetFrameworks>
+		<_UnoFilteredTargetFrameworks>$(TargetFrameworks.Replace('net8.0-ios17.0','').Replace('net8.0-android','').Replace('net8.0-maccatalyst17.0','').Replace('net8.0-macos','').Trim(';'))</_UnoFilteredTargetFrameworks>
 
 		<!--
 		Results from property functions are escaped, causing itemgroup inclusion to be
@@ -11,7 +11,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(UnoDisableNetCurrentMobile)'=='true'">
-		<_UnoFilteredTargetFrameworks>$(TargetFrameworks.Replace('net9.0-ios17.2','').Replace('net9.0-android','').Replace('net9.0-maccatalyst','').Replace('net9.0-macos','').Trim(';'))</_UnoFilteredTargetFrameworks>
+		<_UnoFilteredTargetFrameworks>$(TargetFrameworks.Replace('net9.0-ios17.2','').Replace('net9.0-android','').Replace('net9.0-maccatalyst17.2','').Replace('net9.0-macos','').Trim(';'))</_UnoFilteredTargetFrameworks>
 
 		<!--
 		Results from property functions are escaped, causing itemgroup inclusion to be