From f60453c1d8084cc4699c3553baf6f7273c3eea18 Mon Sep 17 00:00:00 2001
From: Roman Shapiro <eleroman@mail.ru>
Date: Sat, 4 Nov 2023 21:48:40 +0700
Subject: [PATCH] Fixes #430

---
 Directory.Build.props                                      | 7 ++++---
 .../Myra.Samples.AllWidgets.MonoGame.csproj                | 2 +-
 .../Myra.Samples.AssetManagement.csproj                    | 2 +-
 .../Myra.Samples.CustomUIStylesheet.MonoGame.csproj        | 2 +-
 .../Myra.Samples.CustomWidgets.csproj                      | 2 +-
 .../Myra.Samples.DebugConsole.csproj                       | 2 +-
 .../Myra.Samples.GridContainer.csproj                      | 2 +-
 samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj | 2 +-
 .../Myra.Samples.NonModalWindows.csproj                    | 2 +-
 .../Myra.Samples.Notepad.MonoGame.csproj                   | 2 +-
 .../Myra.Samples.ObjectEditor.csproj                       | 2 +-
 .../Myra.Samples.PlatformAgnostic.csproj                   | 2 +-
 .../Myra.Samples.SplitPaneContainer.csproj                 | 2 +-
 .../Myra.Samples.TextRendering.MonoGame.csproj             | 2 +-
 src/Myra/Myra.MonoGame.csproj                              | 2 +-
 src/MyraPad/MyraPad.csproj                                 | 2 +-
 16 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 3fa8d9f1..5d28b91f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,11 +7,12 @@
     <RootNamespace>Myra</RootNamespace>
     <Description>UI Library for MonoGame, FNA and Stride</Description>
     <VersionPrefix>1.5.2</VersionPrefix>
-    <XNAssetsVersion>0.7.0</XNAssetsVersion>
-    <FontStashSharpVersion>1.3.2</FontStashSharpVersion>
+    <XNAssetsVersion>0.7.1</XNAssetsVersion>
+    <FontStashSharpVersion>1.3.3</FontStashSharpVersion>
     <LangVersion>8.0</LangVersion>
     <InfoLundinMathVersion>1.2.6</InfoLundinMathVersion>
-    <MonoGameVersion>3.8.1.303</MonoGameVersion>
+    <MonoGameVersion>3.8.0.1641</MonoGameVersion>
+    <AppMonoGameVersion>3.8.1.303</AppMonoGameVersion>
     <StrideVersion>4.1.0.1728</StrideVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.MonoGame.csproj b/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.MonoGame.csproj
index 9829b362..eb8966da 100644
--- a/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.MonoGame.csproj
+++ b/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.MonoGame.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Myra.Samples.AssetManagement/Myra.Samples.AssetManagement.csproj b/samples/Myra.Samples.AssetManagement/Myra.Samples.AssetManagement.csproj
index c8b71161..692d4806 100644
--- a/samples/Myra.Samples.AssetManagement/Myra.Samples.AssetManagement.csproj
+++ b/samples/Myra.Samples.AssetManagement/Myra.Samples.AssetManagement.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.MonoGame.csproj b/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.MonoGame.csproj
index 468e1ec7..cf070983 100644
--- a/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.MonoGame.csproj
+++ b/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.MonoGame.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Myra.Samples.CustomWidgets/Myra.Samples.CustomWidgets.csproj b/samples/Myra.Samples.CustomWidgets/Myra.Samples.CustomWidgets.csproj
index 20282e31..b4d9732c 100644
--- a/samples/Myra.Samples.CustomWidgets/Myra.Samples.CustomWidgets.csproj
+++ b/samples/Myra.Samples.CustomWidgets/Myra.Samples.CustomWidgets.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj b/samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj
index 20282e31..b4d9732c 100644
--- a/samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj
+++ b/samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Myra.Samples.GridContainer/Myra.Samples.GridContainer.csproj b/samples/Myra.Samples.GridContainer/Myra.Samples.GridContainer.csproj
index 90353241..38390364 100644
--- a/samples/Myra.Samples.GridContainer/Myra.Samples.GridContainer.csproj
+++ b/samples/Myra.Samples.GridContainer/Myra.Samples.GridContainer.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj b/samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj
index 20282e31..b4d9732c 100644
--- a/samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj
+++ b/samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj b/samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj
index 20282e31..b4d9732c 100644
--- a/samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj
+++ b/samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj b/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj
index 56f23571..4ae02e3d 100644
--- a/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj
+++ b/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj b/samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj
index 5d02761a..54806f1b 100644
--- a/samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj
+++ b/samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Myra.Samples.PlatformAgnostic/Myra.Samples.PlatformAgnostic.csproj b/samples/Myra.Samples.PlatformAgnostic/Myra.Samples.PlatformAgnostic.csproj
index 4aa10fdf..fab9ef55 100644
--- a/samples/Myra.Samples.PlatformAgnostic/Myra.Samples.PlatformAgnostic.csproj
+++ b/samples/Myra.Samples.PlatformAgnostic/Myra.Samples.PlatformAgnostic.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj b/samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj
index c19ed6fd..e47fb181 100644
--- a/samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj
+++ b/samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.MonoGame.csproj b/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.MonoGame.csproj
index 34725b7f..7380133c 100644
--- a/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.MonoGame.csproj
+++ b/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.MonoGame.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Myra/Myra.MonoGame.csproj b/src/Myra/Myra.MonoGame.csproj
index 727d0ae1..510e3db6 100644
--- a/src/Myra/Myra.MonoGame.csproj
+++ b/src/Myra/Myra.MonoGame.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);MONOGAME</DefineConstants>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Myra</AssemblyName>
     <PackageId>Myra</PackageId>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
diff --git a/src/MyraPad/MyraPad.csproj b/src/MyraPad/MyraPad.csproj
index f515e103..7486ac0c 100644
--- a/src/MyraPad/MyraPad.csproj
+++ b/src/MyraPad/MyraPad.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
     <PackageReference Include="System.CodeDom" Version="6.0.0" />
   </ItemGroup>