From c7c8b808dbbf936bfc6eab7f7523c9963fd6f204 Mon Sep 17 00:00:00 2001
From: Morten Nielsen <mnielsen@esri.com>
Date: Tue, 5 Dec 2023 20:18:35 -0800
Subject: [PATCH] v.200.3

* Upgrade to .NET 8
* Update to 200.3
* Fix artoolkit build
---
 .../ARToolkit.SampleApp.Android.csproj        |  4 +-
 .../ARToolkit.SampleApp.UWP.csproj            |  2 +-
 .../ARToolkit.SampleApp.iOS.csproj            |  4 +-
 .../ARToolkit.Samples.Maui.csproj             | 90 +++++++++----------
 .../Esri.ArcGISRuntime.ARToolkit.Maui.csproj  |  6 +-
 src/ARToolkit/ARSceneView.Android.cs          |  6 +-
 .../Esri.ArcGISRuntime.ARToolkit.csproj       | 23 +++--
 src/Directory.Build.props                     | 30 +------
 .../Samples/OverviewMapSample.xaml.cs         |  3 +-
 .../Samples/PopupViewerSample.xaml.cs         |  4 +-
 .../Toolkit.SampleApp.Maui.csproj             | 10 +--
 .../Toolkit.Samples.UWP.csproj                |  2 +-
 .../Toolkit.SampleApp.WPF.csproj              |  6 +-
 .../Package.appxmanifest                      |  8 +-
 .../Toolkit.SampleApp.WinUI.csproj            |  8 +-
 src/version.json                              |  2 +-
 16 files changed, 93 insertions(+), 115 deletions(-)

diff --git a/src/ARSamples/ARToolkit.SampleApp.Android/ARToolkit.SampleApp.Android.csproj b/src/ARSamples/ARToolkit.SampleApp.Android/ARToolkit.SampleApp.Android.csproj
index 839518cd7..53c4ba7e1 100644
--- a/src/ARSamples/ARToolkit.SampleApp.Android/ARToolkit.SampleApp.Android.csproj
+++ b/src/ARSamples/ARToolkit.SampleApp.Android/ARToolkit.SampleApp.Android.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-android</TargetFramework>
+    <TargetFramework>net8.0-android</TargetFramework>
     <SupportedOSPlatformVersion>26</SupportedOSPlatformVersion>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
