From 963ea557e850a2846bc5bdc565b9790826e62e7f Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Sat, 3 Sep 2022 12:31:34 +0200
Subject: [PATCH] updated dependencies

---
 Demos.Android/Activity1.cs             |  2 ++
 Demos.Android/Demos.Android.csproj     |  4 ++--
 Demos.DesktopGL/Demos.DesktopGL.csproj | 16 ++++++++--------
 Demos.DesktopGL/Program.cs             |  4 +++-
 MLEM.Extended/MLEM.Extended.csproj     |  2 +-
 Sandbox/GameImpl.cs                    |  3 +++
 Sandbox/Program.cs                     |  3 ++-
 Sandbox/Sandbox.csproj                 |  6 +++---
 Tests/Tests.csproj                     |  2 +-
 9 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/Demos.Android/Activity1.cs b/Demos.Android/Activity1.cs
index fd0b65c..3c17b8d 100644
--- a/Demos.Android/Activity1.cs
+++ b/Demos.Android/Activity1.cs
@@ -2,6 +2,8 @@ using Android.Content;
 using Android.Content.PM;
 using Android.OS;
 using Android.Views;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Input;
 using MLEM.Extensions;
 using MLEM.Misc;
 using Uri = Android.Net.Uri;
diff --git a/Demos.Android/Demos.Android.csproj b/Demos.Android/Demos.Android.csproj
index 4475ed8..771320e 100644
--- a/Demos.Android/Demos.Android.csproj
+++ b/Demos.Android/Demos.Android.csproj
@@ -10,8 +10,8 @@
     </PropertyGroup>
     
     <ItemGroup>
-        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.263" />
-        <PackageReference Include="MonoGame.Framework.Android" Version="3.8.1.263" />
+        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+        <PackageReference Include="MonoGame.Framework.Android" Version="3.8.1.303" />
         
         <ProjectReference Include="..\Demos\Demos.csproj" />
     </ItemGroup>
diff --git a/Demos.DesktopGL/Demos.DesktopGL.csproj b/Demos.DesktopGL/Demos.DesktopGL.csproj
index f2fd359..81b788e 100644
--- a/Demos.DesktopGL/Demos.DesktopGL.csproj
+++ b/Demos.DesktopGL/Demos.DesktopGL.csproj
@@ -1,31 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+    
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
         <ApplicationIcon>Icon.ico</ApplicationIcon>
         <AssemblyName>MLEM Desktop Demos</AssemblyName>
     </PropertyGroup>
-
+    
     <ItemGroup>
     </ItemGroup>
-
+    
     <ItemGroup>
-        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.263" />
-        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.263" />
-
+        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
+        
         <ProjectReference Include="..\Demos\Demos.csproj" />
         <ProjectReference Include="..\MLEM.Startup\MLEM.Startup.csproj" />
         <ProjectReference Include="..\MLEM.Ui\MLEM.Ui.csproj" />
         <ProjectReference Include="..\MLEM\MLEM.csproj" />
     </ItemGroup>
-
+    
     <ItemGroup>
         <MonoGameContentReference Include="..\Demos\Content\Content.mgcb" />
         <EmbeddedResource Include="Icon.ico" />
         <EmbeddedResource Include="Icon.bmp" />
     </ItemGroup>
-
+    
     <Target Name="RestoreDotnetTools" BeforeTargets="Restore">
         <Message Text="Restoring dotnet tools" Importance="High" />
         <Exec Command="dotnet tool restore" />
diff --git a/Demos.DesktopGL/Program.cs b/Demos.DesktopGL/Program.cs
index 9a1363a..1108945 100644
--- a/Demos.DesktopGL/Program.cs
+++ b/Demos.DesktopGL/Program.cs
@@ -1,5 +1,7 @@
 using MLEM.Misc;
-#if FNA
+#if !FNA
+using Microsoft.Xna.Framework;
+#else
 using Microsoft.Xna.Framework.Input;
 #endif
 
diff --git a/MLEM.Extended/MLEM.Extended.csproj b/MLEM.Extended/MLEM.Extended.csproj
index 3d2f648..f66d8fb 100644
--- a/MLEM.Extended/MLEM.Extended.csproj
+++ b/MLEM.Extended/MLEM.Extended.csproj
@@ -26,7 +26,7 @@
         <PackageReference Include="MonoGame.Extended.Tiled" Version="3.8.0">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="FontStashSharp.MonoGame" Version="1.1.6">
+        <PackageReference Include="FontStashSharp.MonoGame" Version="1.2.4">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
         <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641">
diff --git a/Sandbox/GameImpl.cs b/Sandbox/GameImpl.cs
index 2d4c077..e66e532 100644
--- a/Sandbox/GameImpl.cs
+++ b/Sandbox/GameImpl.cs
@@ -2,6 +2,9 @@ using System;
 using System.IO;
 using System.Text.RegularExpressions;
 using FontStashSharp;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
 using MLEM.Cameras;
 using MLEM.Data;
 using MLEM.Data.Content;
diff --git a/Sandbox/Program.cs b/Sandbox/Program.cs
index 17411a3..3e6e83d 100644
--- a/Sandbox/Program.cs
+++ b/Sandbox/Program.cs
@@ -1,4 +1,5 @@
-using MLEM.Misc;
+using Microsoft.Xna.Framework;
+using MLEM.Misc;
 
 namespace Sandbox;
 
diff --git a/Sandbox/Sandbox.csproj b/Sandbox/Sandbox.csproj
index 9956ae9..ae66e79 100644
--- a/Sandbox/Sandbox.csproj
+++ b/Sandbox/Sandbox.csproj
@@ -14,11 +14,11 @@
     </ItemGroup>
     
     <ItemGroup>
-        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.263" />
+        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
         <PackageReference Include="MonoGame.Extended.Content.Pipeline" Version="3.8.0" />
         <PackageReference Include="MonoGame.Extended.Tiled" Version="3.8.0" />
-        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.263" />
-        <PackageReference Include="FontStashSharp.MonoGame" Version="1.1.6" />
+        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
+        <PackageReference Include="FontStashSharp.MonoGame" Version="1.2.4" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     </ItemGroup>
     
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index fcf5c37..6f1da92 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -17,7 +17,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
         <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />