CHANGELOG.md

@@ -2,16 +2,13 @@
 MLEM tries to adhere to [semantic versioning](https://semver.org/). Breaking changes are written in **bold**.
 
 Jump to version:
-- [6.1.0](#610)
+- [6.0.0 (Unreleased)](#540-unreleased)
-- [6.0.0](#600)
 - [5.3.0](#530)
 - [5.2.0](#520)
 - [5.1.0](#510)
 - [5.0.0](#500)
 
-## 6.1.0
+## 6.0.0 (Unreleased)
-
-## 6.0.0
 ### MLEM
 Additions
 - Added consuming variants of IsPressed methods to InputHandler and Keybind
@@ -93,10 +90,6 @@ Fixes
 Additions
 - Added MLEM.Startup.FNA, which is fully compatible with FNA
 
-### MLEM.Templates
-Improvements
-- Updated to MonoGame 3.8.1
-
 ## 5.3.0
 ### MLEM
 Additions

Demos.Android/.config/dotnet-tools.json

@@ -1,36 +0,0 @@
-{
-    "version": 1,
-    "isRoot": true,
-    "tools": {
-        "dotnet-mgcb": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb"
-            ]
-        },
-        "dotnet-mgcb-editor": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor"
-            ]
-        },
-        "dotnet-mgcb-editor-linux": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor-linux"
-            ]
-        },
-        "dotnet-mgcb-editor-windows": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor-windows"
-            ]
-        },
-        "dotnet-mgcb-editor-mac": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor-mac"
-            ]
-        }
-    }
-}

Demos.Android/Activity1.cs

@@ -1,14 +1,16 @@
+using Android.App;
 using Android.Content;
 using Android.Content.PM;
+using Android.Net;
 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;
 