@@ -25,6 +25,6 @@
   </Choose>
   <Import Project="..\SampleHelpers\SampleHelpers.projitems" Label="Shared" />
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.4.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.6" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/ARSamples/ARToolkit.SampleApp.UWP/ARToolkit.SampleApp.UWP.csproj b/src/ARSamples/ARToolkit.SampleApp.UWP/ARToolkit.SampleApp.UWP.csproj
index ad9e56cbd..6154e07cf 100644
--- a/src/ARSamples/ARToolkit.SampleApp.UWP/ARToolkit.SampleApp.UWP.csproj
+++ b/src/ARSamples/ARToolkit.SampleApp.UWP/ARToolkit.SampleApp.UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>ARToolkit.SampleApp.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.$(ArcGIS_MinimumSupportedWindowsBuild).0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
diff --git a/src/ARSamples/ARToolkit.SampleApp.iOS/ARToolkit.SampleApp.iOS.csproj b/src/ARSamples/ARToolkit.SampleApp.iOS/ARToolkit.SampleApp.iOS.csproj
index f24256213..a3eb77451 100644
--- a/src/ARSamples/ARToolkit.SampleApp.iOS/ARToolkit.SampleApp.iOS.csproj
+++ b/src/ARSamples/ARToolkit.SampleApp.iOS/ARToolkit.SampleApp.iOS.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-ios</TargetFramework>
+    <TargetFramework>net8.0-ios</TargetFramework>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
-    <SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion>15.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <Choose>
diff --git a/src/ARSamples/ARToolkit.Samples.Maui/ARToolkit.Samples.Maui.csproj b/src/ARSamples/ARToolkit.Samples.Maui/ARToolkit.Samples.Maui.csproj
index 0be5b22ea..99f342bc2 100644
--- a/src/ARSamples/ARToolkit.Samples.Maui/ARToolkit.Samples.Maui.csproj
+++ b/src/ARSamples/ARToolkit.Samples.Maui/ARToolkit.Samples.Maui.csproj
@@ -1,49 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
-		<OutputType>Exe</OutputType>
-		<RootNamespace>ARToolkit.Samples.Maui</RootNamespace>
-		<UseMaui>true</UseMaui>
-		<SingleProject>true</SingleProject>
-		<ImplicitUsings>enable</ImplicitUsings>
-    <LangVersion>10</LangVersion>
-
-		<!-- Display name -->
-		<ApplicationTitle>ARToolkit.Maui</ApplicationTitle>
-
-		<!-- App Identifier -->
-		<ApplicationId>com.esri.artoolkit.samples.maui</ApplicationId>
-		<ApplicationIdGuid>6BA8F463-E9A3-4E0C-AA27-54A3CB931C0C</ApplicationIdGuid>
-
-		<!-- Versions -->
-		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
-		<ApplicationVersion>1</ApplicationVersion>
-
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<!-- App Icon -->
-		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
-
-		<!-- Splash Screen -->
-		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
-
-		<!-- Images -->
-		<MauiImage Include="Resources\Images\*" />
-		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
-
-		<!-- Custom Fonts -->
-		<MauiFont Include="Resources\Fonts\*" />
-
-		<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
-		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
-	</ItemGroup>
+    <PropertyGroup>
+        <TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
+        <OutputType>Exe</OutputType>
+        <RootNamespace>ARToolkit.Samples.Maui</RootNamespace>
+        <UseMaui>true</UseMaui>
+        <SingleProject>true</SingleProject>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <LangVersion>10</LangVersion>
+
+        <!-- Display name -->
+        <ApplicationTitle>ARToolkit.Maui</ApplicationTitle>
+
+        <!-- App Identifier -->
+        <ApplicationId>com.esri.artoolkit.samples.maui</ApplicationId>
+        <ApplicationIdGuid>6BA8F463-E9A3-4E0C-AA27-54A3CB931C0C</ApplicationIdGuid>
+
+        <!-- Versions -->
+        <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+        <ApplicationVersion>1</ApplicationVersion>
+
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
+        <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
+        <DefineConstants>$(DefineConstants);MAUI</DefineConstants>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <!-- App Icon -->
+        <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+
+        <!-- Splash Screen -->
+        <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
+
+        <!-- Images -->
+        <MauiImage Include="Resources\Images\*" />
+        <MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
+
+        <!-- Custom Fonts -->
+        <MauiFont Include="Resources\Fonts\*" />
+
+        <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
+        <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
+    </ItemGroup>
 
   <Choose>
     <When Condition="'$(UseNugetPackage)'==''">
@@ -57,6 +57,6 @@
       </ItemGroup>
     </Otherwise>
   </Choose>
-	<Import Project="..\SampleHelpers\SampleHelpers.projitems" Label="Shared" />
+    <Import Project="..\SampleHelpers\SampleHelpers.projitems" Label="Shared" />
 
 </Project>
diff --git a/src/ARToolkit.Maui/Esri.ArcGISRuntime.ARToolkit.Maui.csproj b/src/ARToolkit.Maui/Esri.ArcGISRuntime.ARToolkit.Maui.csproj
index d36656a1a..210aeb2ae 100644
--- a/src/ARToolkit.Maui/Esri.ArcGISRuntime.ARToolkit.Maui.csproj
+++ b/src/ARToolkit.Maui/Esri.ArcGISRuntime.ARToolkit.Maui.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;$(NetAndroidTargetFramework);$(NetiOSTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>net8.0;$(NetAndroidTargetFramework);$(NetiOSTargetFramework)</TargetFrameworks>
     <Description>ArcGIS Maps SDK for .NET Augmented Reality (AR) controls and utilities for .NET MAUI apps including .NET for Android and .NET for iOS</Description>
     <PackageTags>ArcGIS Cartography Geo Geographic Geography Geolocation Geospatial GIS Latitude Location Longitude Map Mapping Maps Places Spatial Augmented Reality AR 3D .NET MAUI Android iOS toolkit</PackageTags>
     <UseMaui>true</UseMaui>
@@ -9,13 +9,13 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>10</LangVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
     <NoWarn>$(NoWarn);ESRI8000</NoWarn>
     <AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/ARToolkit/ARSceneView.Android.cs b/src/ARToolkit/ARSceneView.Android.cs
index a3755edc2..ce5735ed0 100644
--- a/src/ARToolkit/ARSceneView.Android.cs
+++ b/src/ARToolkit/ARSceneView.Android.cs
@@ -19,8 +19,8 @@
 using System.Threading.Tasks;
 using Android.Content;
 using Android.Runtime;
-using Android.Support.V4.App;
-using Android.Support.V4.Content;
+using AndroidX.Core.App;
+using AndroidX.Core.Content;
 using Esri.ArcGISRuntime.Mapping;
 using Esri.ArcGISRuntime.UI.Controls;
 using Google.AR.Core;
@@ -249,7 +249,7 @@ private void StartArCoreSession()
                 throw new NotSupportedException("Context must be an instance of Activity");
             }
 
