From ad8ab1e426b3830484875b11571492a6de96af47 Mon Sep 17 00:00:00 2001
From: Morten Nielsen <mn@iter.dk>
Date: Fri, 6 Oct 2023 12:10:54 -0700
Subject: [PATCH] Allow building samples for .NET 8

---
 src/Directory.Build.props                     | 21 ++++++++++++++++++-
 .../Toolkit.SampleApp.Maui.csproj             |  2 +-
 .../Toolkit.SampleApp.WPF.csproj              |  3 ++-
 .../Toolkit.SampleApp.WinUI.csproj            |  3 ++-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 1ffa680f1..77da0797f 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -30,8 +30,10 @@
     
     <IsToolkitLibrary Condition="'$(IsTestProject)' == 'true' or '$(IsSampleProject)' == 'true' or $(IsTemplateProject) == 'true'">false</IsToolkitLibrary>
     <IsToolkitLibrary Condition="'$(IsTestProject)' != 'true' and '$(IsSampleProject)' != 'true' and $(IsTemplateProject) != 'true'">true</IsToolkitLibrary>
+  </PropertyGroup>
 
     <!--Framework versions-->
+  <PropertyGroup Condition="'$(ArcGISRuntimePackageVersion)'&lt;'200.3.0'">
     <ArcGISRuntime_MinimumSupportedWindowsBuild Condition="'$(ArcGISRuntime_MinimumSupportedWindowsBuild)'==''">17763</ArcGISRuntime_MinimumSupportedWindowsBuild>
     <WindowsSDKTargetBuild Condition="'$(WindowsSDKTargetBuild)'==''">19041</WindowsSDKTargetBuild>
     <UWPTargetPlatformVersion>10.0.$(WindowsSDKTargetBuild).0</UWPTargetPlatformVersion>
@@ -43,7 +45,24 @@
     <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>
+    <NetiOSTargetFramework Condition="'$(NetiOSTargetFramework)'==''">$(NETMauiTarget)-ios16.1</NetiOSTargetFramework>  
+  </PropertyGroup>
+  
+  <PropertyGroup Condition="'$(ArcGISRuntimePackageVersion)'&gt;='200.3.0'">
+    <ArcGISRuntime_MinimumSupportedWindowsBuild Condition="'$(ArcGISRuntime_MinimumSupportedWindowsBuild)'==''">19041</ArcGISRuntime_MinimumSupportedWindowsBuild>
+    <WindowsSDKTargetBuild Condition="'$(WindowsSDKTargetBuild)'==''">19041</WindowsSDKTargetBuild>
+    <UWPTargetPlatformVersion>10.0.$(WindowsSDKTargetBuild).0</UWPTargetPlatformVersion>
+    <UWPTargetPlatformMinVersion>10.0.$(ArcGISRuntime_MinimumSupportedWindowsBuild).0</UWPTargetPlatformMinVersion>
+    <DotNetTargetFramework>net472</DotNetTargetFramework>
+    <UWPTargetFramework>uap10.0.$(WindowsSDKTargetBuild)</UWPTargetFramework>
+    <NetWindowsTargetFramework Condition="'$(NetWindowsTargetFramework)'==''">net8.0-windows10.0.$(WindowsSDKTargetBuild).0</NetWindowsTargetFramework>
+    <NETMauiTarget Condition="'$(NETMauiTarget)'==''">net8.0</NETMauiTarget>
+    <NetMauiWindowsTargetFramework Condition="'$(NetMauiWindowsTargetFramework)'==''">$(NETMauiTarget)-windows10.0.$(WindowsSDKTargetBuild).0</NetMauiWindowsTargetFramework>
+    <NetAndroidTargetFramework Condition="'$(NetAndroidTargetFramework)'==''">$(NETMauiTarget)-android34.0</NetAndroidTargetFramework>
+    <NetCatalystTargetFramework Condition="'$(NetCatalystTargetFramework)'==''">$(NETMauiTarget)-maccatalyst16.1</NetCatalystTargetFramework>
+    <NetiOSTargetFramework Condition="'$(NetiOSTargetFramework)'==''">$(NETMauiTarget)-ios16.1</NetiOSTargetFramework>  
+  </PropertyGroup>
+  <PropertyGroup>
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
 
     <!--Output paths-->
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj b/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj
index 127f18b7a..d09653fc2 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj
+++ b/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks>$(NETMauiTarget)-android;$(NETMauiTarget)-ios;$(NETMauiTarget)-maccatalyst</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetMauiWindowsTargetFramework)</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>Toolkit.SampleApp.Maui</RootNamespace>
diff --git a/src/Samples/Toolkit.SampleApp.WPF/Toolkit.SampleApp.WPF.csproj b/src/Samples/Toolkit.SampleApp.WPF/Toolkit.SampleApp.WPF.csproj
index e77c4a627..1871cd0fd 100644
--- a/src/Samples/Toolkit.SampleApp.WPF/Toolkit.SampleApp.WPF.csproj
+++ b/src/Samples/Toolkit.SampleApp.WPF/Toolkit.SampleApp.WPF.csproj
@@ -13,7 +13,8 @@
       <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETCoreApp'">
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="'$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), &quot;net8.0&quot;))'!='true'">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net8.0'))">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Samples/Toolkit.SampleApp.WinUI/Toolkit.SampleApp.WinUI.csproj b/src/Samples/Toolkit.SampleApp.WinUI/Toolkit.SampleApp.WinUI.csproj
index 4836cc42f..43b4429b8 100644
--- a/src/Samples/Toolkit.SampleApp.WinUI/Toolkit.SampleApp.WinUI.csproj
+++ b/src/Samples/Toolkit.SampleApp.WinUI/Toolkit.SampleApp.WinUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>$(NetWindowsTargetFramework)</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>Esri.ArcGISRuntime.Toolkit.SampleApp</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -11,6 +11,7 @@
     <UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
     <DefineConstants>$(DefineConstants);WINUI</DefineConstants>
+    <UseRidGraph Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net8.0'))">true</UseRidGraph>
   </PropertyGroup>
 
   <ItemGroup>