-namespace Demos.Android;
+namespace Demos.Android {
-
+    [Activity(
-[Activity(
         Label = "@string/app_name",
         MainLauncher = true,
         Icon = "@drawable/icon",
@@ -16,8 +18,8 @@ namespace Demos.Android;
         LaunchMode = LaunchMode.SingleInstance,
         ScreenOrientation = ScreenOrientation.UserLandscape,
         ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.Keyboard | ConfigChanges.KeyboardHidden | ConfigChanges.ScreenSize
-)]
+    )]
-public class Activity1 : AndroidGameActivity {
+    public class Activity1 : AndroidGameActivity {
 
         private GameImpl game;
         private View view;
@@ -44,12 +46,9 @@ public class Activity1 : AndroidGameActivity {
         public override void OnWindowFocusChanged(bool hasFocus) {
             base.OnWindowFocusChanged(hasFocus);
             // hide the status bar
-        if (hasFocus) {
+            if (hasFocus)
-            #pragma warning disable CS0618
-            // TODO this is deprecated, find out how to replace it
                 this.Window.DecorView.SystemUiVisibility = (StatusBarVisibility) (SystemUiFlags.ImmersiveSticky | SystemUiFlags.LayoutStable | SystemUiFlags.LayoutHideNavigation | SystemUiFlags.LayoutFullscreen | SystemUiFlags.HideNavigation | SystemUiFlags.Fullscreen);
-            #pragma warning restore CS0618
-        }
         }
 
+    }
 }

Demos.Android/AndroidManifest.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.ellpeck.mlem.demos.android" android:versionCode="1" android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="31" />
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-    <application android:label="MLEM Android Demos" />
-</manifest>

Demos.Android/Demos.Android.csproj

@@ -1,22 +1,104 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <TargetFramework>net6.0-android</TargetFramework>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <SupportedOSPlatformVersion>31</SupportedOSPlatformVersion>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <OutputType>Exe</OutputType>
+        <ProductVersion>8.0.30703</ProductVersion>
-        <ApplicationId>de.ellpeck.mlem.demos.android</ApplicationId>
+        <SchemaVersion>2.0</SchemaVersion>
-        <ApplicationVersion>1</ApplicationVersion>
+        <ProjectGuid>{410C0262-131C-4D0E-910D-D01B4F7143E0}</ProjectGuid>
-        <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+        <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-        <ImplicitUsings>true</ImplicitUsings>
+        <OutputType>Library</OutputType>
+        <AppDesignerFolder>Properties</AppDesignerFolder>
+        <RootNamespace>Demos.Android</RootNamespace>
+        <AssemblyName>Demos.Android</AssemblyName>
+        <FileAlignment>512</FileAlignment>
+        <AndroidApplication>true</AndroidApplication>
+        <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
+        <AndroidResgenClass>Resource</AndroidResgenClass>
+        <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+        <AndroidStoreUncompressedFileExtensions>.m4a</AndroidStoreUncompressedFileExtensions>
+        <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+        <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+        <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+        <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+        <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+        <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
+        <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>portable</DebugType>
+        <Optimize>false</Optimize>
+        <OutputPath>bin\$(MonoGamePlatform)\$(Platform)\$(Configuration)\</OutputPath>
+        <DefineConstants>DEBUG;TRACE;ANDROID</DefineConstants>
+        <ErrorReport>prompt</ErrorReport>
+        <WarningLevel>4</WarningLevel>
+        <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
+        <AndroidLinkMode>None</AndroidLinkMode>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <DebugType>portable</DebugType>
+        <Optimize>true</Optimize>
+        <OutputPath>bin\$(MonoGamePlatform)\$(Platform)\$(Configuration)\</OutputPath>
+        <DefineConstants>TRACE;ANDROID</DefineConstants>
+        <ErrorReport>prompt</ErrorReport>
+        <WarningLevel>4</WarningLevel>
+        <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
+        <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+        <AotAssemblies>false</AotAssemblies>
+        <EnableLLVM>false</EnableLLVM>
+        <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+        <BundleAssemblies>false</BundleAssemblies>
+        <MandroidI18n />
+        <AndroidPackageFormat>aab</AndroidPackageFormat>
+        <AndroidUseAapt2>true</AndroidUseAapt2>
+        <AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
     </PropertyGroup>
-    
     <ItemGroup>
-        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.263" />
+        <Reference Include="System" />
-        <PackageReference Include="MonoGame.Framework.Android" Version="3.8.1.263" />
+        <Reference Include="System.Core" />
-        
+        <Reference Include="System.Xml" />
-        <ProjectReference Include="..\Demos\Demos.csproj" />
+        <Reference Include="Mono.Android" />
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Include="Activity1.cs" />
+        <Compile Include="Resources\Resource.Designer.cs" />
+        <Compile Include="Properties\AssemblyInfo.cs" />
+    </ItemGroup>
+    <ItemGroup>
+        <AndroidResource Include="Resources\Drawable\Icon.png" />
+        <AndroidResource Include="Resources\Values\Strings.xml" />
     </ItemGroup>
-    
     <ItemGroup>
         <MonoGameContentReference Include="..\Demos\Content\Content.mgcb" />
+        <None Include="..\Demos\Content\*\**" />
     </ItemGroup>
+    <ItemGroup>
+        <None Include="Properties\AndroidManifest.xml" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Coroutine" Version="2.1.3" />
+        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
+        <PackageReference Include="MonoGame.Framework.Android" Version="3.8.0.1641" />
+        <PackageReference Include="TextCopy" Version="6.1.0" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Demos\Demos.csproj">
+            <Project>{1bc4682b-aa14-4937-b5c7-707e20fe88ff}</Project>
+            <Name>Demos</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\MLEM.Startup\MLEM.Startup.csproj">
+            <Project>{997f4739-7bec-4621-b9ca-68deb2d74412}</Project>
+            <Name>MLEM.Startup</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\MLEM.Ui\MLEM.Ui.csproj">
+            <Project>{6f00629a-8b87-4264-8896-19983285e32f}</Project>
+            <Name>MLEM.Ui</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\MLEM\MLEM.csproj">
+            <Project>{1d6ab762-43c4-4775-8924-707c7ec3f142}</Project>
+            <Name>MLEM</Name>
+        </ProjectReference>
+    </ItemGroup>
+    <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

Demos.Android/Properties/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.ellpeck.mlem.demos.android" android:installLocation="auto" android:versionCode="1" android:versionName="1.0">
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
+    <application android:label="MLEM Android Demos" android:resizeableActivity="true" />
+</manifest>

Demos.Android/Properties/AssemblyInfo.cs

@@ -0,0 +1,15 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MLEM Android Demos")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("MLEM Android Demos")]
+[assembly: AssemblyCopyright("Copyright © 2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]

Demos.Android/Resources/Resource.Designer.cs

@@ -0,0 +1,76 @@
+#pragma warning disable 1591
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+[assembly: global::Android.Runtime.ResourceDesignerAttribute("Demos.Android.Resource", IsApplication=true)]
+
+namespace Demos.Android
+{
+	
+	
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+	public partial class Resource
+	{
+		
+		static Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+		}
+		
+		public static void UpdateIdValues()
+		{
+		}
+		
+		public partial class Attribute
+		{
+			
+			static Attribute()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Attribute()
+			{
+			}
+		}
+		
+		public partial class Drawable
+		{
+			
+			// aapt resource value: 0x7F010000
+			public const int Icon = 2130771968;
+			
+			static Drawable()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Drawable()
+			{
+			}
+		}
+		
+		public partial class String
+		{
+			
+			// aapt resource value: 0x7F020000
+			public const int app_name = 2130837504;
+			
+			static String()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private String()
+			{
+			}
+		}
+	}
+}
+#pragma warning restore 1591

Demos.DesktopGL/.config/dotnet-tools.json

@@ -1,36 +0,0 @@
-{
-    "version": 1,
-    "isRoot": true,
-    "tools": {
-        "dotnet-mgcb": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb"
-            ]
-        },
-        "dotnet-mgcb-editor": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor"
-            ]
-        },
-        "dotnet-mgcb-editor-linux": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor-linux"
-            ]
-        },
-        "dotnet-mgcb-editor-windows": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor-windows"
-            ]
-        },
-        "dotnet-mgcb-editor-mac": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor-mac"
-            ]
-        }
-    }
-}

