Dependencies version updates

rds1983 · Sep 19, 2024 · ab46853 · ab46853
1 parent 54cf6d8
commit ab46853
Show file tree

Hide file tree

Showing 31 changed files with 51 additions and 51 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,12 +7,13 @@
     <RootNamespace>Myra</RootNamespace>
     <Description>UI Library for MonoGame, FNA and Stride</Description>
     <VersionPrefix>1.5.6</VersionPrefix>
-    <XNAssetsVersion>0.7.1</XNAssetsVersion>
-    <FontStashSharpVersion>1.3.6</FontStashSharpVersion>
+    <XNAssetsVersion>0.7.3</XNAssetsVersion>
+    <FontStashSharpVersion>1.3.8</FontStashSharpVersion>
     <LangVersion>8.0</LangVersion>
     <InfoLundinMathVersion>1.2.6</InfoLundinMathVersion>
     <MonoGameVersion>3.8.0.1641</MonoGameVersion>
-    <AppMonoGameVersion>3.8.1.303</AppMonoGameVersion>
+    <AppMonoGameVersion>3.8.2.1105</AppMonoGameVersion>
     <StrideVersion>4.2.0.2067</StrideVersion>
+    <AppTargetFramework>net8.0</AppTargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/buildBinaryDistribution.ps1 b/buildBinaryDistribution.ps1
@@ -12,9 +12,9 @@ New-Item -ItemType directory -Path "ZipPackage\Assets\fonts"
 New-Item -ItemType directory -Path "ZipPackage\Assets\images"
 
 function Copy-Sample([string]$SampleName) {
-	Copy-Item -Path "samples\Myra.Samples.$SampleName\bin\MonoGame\Release\net6.0\Myra.Samples.$SampleName.exe" -Destination "ZipPackage"
-	Copy-Item -Path "samples\Myra.Samples.$SampleName\bin\MonoGame\Release\net6.0\Myra.Samples.$SampleName.dll" -Destination "ZipPackage"
-	Copy-Item -Path "samples\Myra.Samples.$SampleName\bin\MonoGame\Release\net6.0\Myra.Samples.$SampleName.runtimeconfig.json" -Destination "ZipPackage"
+	Copy-Item -Path "samples\Myra.Samples.$SampleName\bin\MonoGame\Release\net8.0\Myra.Samples.$SampleName.exe" -Destination "ZipPackage"
+	Copy-Item -Path "samples\Myra.Samples.$SampleName\bin\MonoGame\Release\net8.0\Myra.Samples.$SampleName.dll" -Destination "ZipPackage"
+	Copy-Item -Path "samples\Myra.Samples.$SampleName\bin\MonoGame\Release\net8.0\Myra.Samples.$SampleName.runtimeconfig.json" -Destination "ZipPackage"
 }
 
 # Copy-Item -Path files
@@ -34,20 +34,20 @@ Copy-Sample "ObjectEditor"
 Copy-Item -Path "samples\Myra.Samples.ObjectEditor\image.png" -Destination "ZipPackage"
 Copy-Sample "TextRendering"
 Copy-Item -Path "samples\Stylesheets\*" -Destination "ZipPackage\Stylesheets\" -Recurse
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\System.CodeDom.dll" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\MyraPad.exe" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\MyraPad.dll" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\MyraPad.runtimeconfig.json" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\FontStashSharp.*" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\StbImageSharp.dll" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\StbTrueTypeSharp.dll" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\Cyotek.Drawing.BitmapFont.dll" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\AssetManagementBase.dll" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\DdsKtxXna.dll" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\XNAssets.MonoGame.dll" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\info.lundin.math.dll" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\MonoGame.Framework.dll" -Destination "ZipPackage"
-Copy-Item -Path "src\MyraPad\bin\Release\net6.0\runtimes" -Destination "ZipPackage" -Recurse
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\System.CodeDom.dll" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\MyraPad.exe" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\MyraPad.dll" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\MyraPad.runtimeconfig.json" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\FontStashSharp.*" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\StbImageSharp.dll" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\StbTrueTypeSharp.dll" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\Cyotek.Drawing.BitmapFont.dll" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\AssetManagementBase.dll" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\DdsKtxXna.dll" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\XNAssets.MonoGame.dll" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\info.lundin.math.dll" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\MonoGame.Framework.dll" -Destination "ZipPackage"
+Copy-Item -Path "src\MyraPad\bin\Release\net8.0\runtimes" -Destination "ZipPackage" -Recurse
 
 # Compress
 Rename-Item "ZipPackage" "Myra.$version"