-            if(IsUsingARCore && RenderVideoFeed && ContextCompat.CheckSelfPermission(activity, Android.Manifest.Permission.Camera) != Android.Content.PM.Permission.Granted)
+            if(IsUsingARCore && RenderVideoFeed && AndroidX.Core.Content.ContextCompat.CheckSelfPermission(activity, Android.Manifest.Permission.Camera) != Android.Content.PM.Permission.Granted)
             {
                 ActivityCompat.RequestPermissions(activity, new string[] { Android.Manifest.Permission.Camera }, 0);
                 return;
diff --git a/src/ARToolkit/Esri.ArcGISRuntime.ARToolkit.csproj b/src/ARToolkit/Esri.ArcGISRuntime.ARToolkit.csproj
index 5238af743..0cf00a38d 100644
--- a/src/ARToolkit/Esri.ArcGISRuntime.ARToolkit.csproj
+++ b/src/ARToolkit/Esri.ArcGISRuntime.ARToolkit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;$(NetAndroidTargetFramework);$(NetiOSTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;$(NetAndroidTargetFramework);$(NetiOSTargetFramework)</TargetFrameworks>
     <Description>ArcGIS Maps SDK for .NET Augmented Reality (AR) controls and utilities for .NET Android and .NET iOS apps.</Description>
     <PackageTags>ArcGIS Cartography Geo Geographic Geography Geolocation Geospatial GIS Latitude Location Longitude Map Mapping Maps Places Spatial Augmented Reality AR 3D .NET Android iOS toolkit</PackageTags>
     <RootNamespace>Esri.ArcGISRuntime.ARToolkit</RootNamespace>
@@ -10,12 +10,12 @@
     <Platforms>AnyCPU</Platforms>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
-    <SupportedOSPlatformVersion Condition="'$(TargetFramework)' == '$(NetiOSTargetFramework)'">14.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="'$(TargetFramework)' == '$(NetAndroidTargetFramework)'">26.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
     <NoWarn>$(NoWarn);ESRI8000</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 
@@ -26,23 +26,22 @@
     <None Remove="Resources\**\*.*" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == '$(NetAndroidTargetFramework)'">
-    <PackageReference Include="Esri.ArcGISRuntime.Xamarin.Android" Version="$(ArcGISRuntimePackageVersion)" Condition="'$(ArcGISRuntimePackageVersion)'=='100.15.0'" />
-    <PackageReference Include="Esri.ArcGISRuntime.Android" Version="$(ArcGISRuntimePackageVersion)" Condition="'$(ArcGISRuntimePackageVersion)'!='100.15.0'" />
+  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
+    <PackageReference Include="Esri.ArcGISRuntime.Android" Version="$(ArcGISRuntimePackageVersion)" />
     <PackageReference Include="Xamarin.Google.ARCore" Version="1.29.0" />
     <!--<PackageReference Include="Xamarin.Android.SceneForm.Base" Version="1.11.0" />-->
     <PackageReference Include="Xamarin.Android.SceneForm.UX" Version="1.17.1" />
+    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.4.1.1" />
     <AndroidResource Include="Resources\**\*.xml">
       <Generator>MSBuild:UpdateGeneratedFiles</Generator>
     </AndroidResource>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == '$(NetiOSTargetFramework)'">
-    <PackageReference Include="Esri.ArcGISRuntime.Xamarin.iOS" Version="$(ArcGISRuntimePackageVersion)" Condition="'$(ArcGISRuntimePackageVersion)'=='100.15.0'" />
-	<PackageReference Include="Esri.ArcGISRuntime.iOS" Version="$(ArcGISRuntimePackageVersion)" Condition="'$(ArcGISRuntimePackageVersion)'!='100.15.0'" />
+  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
+	<PackageReference Include="Esri.ArcGISRuntime.iOS" Version="$(ArcGISRuntimePackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net8.0'">
      <PackageReference Include="Esri.ArcGISRuntime" Version="$(ArcGISRuntimePackageVersion)" />
   </ItemGroup>
 
@@ -50,7 +49,7 @@
     <None Remove="GridDot.png" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == '$(NetiOSTargetFramework)'">
+  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
     <EmbeddedResource Include="GridDot.png" />
   </ItemGroup>
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 16a1cf1da..3f85bef49 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <ArcGISRuntimeToolkitPackageVersion Condition="'$(ArcGISRuntimeToolkitPackageVersion)'==''">200.2.0</ArcGISRuntimeToolkitPackageVersion>
-    <ArcGISRuntimePackageVersion Condition="'$(ArcGISRuntimePackageVersion)'==''">200.2.0</ArcGISRuntimePackageVersion>
+    <ArcGISRuntimeToolkitPackageVersion Condition="'$(ArcGISRuntimeToolkitPackageVersion)'==''">200.3.0</ArcGISRuntimeToolkitPackageVersion>
+    <ArcGISRuntimePackageVersion Condition="'$(ArcGISRuntimePackageVersion)'==''">200.3.0</ArcGISRuntimePackageVersion>
 
     <!--Common package properties-->
     <Authors>Esri Inc.</Authors>
@@ -32,23 +32,8 @@
     <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>
-    <UWPTargetPlatformMinVersion>10.0.$(ArcGISRuntime_MinimumSupportedWindowsBuild).0</UWPTargetPlatformMinVersion>
-    <DotNetTargetFramework>net472</DotNetTargetFramework>
-    <UWPTargetFramework>uap10.0.$(WindowsSDKTargetBuild)</UWPTargetFramework>
-    <NetWindowsTargetFramework Condition="'$(NetWindowsTargetFramework)'==''">net6.0-windows10.0.$(WindowsSDKTargetBuild).0</NetWindowsTargetFramework>
-    <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>  
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(ArcGISRuntimePackageVersion)'&gt;='200.3.0'">
+  <!--Framework versions-->
+  <PropertyGroup>
     <ArcGISRuntime_MinimumSupportedWindowsBuild Condition="'$(ArcGISRuntime_MinimumSupportedWindowsBuild)'==''">19041</ArcGISRuntime_MinimumSupportedWindowsBuild>
     <WindowsSDKTargetBuild Condition="'$(WindowsSDKTargetBuild)'==''">19041</WindowsSDKTargetBuild>
     <UWPTargetPlatformVersion>10.0.$(WindowsSDKTargetBuild).0</UWPTargetPlatformVersion>
@@ -110,13 +95,6 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework.StartsWith(&quot;net6.0-windows&quot;))'=='true' AND '$(UseWPF)'=='true'">
-    <!-- Workaround for https://github.com/dotnet/core/issues/7176 - only applies to .NET 6 (not NET7+) -->
-    <FrameworkReference
-        Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms"
-        TargetingPackVersion="6.0.0" />
-  </ItemGroup>
-
     <!--
     // This task disable doc warnings in the auto-generated XamlTypeInfo.g.cs file,
     // and also hides the public class from intellisense.
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Samples/OverviewMapSample.xaml.cs b/src/Samples/Toolkit.SampleApp.Maui/Samples/OverviewMapSample.xaml.cs
index 793c59952..254dad6ec 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Samples/OverviewMapSample.xaml.cs
+++ b/src/Samples/Toolkit.SampleApp.Maui/Samples/OverviewMapSample.xaml.cs
@@ -25,7 +25,8 @@ private void Slider_ValueChanged(object? sender, ValueChangedEventArgs e)
             if (MyMapView.IsVisible == true)
             {
                 var vp = MyMapView.GetCurrentViewpoint(ViewpointType.CenterAndScale);
-                MyMapView.SetViewpoint(new Viewpoint(vp.TargetGeometry, e.NewValue));
+                if (vp != null)
+                    MyMapView.SetViewpoint(new Viewpoint(vp.TargetGeometry, e.NewValue));
             }
             else
             {
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Samples/PopupViewerSample.xaml.cs b/src/Samples/Toolkit.SampleApp.Maui/Samples/PopupViewerSample.xaml.cs
index 4c8120d60..4abe4e9c4 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Samples/PopupViewerSample.xaml.cs
+++ b/src/Samples/Toolkit.SampleApp.Maui/Samples/PopupViewerSample.xaml.cs
@@ -44,7 +44,7 @@ private async void mapView_GeoViewTapped(object? sender, GeoViewInputEventArgs e
                 await DisplayAlert(error.GetType().Name, error.Message, "OK");
         }
 
-        private Popup GetPopup(IdentifyLayerResult result)
+        private Popup? GetPopup(IdentifyLayerResult result)
         {
             if (result == null)
             {
@@ -75,7 +75,7 @@ private Popup GetPopup(IdentifyLayerResult result)
             return null;
         }
 
-        private Popup GetPopup(IEnumerable<IdentifyLayerResult> results)
+        private Popup? GetPopup(IEnumerable<IdentifyLayerResult> results)
         {
             if (results == null)
             {
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj b/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj
index c3fd15ed5..e6f899474 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj
+++ b/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj
@@ -21,11 +21,11 @@
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <ApplicationVersion>1</ApplicationVersion>
 
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-    <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -54,8 +54,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+    <PackageReference Include="CommunityToolkit.Maui" Version="7.0.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net8.0'))">
diff --git a/src/Samples/Toolkit.SampleApp.UWP/Toolkit.Samples.UWP.csproj b/src/Samples/Toolkit.SampleApp.UWP/Toolkit.Samples.UWP.csproj
index 7a2959650..a9998b148 100644
--- a/src/Samples/Toolkit.SampleApp.UWP/Toolkit.Samples.UWP.csproj
+++ b/src/Samples/Toolkit.SampleApp.UWP/Toolkit.Samples.UWP.csproj
@@ -12,7 +12,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>15</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
diff --git a/src/Samples/Toolkit.SampleApp.WPF/Toolkit.SampleApp.WPF.csproj b/src/Samples/Toolkit.SampleApp.WPF/Toolkit.SampleApp.WPF.csproj
index 972c56a7c..b1abc4f89 100644
--- a/src/Samples/Toolkit.SampleApp.WPF/Toolkit.SampleApp.WPF.csproj
+++ b/src/Samples/Toolkit.SampleApp.WPF/Toolkit.SampleApp.WPF.csproj
@@ -13,8 +13,8 @@
       <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETCoreApp'">
-    <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>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <UseRidGraph>true</UseRidGraph>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,7 +24,7 @@
   </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
         <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     </ItemGroup>
 
diff --git a/src/Samples/Toolkit.SampleApp.WinUI/Package.appxmanifest b/src/Samples/Toolkit.SampleApp.WinUI/Package.appxmanifest
index 1a3da97de..7c24a17d8 100644
--- a/src/Samples/Toolkit.SampleApp.WinUI/Package.appxmanifest
+++ b/src/Samples/Toolkit.SampleApp.WinUI/Package.appxmanifest
@@ -8,18 +8,18 @@
 
   <Identity
     Name="1a3f5c3d-27ca-45dd-bbe3-5e2fad821f9d"
-    Publisher="CN=mn"
+    Publisher="CN=Esri"
     Version="1.0.0.0" />
 
   <Properties>
     <DisplayName>Toolkit.SampleApp.WinUI</DisplayName>
-    <PublisherDisplayName>mn</PublisherDisplayName>
+    <PublisherDisplayName>Esri</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.19041.0" />
   </Dependencies>
 
   <Resources>
diff --git a/src/Samples/Toolkit.SampleApp.WinUI/Toolkit.SampleApp.WinUI.csproj b/src/Samples/Toolkit.SampleApp.WinUI/Toolkit.SampleApp.WinUI.csproj
index 43b4429b8..7821d2a35 100644
--- a/src/Samples/Toolkit.SampleApp.WinUI/Toolkit.SampleApp.WinUI.csproj
+++ b/src/Samples/Toolkit.SampleApp.WinUI/Toolkit.SampleApp.WinUI.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>$(NetWindowsTargetFramework)</TargetFramework>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <RootNamespace>Esri.ArcGISRuntime.Toolkit.SampleApp</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;arm64</Platforms>
@@ -11,7 +11,7 @@
     <UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
     <DefineConstants>$(DefineConstants);WINUI</DefineConstants>
-    <UseRidGraph Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net8.0'))">true</UseRidGraph>
+    <UseRidGraph>true</UseRidGraph>
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,8 +30,8 @@
     <PackageReference Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.4" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
diff --git a/src/version.json b/src/version.json
index d7122fef5..3922ab5fd 100644
--- a/src/version.json
+++ b/src/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "200.2.0-{height}",
+  "version": "200.3.0-{height}",
   "publicReleaseRefSpec": [
     "^refs/tags/v\\d+\\.\\d+" // we release out of tags starting with vN.N
   ],