Demos.DesktopGL/Demos.DesktopGL.csproj

@@ -2,32 +2,28 @@
     
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net5.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" />
-        
         <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>
+        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
+        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
+    </ItemGroup>
+    
     <ItemGroup>
         <MonoGameContentReference Include="..\Demos\Content\Content.mgcb" />
+        <Content Include="..\Demos\Content\*\**" />
         <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" />
-    </Target>
 </Project>

Demos/Demos.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
     
     <ItemGroup>
@@ -11,7 +11,7 @@
     </ItemGroup>
     
     <ItemGroup>
-        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.263">
+        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
     </ItemGroup>

Demos/GameImpl.cs

@@ -48,6 +48,15 @@ namespace Demos {
         }
 
         protected override void LoadContent() {
+            // TODO remove with MonoGame 3.8.1 https://github.com/MonoGame/MonoGame/issues/7298
+            #if !FNA
+            if (PlatformInfo.MonoGamePlatform == MonoGamePlatform.DesktopGL) {
+                this.GraphicsDeviceManager.PreferredBackBufferWidth = 1280;
+                this.GraphicsDeviceManager.PreferredBackBufferHeight = 720;
+                this.GraphicsDeviceManager.ApplyChanges();
+            }
+            #endif
+
             base.LoadContent();
             this.UiSystem.AutoScaleReferenceSize = new Point(1280, 720);
             this.UiSystem.AutoScaleWithScreen = true;

FNA

@@ -1 +1 @@
-Subproject commit 102990f514f1e5bfac07d33f7c33e2e712946da4
+Subproject commit 700a6f096ad359cc12634eeb5608ee9c8d29798c

FontStashSharp

@@ -1 +1 @@
-Subproject commit f0774130cad6cec0b790a58bc7c811a186443fb3
+Subproject commit 460a60ca817e10b6c9bae3e3c05affd1b0bb4ba7

MLEM.Data/Content/Texture2DReader.cs

@@ -17,6 +17,7 @@ namespace MLEM.Data.Content {
             #endif
             {
                 // premultiply the texture's color to be in line with the pipeline's texture reader
+                // TODO this can be converted to use https://github.com/MonoGame/MonoGame/pull/7369 in the future
                 using (var texture = Texture2D.FromStream(manager.GraphicsDevice, stream)) {
                     var ret = new Texture2D(manager.GraphicsDevice, texture.Width, texture.Height);
                     using (var textureData = texture.GetTextureData()) {

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.1.5">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
         <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641">

MLEM.Templates/content/MLEM.Templates.DesktopGL/.config/dotnet-tools.json

@@ -1,36 +0,0 @@
-{
-    "version": 1,
-    "isRoot": true,
-    "tools": {
-        "dotnet-mgcb": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb"
-            ]
-        },
-        "dotnet-mgcb-editor": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor"
-            ]
-        },
-        "dotnet-mgcb-editor-linux": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor-linux"
-            ]
-        },
-        "dotnet-mgcb-editor-windows": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor-windows"
-            ]
-        },
-        "dotnet-mgcb-editor-mac": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor-mac"
-            ]
-        }
-    }
-}

MLEM.Templates/content/MLEM.Templates.DesktopGL/.template.config/dotnetcli.host.json

@@ -0,0 +1,2 @@
+{
+}

MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj

@@ -11,17 +11,12 @@
     <ItemGroup>
         <PackageReference Include="Contentless" Version="3.*" />
         <PackageReference Include="MLEM.Startup" Version="6.*" />
-        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.263" />
+        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.*" />
-        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.263" />
+        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
     </ItemGroup>
 
     <ItemGroup>
         <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" />
-    </Target>
 </Project>

MLEM.Templates/content/MLEM.Templates.Portable/.template.config/dotnetcli.host.json

@@ -0,0 +1,2 @@
+{
+}

MLEM.Templates/content/MLEM.Templates.Portable/GameImpl.cs