diff --git a/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.FNA.Core.csproj b/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.FNA.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\FNA.Core\$(Configuration)</OutputPath>
     <DefineConstants>$(DefineConstants);FNA;</DefineConstants>
   </PropertyGroup>

diff --git a/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.MonoGame.csproj b/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.MonoGame.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
     <DefineConstants>$(DefineConstants);MONOGAME</DefineConstants>
     <AssemblyName>Myra.Samples.AllWidgets</AssemblyName>

diff --git a/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.Stride.csproj b/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.Stride.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\Stride\$(Configuration)</OutputPath>
     <DefineConstants>$(DefineConstants);STRIDE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Stride.Engine" Version="4.2.0.2067" />
+    <PackageReference Include="Stride.Engine" Version="4.2.0.2188" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Myra.Samples.AndroidAllWidgets/Myra.Samples.AndroidAllWidgets.csproj b/samples/Myra.Samples.AndroidAllWidgets/Myra.Samples.AndroidAllWidgets.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-android</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)-android</TargetFramework>
     <SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
     <OutputType>Exe</OutputType>
     <DefineConstants>$(DefineConstants);MONOGAME;ANDROID</DefineConstants>

diff --git a/samples/Myra.Samples.AssetManagement/Myra.Samples.AssetManagement.csproj b/samples/Myra.Samples.AssetManagement/Myra.Samples.AssetManagement.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
   </PropertyGroup>
 

diff --git a/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.FNA.Core.csproj b/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.FNA.Core.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <AssemblyName>Myra.Samples.CustomUIStylesheet</AssemblyName>
     <RootNamespace>Myra.Samples.CustomUIStylesheet</RootNamespace>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\FNA.Core\$(Configuration)</OutputPath>
     <DefineConstants>$(DefineConstants);FNA</DefineConstants>
   </PropertyGroup>

diff --git a/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.MonoGame.csproj b/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.MonoGame.csproj
@@ -3,7 +3,7 @@
     <OutputType>WinExe</OutputType>
     <AssemblyName>Myra.Samples.CustomUIStylesheet</AssemblyName>
     <RootNamespace>Myra.Samples.CustomUIStylesheet</RootNamespace>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
   </PropertyGroup>
 

diff --git a/samples/Myra.Samples.CustomWidgets/Myra.Samples.CustomWidgets.csproj b/samples/Myra.Samples.CustomWidgets/Myra.Samples.CustomWidgets.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
   </PropertyGroup>
 

diff --git a/samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj b/samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
   </PropertyGroup>
 

diff --git a/samples/Myra.Samples.GridContainer/Myra.Samples.GridContainer.csproj b/samples/Myra.Samples.GridContainer/Myra.Samples.GridContainer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
   </PropertyGroup>
 

diff --git a/samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj b/samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
   </PropertyGroup>
 

diff --git a/samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj b/samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
   </PropertyGroup>
 

diff --git a/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.FNA.Core.csproj b/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.FNA.Core.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <AssemblyName>Myra.Samples.Notepad</AssemblyName>
     <RootNamespace>Myra.Samples.Notepad</RootNamespace>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <DefineConstants>$(DefineConstants);FNA;</DefineConstants>
     <OutputPath>bin\FNA.Core\$(Configuration)</OutputPath>
   </PropertyGroup>

diff --git a/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj b/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <AssemblyName>Myra.Samples.Notepad</AssemblyName>
     <RootNamespace>Myra.Samples.Notepad</RootNamespace>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
   </PropertyGroup>
 

diff --git a/samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj b/samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
   </PropertyGroup>
 

diff --git a/samples/Myra.Samples.PlatformAgnostic/Myra.Samples.PlatformAgnostic.csproj b/samples/Myra.Samples.PlatformAgnostic/Myra.Samples.PlatformAgnostic.csproj
@@ -3,7 +3,7 @@
     <OutputType>WinExe</OutputType>
     <AssemblyName>Myra.Samples.AllWidgets</AssemblyName>
     <RootNamespace>Myra.Samples.AllWidgets</RootNamespace>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <DefineConstants>$(DefineConstants);PLATFORM_AGNOSTIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>

