From 1c5ece0c7b5235eb97e188a4e2689939da0469a7 Mon Sep 17 00:00:00 2001
From: Morten Nielsen <mnielsen@esri.com>
Date: Thu, 21 Sep 2023 23:49:09 -0700
Subject: [PATCH 1/2] Add support for TFM override in MAUI

---
 src/Directory.Build.props                                | 9 +++++----
 .../Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index bc42de462..2a0dcdde2 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -38,10 +38,11 @@
     <DotNetTargetFramework>net472</DotNetTargetFramework>
     <UWPTargetFramework>uap10.0.$(WindowsSDKTargetBuild)</UWPTargetFramework>
     <NetWindowsTargetFramework Condition="'$(NetWindowsTargetFramework)'==''">net6.0-windows10.0.$(WindowsSDKTargetBuild).0</NetWindowsTargetFramework>
-    <NetMauiWindowsTargetFramework Condition="'$(NetMauiWindowsTargetFramework)'==''">net7.0-windows10.0.$(WindowsSDKTargetBuild).0</NetMauiWindowsTargetFramework>
-    <NetAndroidTargetFramework Condition="'$(NetAndroidTargetFramework)'==''">net7.0-android33.0</NetAndroidTargetFramework>
-    <NetCatalystTargetFramework Condition="'$(NetCatalystTargetFramework)'==''">net7.0-maccatalyst16.1</NetCatalystTargetFramework>
-    <NetiOSTargetFramework Condition="'$(NetiOSTargetFramework)'==''">net7.0-ios16.1</NetiOSTargetFramework>
+	<NETMauiTarget Condition="'$(NETMauiTarget)'==''">net7.0</NETMauiTarget>
+    <NetMauiWindowsTargetFramework Condition="'$(NetMauiWindowsTargetFramework)'==''">$(NETMauiTarget)-windows10.0.$(WindowsSDKTargetBuild).0</NetMauiWindowsTargetFramework>
+    <NetAndroidTargetFramework Condition="'$(NetAndroidTargetFramework)'==''">$(NETMauiTarget)-android33.0</NetAndroidTargetFramework>
+    <NetCatalystTargetFramework Condition="'$(NetCatalystTargetFramework)'==''">$(NETMauiTarget)-maccatalyst16.1</NetCatalystTargetFramework>
+    <NetiOSTargetFramework Condition="'$(NetiOSTargetFramework)'==''">$(NETMauiTarget)-ios16.1</NetiOSTargetFramework>
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
 
     <!--Output paths-->
diff --git a/src/Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj b/src/Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj
index 2dc5adb9f..2862e5b5c 100644
--- a/src/Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj
+++ b/src/Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net7.0;$(NetAndroidTargetFramework);$(NetiOSTargetFramework);$(NetCatalystTargetFramework)</TargetFrameworks>
+        <TargetFrameworks>$(NETMauiTarget);$(NetAndroidTargetFramework);$(NetiOSTargetFramework);$(NetCatalystTargetFramework)</TargetFrameworks>
         <Description>ArcGIS Maps SDK for .NET controls and utilities for .NET MAUI apps including .NET for Android, .NET for iOS, .NET for macOS, or Windows UI 3 (WinUI 3)</Description>
         <PackageTags>ArcGIS Cartography Geo Geographic Geography Geolocation Geospatial GIS Latitude Location Longitude Map Mapping Maps Places Spatial 3D WinUI Android iOS Mac Catalyst MacCatalyst Windows UI 3 toolkit</PackageTags>
         <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetMauiWindowsTargetFramework)</TargetFrameworks>

From 273fb57f3e71a4c13b3b1cd3cd6b17d80999f320 Mon Sep 17 00:00:00 2001
From: Morten Nielsen <mnielsen@esri.com>
Date: Thu, 21 Sep 2023 23:50:08 -0700
Subject: [PATCH 2/2] Fix indent

---
 src/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 2a0dcdde2..3aaa7dbfb 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -38,7 +38,7 @@
     <DotNetTargetFramework>net472</DotNetTargetFramework>
     <UWPTargetFramework>uap10.0.$(WindowsSDKTargetBuild)</UWPTargetFramework>
     <NetWindowsTargetFramework Condition="'$(NetWindowsTargetFramework)'==''">net6.0-windows10.0.$(WindowsSDKTargetBuild).0</NetWindowsTargetFramework>
-	<NETMauiTarget Condition="'$(NETMauiTarget)'==''">net7.0</NETMauiTarget>
+    <NETMauiTarget Condition="'$(NETMauiTarget)'==''">net7.0</NETMauiTarget>
     <NetMauiWindowsTargetFramework Condition="'$(NetMauiWindowsTargetFramework)'==''">$(NETMauiTarget)-windows10.0.$(WindowsSDKTargetBuild).0</NetMauiWindowsTargetFramework>
     <NetAndroidTargetFramework Condition="'$(NetAndroidTargetFramework)'==''">$(NETMauiTarget)-android33.0</NetAndroidTargetFramework>
     <NetCatalystTargetFramework Condition="'$(NetCatalystTargetFramework)'==''">$(NETMauiTarget)-maccatalyst16.1</NetCatalystTargetFramework>