Migrate UWP to net9.0; Bump versions

Author: ryancheung

FNA.NET.UWP.csproj

@@ -1,12 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>uap10.0</TargetFramework>
-		<DefineConstants>WINDOWS_UAP;</DefineConstants>
-		<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-		<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-		<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
-		<TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
-		<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+		<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+		<UseUwp>true</UseUwp>
+		<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
 	</PropertyGroup>
 	<PropertyGroup>
 		<EnableDefaultItems>false</EnableDefaultItems>
@@ -394,9 +391,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FNA.NET.NativeAssets.UWP" Version="1.0.6.2403" />
+		<PackageReference Include="FNA.NET.NativeAssets.UWP" Version="1.1.0.2403" />
 		<PackageReference Include="NVorbis" Version="0.10.5" />
-		<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
 	</ItemGroup>
 
 	<PropertyGroup>
@@ -409,7 +405,7 @@
 		<PackageTags>fna;xna;net8</PackageTags>
 		<PackageId>FNA.NET.UWP</PackageId>
 		<Copyright>Copyright 2025 FNA-NET</Copyright>
-		<VersionPrefix>2.0.1.2506</VersionPrefix>
+		<VersionPrefix>2.1.0.2506</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
 

FNA.NET.csproj

@@ -426,7 +426,7 @@
 		<PackageTags>fna;xna;net8</PackageTags>
 		<PackageId>FNA.NET</PackageId>
 		<Copyright>Copyright 2025 FNA-NET</Copyright>
-		<VersionPrefix>2.0.1.2506</VersionPrefix>
+		<VersionPrefix>2.1.0.2506</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
 

src/FNAPlatform/FNAPlatform.cs

@@ -37,7 +37,7 @@ static FNAPlatform()
 			 */
 
 			bool useSDL2 = Environment.GetEnvironmentVariable("FNA_PLATFORM_BACKEND") == "SDL2";
-#if WINDOWS_UAP
+#if WINDOWS10_0_17763_0_OR_GREATER
 			useSDL2 = true;
 #endif
 

src/Input/TextInputEXT.cs

@@ -43,7 +43,7 @@ public static IntPtr WindowHandle
 			get => windowHandle;
 			set
 			{
-#if WINDOWS7_0_OR_GREATER
+#if WINDOWS7_0_OR_GREATER && !WINDOWS10_0_17763_0_OR_GREATER
 				if (value != IntPtr.Zero && windowHandle != value)
 					AdvancedImeInit(value);
 #endif
@@ -65,7 +65,7 @@ public static IntPtr WindowHandle
 		/// <returns>True if text input state is active</returns>
 		public static bool IsTextInputActive()
 		{
-#if WINDOWS7_0_OR_GREATER
+#if WINDOWS7_0_OR_GREATER && !WINDOWS10_0_17763_0_OR_GREATER
 			return ImeSharp.InputMethod.Enabled;
 #else
 			return FNAPlatform.IsTextInputActive(WindowHandle);
@@ -84,7 +84,7 @@ public static bool IsScreenKeyboardShown(IntPtr window)
 
 		public static void StartTextInput()
 		{
-#if WINDOWS7_0_OR_GREATER
+#if WINDOWS7_0_OR_GREATER && !WINDOWS10_0_17763_0_OR_GREATER
 			// Need to ensure SDL2 text input is stopped
 			FNAPlatform.StopTextInput(WindowHandle);
 			ImeSharp.InputMethod.Enabled = true;
@@ -95,7 +95,7 @@ public static void StartTextInput()
 
 		public static void StopTextInput()
 		{
-#if WINDOWS7_0_OR_GREATER
+#if WINDOWS7_0_OR_GREATER && !WINDOWS10_0_17763_0_OR_GREATER
 			ImeSharp.InputMethod.Enabled = false;
 #else
 			FNAPlatform.StopTextInput(WindowHandle);
@@ -109,7 +109,7 @@ public static void StopTextInput()
 		/// <param name="rectangle">Text input location relative to GameWindow.ClientBounds</param>
 		public static void SetInputRectangle(Rectangle rectangle)
 		{
-#if WINDOWS7_0_OR_GREATER
+#if WINDOWS7_0_OR_GREATER && !WINDOWS10_0_17763_0_OR_GREATER
 			if (ImeSharp.InputMethod.Enabled)
 				ImeSharp.InputMethod.SetTextInputRect(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height);
 #else
@@ -139,7 +139,7 @@ internal static void OnTextEditing(string text, int start, int length)
 
 		#endregion
 
-#if WINDOWS7_0_OR_GREATER
+#if WINDOWS7_0_OR_GREATER && !WINDOWS10_0_17763_0_OR_GREATER
 		internal static void AdvancedImeInit(IntPtr sdlWindowHandle)
 		{
 			var windowProps = SDL3.SDL.SDL_GetWindowProperties(sdlWindowHandle);