diff --git a/samples/Myra.Samples.Silk.NET.TrippyGL/Myra.Samples.Silk.NET.TrippyGL.csproj b/samples/Myra.Samples.Silk.NET.TrippyGL/Myra.Samples.Silk.NET.TrippyGL.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <AssemblyName>Myra.Samples.AllWidgets</AssemblyName>
     <RootNamespace>Myra.Samples.AllWidgets</RootNamespace>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Myra.Samples.Silk.NET/Myra.Samples.Silk.NET.csproj b/samples/Myra.Samples.Silk.NET/Myra.Samples.Silk.NET.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <AssemblyName>Myra.Samples.AllWidgets</AssemblyName>
     <RootNamespace>Myra.Samples.AllWidgets</RootNamespace>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj b/samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
   </PropertyGroup>
 

diff --git a/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.FNA.Core.csproj b/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.FNA.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\FNA.Core\$(Configuration)</OutputPath>
     <DefineConstants>$(DefineConstants);FNA;</DefineConstants>
     <AssemblyName>Myra.Samples.TextRendering</AssemblyName>

diff --git a/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.MonoGame.csproj b/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.MonoGame.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
     <DefineConstants>$(DefineConstants);MONOGAME</DefineConstants>
     <AssemblyName>Myra.Samples.TextRendering</AssemblyName>

diff --git a/src/Myra.Tests/Myra.Tests.FNA.Core.csproj b/src/Myra.Tests/Myra.Tests.FNA.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);FNA</DefineConstants>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>$(AppTargetFramework)</TargetFrameworks>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
     <OutputType>Library</OutputType>
     <RootNamespace>Myra.Tests</RootNamespace>

diff --git a/src/Myra.Tests/Myra.Tests.MonoGame.csproj b/src/Myra.Tests/Myra.Tests.MonoGame.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);MONOGAME</DefineConstants>
-    <TargetFrameworks>net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>$(AppTargetFramework)-windows</TargetFrameworks>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
     <OutputType>Library</OutputType>
     <RootNamespace>Myra.Tests</RootNamespace>

diff --git a/src/Myra/Graphics2D/UI/Containers/SplitPane.cs b/src/Myra/Graphics2D/UI/Containers/SplitPane.cs
@@ -103,9 +103,9 @@ public override void OnTouchMoved()
 				secondProportion = _layout.RowsProportions[handleIndex + 1];
 			}
 
-			if (fp >= 0)
+			var fp2 = firstProportion.Value + secondProportion.Value - fp;
+			if (fp >= 0 && fp2 >= 0)
 			{
-				var fp2 = firstProportion.Value + secondProportion.Value - fp;
 				firstProportion.Value = fp;
 				secondProportion.Value = fp2;
 				FireProportionsChanged();

diff --git a/src/Myra/Myra.FNA.Core.csproj b/src/Myra/Myra.FNA.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);FNA</DefineConstants>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <AssemblyName>Myra</AssemblyName>
     <PackageId>Myra.FNA.Core</PackageId>
     <OutputPath>bin\FNA.Core\$(Configuration)</OutputPath>

diff --git a/src/Myra/Myra.PlatformAgnostic.csproj b/src/Myra/Myra.PlatformAgnostic.csproj
@@ -19,6 +19,5 @@
     <PackageReference Include="AssetManagementBase" Version="0.6.6" />
     <PackageReference Include="FontStashSharp" Version="$(FontStashSharpVersion)" />
     <PackageReference Include="info.lundin.math.dll" Version="$(InfoLundinMathVersion)" />
-    <PackageReference Include="StbImageSharp" Version="2.27.13" />
   </ItemGroup>  
 </Project>
diff --git a/src/Myra/Myra.Stride.csproj b/src/Myra/Myra.Stride.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);STRIDE</DefineConstants>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <PackageId>Myra.Stride</PackageId>
     <AssemblyName>Myra</AssemblyName>
     <OutputPath>bin\Stride\$(Configuration)</OutputPath>

diff --git a/src/MyraPad/MyraPad.FNA.Core.csproj b/src/MyraPad/MyraPad.FNA.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <AssemblyName>MyraPad</AssemblyName>
     <RootNamespace>MyraPad</RootNamespace>
     <OutputPath>bin\FNA.Core\$(Configuration)</OutputPath>

diff --git a/src/MyraPad/MyraPad.csproj b/src/MyraPad/MyraPad.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <AssemblyName>MyraPad</AssemblyName>
     <RootNamespace>MyraPad</RootNamespace>
     <DefineConstants>$(DefineConstants);MONOGAME</DefineConstants>