@@ -1,8 +1,7 @@
 using MLEM.Startup;
 
-namespace TemplateNamespace;
+namespace TemplateNamespace {
-
+    public class GameImpl : MlemGame {
-public class GameImpl : MlemGame {
 
         public static GameImpl Instance { get; private set; }
 
@@ -10,4 +9,5 @@ public class GameImpl : MlemGame {
             Instance = this;
         }
 
+    }
 }

MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj

@@ -6,7 +6,7 @@
 
     <ItemGroup>
         <PackageReference Include="MLEM.Startup" Version="6.*" />
-        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.263">
+        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.*">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
     </ItemGroup>

Sandbox/.config/dotnet-tools.json

@@ -1,36 +0,0 @@
-{
-    "version": 1,
-    "isRoot": true,
-    "tools": {
-        "dotnet-mgcb": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb"
-            ]
-        },
-        "dotnet-mgcb-editor": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor"
-            ]
-        },
-        "dotnet-mgcb-editor-linux": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor-linux"
-            ]
-        },
-        "dotnet-mgcb-editor-windows": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor-windows"
-            ]
-        },
-        "dotnet-mgcb-editor-mac": {
-            "version": "3.8.1.263",
-            "commands": [
-                "mgcb-editor-mac"
-            ]
-        }
-    }
-}

Sandbox/Content/Content.mgcb

@@ -62,4 +62,13 @@
 #begin Textures/Test.png
 /copy:Textures/Test.png
 
+#begin Tiled/Map.tmx
+/importer:TiledMapImporter
+/processor:TiledMapProcessor
+/build:Tiled/Map.tmx
+
+#begin Tiled/Tileset.tsx
+/importer:TiledMapTilesetImporter
+/processor:TiledMapTilesetProcessor
+/build:Tiled/Tileset.tsx
 

Sandbox/GameImpl.cs

@@ -27,9 +27,8 @@ using MonoGame.Extended;
 using MonoGame.Extended.Tiled;
 using MonoGame.Extended.ViewportAdapters;
 
-namespace Sandbox; 
+namespace Sandbox {
-
+    public class GameImpl : MlemGame {
-public class GameImpl : MlemGame {
 
         private Camera camera;
         private TiledMap map;
@@ -46,6 +45,11 @@ public class GameImpl : MlemGame {
         }
 
         protected override void LoadContent() {
+            // TODO remove with MonoGame 3.8.1 https://github.com/MonoGame/MonoGame/issues/7298
+            this.GraphicsDeviceManager.PreferredBackBufferWidth = 1280;
+            this.GraphicsDeviceManager.PreferredBackBufferHeight = 720;
+            this.GraphicsDeviceManager.ApplyChanges();
+
             base.LoadContent();
 
             this.Components.Add(this.rawContent = new RawContentManager(this.Services));
@@ -396,4 +400,5 @@ public class GameImpl : MlemGame {
 
         }
 
+    }
 }

Sandbox/Program.cs

@@ -1,9 +1,8 @@
 using Microsoft.Xna.Framework;
 using MLEM.Misc;
 
-namespace Sandbox; 
+namespace Sandbox {
-
+    internal static class Program {
-internal static class Program {
 
         private static void Main() {
             MlemPlatform.Current = new MlemPlatform.DesktopGl<TextInputEventArgs>((w, c) => w.TextInput += c);
@@ -11,4 +10,5 @@ internal static class Program {
             game.Run();
         }
 
+    }
 }

Sandbox/Sandbox.csproj

@@ -2,7 +2,7 @@
     
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
     
     <ItemGroup>
@@ -14,16 +14,17 @@
     </ItemGroup>
     
     <ItemGroup>
-        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.263" />
+        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
         <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="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
-        <PackageReference Include="FontStashSharp.MonoGame" Version="1.1.6" />
+        <PackageReference Include="FontStashSharp.MonoGame" Version="1.1.5" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     </ItemGroup>
     
-    <Target Name="RestoreDotnetTools" BeforeTargets="Restore">
+    <ItemGroup>
-        <Message Text="Restoring dotnet tools" Importance="High" />
+        <MonoGameContentReference Include="Content\Content.mgcb" />
-        <Exec Command="dotnet tool restore" />
+        <Content Include="Content\*\**" />
-    </Target>
+    </ItemGroup>
+
 </Project>

build.cake

@@ -2,7 +2,7 @@
 #tool docfx.console&version=2.58.9
 
 // this is the upcoming version, for prereleases
-var version = Argument("version", "6.1.0");
+var version = Argument("version", "6.0.0");
 var target = Argument("target", "Default");
 var branch = Argument("branch", "main");
 var config = Argument("configuration", "Release");