fix debug launcher

.gitignore

@@ -3,6 +3,8 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
+fnalibs/
+
 # User-specific files
 *.rsuser
 *.suo

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "FNA"]
-	path = FNA
-	url = https://github.com/FNA-XNA/FNA.git

.vscode/launch.json

@@ -2,17 +2,43 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Attach to Core Debugger",
+      "name": "Attach to Framework Debugger",
-      "type": "coreclr",
+      "type": "clr",
       "request": "launch",
-      "preLaunchTask": "Build: Core Debug",
+      "preLaunchTask": "Build: Framework Debug",
-      "program": "${workspaceFolder}/ProjectName/bin/Debug/netcoreapp3.1/ProjectName.dll",
+      "program": "${workspaceFolder}/ProjectName/bin/x64/Debug/net461/ProjectName.exe",
+      "args": [],
+      "cwd": "${workspaceFolder}/ProjectName/bin/x64/Debug/net461",
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen"
+    },
+    {
+      "name": "Attach to Mono Debugger",
+      "type": "mono",
+      "request": "launch",
+      "preLaunchTask": "Build: Mono Debug",
+      "program": "${workspaceFolder}/ProjectName/bin/x64/Debug/net461/ProjectName.exe",
       "args": [],
       "env": {
-        "LD_LIBRARY_PATH": "${workspaceFolder}/ProjectName/bin/Debug/netcoreapp3.1/lib64",
+        "LD_LIBRARY_PATH": "${workspaceFolder}/ProjectName/bin/x64/Debug/net461/lib64",
-        "DYLD_LIBRARY_PATH": "${workspaceFolder}/ProjectName/bin/Debug/netcoreapp3.1/osx"
+        "DYLD_LIBRARY_PATH": "${workspaceFolder}/ProjectName/bin/x64/Debug/net461/osx"
       },
-      "cwd": "${workspaceFolder}",
+      "cwd": "${workspaceFolder}/ProjectName/bin/x64/Debug/net461",
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen"
+    },
+    {
+      "name": "Attach to .NET 6 Debugger",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "Build: .NET 6 Debug",
+      "program": "${workspaceFolder}/ProjectName/bin/x64/Debug/net6.0/ProjectName.dll",
+      "args": [],
+      "env": {
+        "LD_LIBRARY_PATH": "${workspaceFolder}/ProjectName/bin/x64/Debug/net6.0/lib64",
+        "DYLD_LIBRARY_PATH": "${workspaceFolder}/ProjectName/bin/x64/Debug/net6.0/osx"
+      },
+      "cwd": "${workspaceFolder}/ProjectName/bin/x64/Debug/net6.0",
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen"
     }

.vscode/tasks.json

@@ -21,12 +21,13 @@
   },
   "tasks": [
     {
-      "label": "Build: Framework Release",
+      "label": "Build: Mono Release",
       "command": "msbuild",
       "args": [
         "-restore:True",
         "${workspaceFolder}/ProjectName.Framework.sln",
-        "-p:Configuration=Release"
+        "-p:Configuration=Release",
+        "-p:Platform=x64"
       ],
       "type": "shell",
       "group": {
@@ -36,7 +37,7 @@
       "problemMatcher": "$msCompile"
     },
     {
-      "label": "Run: Framework Release",
+      "label": "Run: Mono Release",
       "command": "mono",
       "args": [
         "ProjectName.exe"
@@ -46,7 +47,7 @@
           "LD_LIBRARY_PATH": "./lib64",
           "DYLD_LIBRARY_PATH": "./osx"
         },
-        "cwd": "${workspaceFolder}/ProjectName/bin/Release/net461"
+        "cwd": "${workspaceFolder}/ProjectName/bin/x64/Release/net461"
       },
       "type": "process",
       "group": {
@@ -56,10 +57,10 @@
       "problemMatcher": []
     },
     {
-      "label": "Build & Run: Framework Release",
+      "label": "Build & Run: Mono Release",
       "dependsOn": [
-        "Build: Framework Release",
+        "Build: Mono Release",
-        "Run: Framework Release"
+        "Run: Mono Release"
       ],
       "dependsOrder": "sequence",
       "type": "shell",
@@ -70,12 +71,165 @@
       "problemMatcher": []
     },
     {
-      "label": "Build: Framework Debug",
+      "label": "Build: Mono Debug",
       "command": "msbuild",
       "args": [
         "-restore:True",
         "${workspaceFolder}/ProjectName.Framework.sln",
-        "-p:Configuration=Debug"
+        "-p:Configuration=Debug",
+        "-p:Platform=x64"
+      ],
+      "type": "shell",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "Run: Mono Debug",
+      "command": "mono",
+      "args": [
+        "ProjectName.exe"
+      ],
+      "options": {
+        "env": {
+          "LD_LIBRARY_PATH": "./lib64",
+          "DYLD_LIBRARY_PATH": "./osx"
+        },
+        "cwd": "${workspaceFolder}/ProjectName/bin/x64/Debug/net461"
+      },
+      "type": "process",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "Build & Run: Mono Debug",
+      "dependsOn": [
+        "Build: Mono Debug",
+        "Run: Mono Debug"
+      ],
+      "dependsOrder": "sequence",
+      "type": "shell",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "Build & Run: .NET 6 Debug",
+      "type": "shell",
+      "dependsOrder": "sequence",
+      "dependsOn": [
+        "Build: .NET 6 Debug",
+        "Run: .NET 6 Debug"
+      ],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "Build: .NET 6 Debug",
+      "command": "dotnet",
+      "args": [
+        "build",
+        "./ProjectName/ProjectName.Core.csproj",
+        "-p:SolutionDir=${workspaceFolder}/",
+        "-p:Platform=x64"
+      ],
+      "type": "shell",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "Run: .NET 6 Debug",
+      "command": "dotnet",
+      "args": [
+        "./ProjectName.dll"
+      ],
+      "options": {
+        "env": {
+          "LD_LIBRARY_PATH": "./lib64",
+          "DYLD_LIBRARY_PATH": "./osx"
+        },
+        "cwd": "${workspaceFolder}/ProjectName/bin/x64/Debug/net6.0"
+      },
+      "type": "process",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "Build: .NET 6 Release",
+      "command": "dotnet",
+      "args": [
+        "build",
+        "./ProjectName/ProjectName.Core.csproj",
+        "--configuration",
+        "Release",
+        "-p:SolutionDir=${workspaceFolder}/",
+        "-p:Platform=x64"
+      ],
+      "type": "shell",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "Run: .NET 6 Release",
+      "command": "dotnet",
+      "args": [
+        "./ProjectName.dll"
+      ],
+      "options": {
+        "env": {
+          "LD_LIBRARY_PATH": "./lib64",
+          "DYLD_LIBRARY_PATH": "./osx"
+        },
+        "cwd": "${workspaceFolder}/ProjectName/bin/x64/Release/net6.0"
+      },
+      "type": "process",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "Build & Run: .NET 6 Release",
+      "dependsOrder": "sequence",
+      "dependsOn": [
+        "Build: .NET 6 Release",
+        "Run: .NET 6 Release"
+      ],
+      "type": "shell",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "Build: Framework Debug",
+      "command": "MsBuild.exe",
+      "args": [
+        "-restore:True",
+        "${workspaceFolder}/ProjectName.Framework.sln",
+        "-p:Configuration=Debug",
+        "-p:Platform=x64"
       ],
       "type": "shell",
       "group": {
@@ -86,16 +240,9 @@
     },
     {
       "label": "Run: Framework Debug",
-      "command": "mono",
+      "command": "ProjectName.exe",
-      "args": [
-        "ProjectName.exe"
-      ],
       "options": {
-        "env": {
+        "cwd": "${workspaceFolder}/ProjectName/bin/x64/Debug/net461"
-          "LD_LIBRARY_PATH": "./lib64",
-          "DYLD_LIBRARY_PATH": "./osx"
-        },
-        "cwd": "${workspaceFolder}/ProjectName/bin/Debug/net461"
       },
       "type": "process",
       "group": {
@@ -119,27 +266,13 @@
       "problemMatcher": []
     },
     {
-      "label": "Build & Run: Core Debug",
+      "label": "Build: Framework Release",
-      "type": "shell",
+      "command": "MsBuild.exe",
-      "dependsOrder": "sequence",
-      "dependsOn": [
-        "Build: Core Debug",
-        "Run: Core Debug"
-      ],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "problemMatcher": []
-    },
-    {
-      "label": "Build: Core Debug",
-      "command": "dotnet",
       "args": [
-        "build",
+        "-restore:True",
-        "./ProjectName.Core.sln",
+        "${workspaceFolder}/ProjectName.Framework.sln",
-        "-f",
+        "-p:Configuration=Release",
-        "netcoreapp3.1"
+        "-p:Platform=x64"
       ],
       "type": "shell",
       "group": {
@@ -149,17 +282,10 @@
       "problemMatcher": []
     },
     {
-      "label": "Run: Core Debug",
+      "label": "Run: Framework Release",
-      "command": "dotnet",
+      "command": "ProjectName.exe",
-      "args": [
-        "./ProjectName.dll"
-      ],
       "options": {
-        "env": {
+        "cwd": "${workspaceFolder}/ProjectName/bin/x64/Release/net461"
-          "LD_LIBRARY_PATH": "./lib64",
-          "DYLD_LIBRARY_PATH": "./osx"
-        },
-        "cwd": "${workspaceFolder}/ProjectName/bin/Debug/netcoreapp3.1"
       },
       "type": "process",
       "group": {
@@ -169,50 +295,12 @@
       "problemMatcher": []
     },
     {
-      "label": "Build: Core Release",
+      "label": "Build & Run: Framework Release",
-      "command": "dotnet",
-      "args": [
-        "build",
-        "./ProjectName.Core.sln",
-        "--configuration",
-        "Release",
-        "-f",
-        "netcoreapp3.1"
-      ],
-      "type": "shell",
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "problemMatcher": []
-    },
-    {
-      "label": "Run: Core Release",
-      "command": "dotnet",
-      "args": [
-        "./ProjectName.dll"
-      ],
-      "options": {
-        "env": {
-          "LD_LIBRARY_PATH": "./lib64",
-          "DYLD_LIBRARY_PATH": "./osx"
-        },
-        "cwd": "${workspaceFolder}/ProjectName/bin/Release/netcoreapp3.1"
-      },
-      "type": "process",
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "problemMatcher": []
-    },
-    {
-      "label": "Build & Run: Core Release",
-      "dependsOrder": "sequence",
       "dependsOn": [
-        "Build: Core Release",
+        "Build: Framework Release",
-        "Run: Core Release"
+        "Run: Framework Release"
       ],
+      "dependsOrder": "sequence",
       "type": "shell",
       "group": {
         "kind": "build",

FNA

@@ -1 +0,0 @@
-Subproject commit d5dd19a87b0046575172df9156ef1043ac8209d3

ProjectName.Core.sln

@@ -1,34 +1,31 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 16
-VisualStudioVersion = 15.0.26124.0
+VisualStudioVersion = 16.0.30717.126
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectName.Core", "ProjectName\ProjectName.Core.csproj", "{4589302C-174A-4173-9654-CAA6CA1B5220}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectName.Core", "ProjectName\ProjectName.Core.csproj", "{4589302C-174A-4173-9654-CAA6CA1B5220}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x64.ActiveCfg = Debug|x64
+		{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x64.Build.0 = Debug|x64
+		{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x86.ActiveCfg = Debug|x86
+		{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x86.Build.0 = Debug|x86
+		{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x64.ActiveCfg = Release|x64
+		{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x64.Build.0 = Release|x64
+		{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x86.ActiveCfg = Release|x86
+		{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+	GlobalSection(ExtensibilityGlobals) = postSolution
-		{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		SolutionGuid = {70247DA8-9C19-4FC5-B4BC-68E1262B9F4B}
-		{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x64.Build.0 = Debug|Any CPU
-		{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x86.Build.0 = Debug|Any CPU
-		{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x64.ActiveCfg = Release|Any CPU
-		{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x64.Build.0 = Release|Any CPU
-		{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x86.ActiveCfg = Release|Any CPU
-		{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

ProjectName.Framework.sln

@@ -1,34 +1,31 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 16
-VisualStudioVersion = 15.0.26124.0
+VisualStudioVersion = 16.0.30717.126
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNATemplate.Framework", "ProjectName\ProjectName.Framework.csproj", "{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectName.Framework", "ProjectName\ProjectName.Framework.csproj", "{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.ActiveCfg = Debug|x64
+		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.Build.0 = Debug|x64
+		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x86.ActiveCfg = Debug|x86
+		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x86.Build.0 = Debug|x86
+		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x64.ActiveCfg = Release|x64
+		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x64.Build.0 = Release|x64
+		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x86.ActiveCfg = Release|x86
+		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+	GlobalSection(ExtensibilityGlobals) = postSolution
-		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		SolutionGuid = {4DB7BE1E-CAC6-4275-B514-20CBE80F794F}
-		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.Build.0 = Debug|Any CPU
-		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x86.Build.0 = Debug|Any CPU
-		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x64.ActiveCfg = Release|Any CPU
-		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x64.Build.0 = Release|Any CPU
-		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x86.ActiveCfg = Release|Any CPU
-		{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

ProjectName/DllMap.cs

@@ -1,259 +0,0 @@
-// only works in .NET Core. disable in .NET framework
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Xml.Linq;
-
-public static class DllMap
-{
-    [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    static extern bool SetDefaultDllDirectories(int directoryFlags);
-
-    [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-    static extern void AddDllDirectory(string lpPathName);
-
-    [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    static extern bool SetDllDirectory(string lpPathName);
-
-    const int LOAD_LIBRARY_SEARCH_DEFAULT_DIRS = 0x00001000;
-
-    public static Dictionary<string, string> MapDictionary;
-    public static string OS;
-    public static string CPU;
-    public static bool Optimise;
-
-    public static void Initialise(bool optimise = true)
-    {
-        Optimise = optimise;
-
-        // Our executabe needs to know how to find the native libraries
-        // For Windows, we can set this to be x86 or x64 directory at runtime (below)
-        // For Linux we need to move our native libraries to 'netcoredeps' which is set by .net core
-        // For OSX we need to set an environment variable (DYLD_LIBRARY_PATH) outside of the process by a script
-        if (Environment.OSVersion.Platform == PlatformID.Win32NT)
-        {
-            try
-            {
-                SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
-                AddDllDirectory(Path.Combine(
-                    AppDomain.CurrentDomain.BaseDirectory,
-                    Environment.Is64BitProcess ? "x64" : "x86"
-                ));
-            }
-            catch
-            {
-                // Pre-Windows 7, KB2533623
-                SetDllDirectory(Path.Combine(
-                    AppDomain.CurrentDomain.BaseDirectory,
-                    Environment.Is64BitProcess ? "x64" : "x86"
-                ));
-            }
-        }
-
-        // .NET Core also doesn't use DllImport but we can replicate this using NativeLibrary as per below
-        // Uses FNA.dll.config to dictate what the name of the native library is per platform and architecture
-        var fnaAssembly = Assembly.GetAssembly(typeof(Microsoft.Xna.Framework.Graphics.ColorWriteChannels));
-        DllMap.Register(fnaAssembly);
-    }
-
-    // Register a call-back for native library resolution.
-    public static void Register(Assembly assembly)
-    {
-        NativeLibrary.SetDllImportResolver(assembly, MapAndLoad);
-
-        // Do setup so that MapLibraryName is faster than reading the XML each time
-
-        // 1) Get platform & cpu
-        OS = GetCurrentPlatform().ToString().ToLowerInvariant();
-        CPU = GetCurrentRuntimeArchitecture().ToString().ToLowerInvariant();
-
-        // 2) Setup MapDictionary
-        // For Windows use hardcoded values
-        // Why?  This is our development platform and we wanted the fastest start time possible (eliminates XML Load)
-        if (OS == "windows" && Optimise)
-        {
-            MapDictionary = new Dictionary<string, string>();
-            MapDictionary.Add("SDL2", "SDL2.dll");
-            MapDictionary.Add("SDL_image", "SDL_image.dll");
-            MapDictionary.Add("FAudio", "FAudio.dll");
-        }
-        else
-        {
-            // For every other platform use XML file
-            // Read in config XML and only store details we're interested in within MapDictionary
-            string xmlPath = Path.Combine(Path.GetDirectoryName(assembly.Location),
-               Path.GetFileNameWithoutExtension(assembly.Location) + ".dll.config");
-
-            if (!File.Exists(xmlPath))
-            {
-                Console.WriteLine($"=== Cannot find XML: " + xmlPath);
-                return;
-            }
-
-            XElement root = XElement.Load(xmlPath);
-
-            MapDictionary = new Dictionary<string, string>();
-            ParseXml(root, true); // Direct match on OS & CPU first
-            ParseXml(root, false); // Loose match on CPU second (won't allow duplicates)
-        }
-    }
-
-    private static void ParseXml(XElement root, bool matchCPU)
-    {
-        foreach (var el in root.Elements("dllmap"))
-        {
-            // Ignore entries for other OSs
-            if (el.Attribute("os").ToString().IndexOf(OS) < 0)
-                continue;
-
-            // Ignore entries for other CPUs
-            if (matchCPU)
-            {
-                if (el.Attribute("cpu") == null)
-                    continue;
-                if (el.Attribute("cpu").ToString().IndexOf(CPU) < 0)
-                    continue;
-            }
-            else
-            {
-                if (el.Attribute("cpu") != null && el.Attribute("cpu").ToString().IndexOf(CPU) < 0)
-                    continue;
-            }
-
-            string oldLib = el.Attribute("dll").Value;
-            string newLib = el.Attribute("target").Value;
-            if (string.IsNullOrWhiteSpace(oldLib) || string.IsNullOrWhiteSpace(newLib))
-                continue;
-
-            // Don't allow duplicates
-            if (MapDictionary.ContainsKey(oldLib))
-                continue;
-
-            MapDictionary.Add(oldLib, newLib);
-        }
-    }
-
-    // The callback: which loads the mapped libray in place of the original
-    private static IntPtr MapAndLoad(string libraryName, Assembly assembly, DllImportSearchPath? dllImportSearchPath)
-    {
-        string mappedName = null;
-        mappedName = MapLibraryName(assembly.Location, libraryName, out mappedName) ? mappedName : libraryName;
-        return NativeLibrary.Load(mappedName, assembly, dllImportSearchPath);
-    }
-
-    // Parse the assembly.xml file, and map the old name to the new name of a library.
-    private static bool MapLibraryName(string assemblyLocation, string originalLibName, out string mappedLibName)
-    {
-        if (MapDictionary.TryGetValue(originalLibName, out mappedLibName))
-            return true;
-        else
-            return false;
-    }
-
-    // Below pinched from Mono.DllMap project:   https://github.com/Firwood-Software/AdvancedDLSupport/tree/1b7394211a655b2f77649ce3b610a3161215cbdc/Mono.DllMap
-    public static DllMapOS GetCurrentPlatform()
-    {
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-        {
-            return DllMapOS.Linux;
-        }
-
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
-            return DllMapOS.Windows;
-        }
-
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-        {
-            return DllMapOS.OSX;
-        }
-
-        var operatingDesc = RuntimeInformation.OSDescription.ToUpperInvariant();
-        foreach (var system in Enum.GetValues(typeof(DllMapOS)).Cast<DllMapOS>()
-            .Except(new[] { DllMapOS.Linux, DllMapOS.Windows, DllMapOS.OSX }))
-        {
-            if (operatingDesc.Contains(system.ToString().ToUpperInvariant()))
-            {
-                return system;
-            }
-        }
-
-        throw new PlatformNotSupportedException($"Couldn't detect platform: {RuntimeInformation.OSDescription}");
-    }
-
-    public static DllMapArchitecture GetCurrentRuntimeArchitecture()
-    {
-        switch (RuntimeInformation.ProcessArchitecture)
-        {
-            case Architecture.Arm:
-                {
-                    return DllMapArchitecture.ARM;
-                }
-            case Architecture.X64:
-                {
-                    return DllMapArchitecture.x86_64;
-                }
-            case Architecture.X86:
-                {
-                    return DllMapArchitecture.x86;
-                }
-        }
-
-        typeof(object).Module.GetPEKind(out _, out var machine);
-        switch (machine)
-        {
-            case ImageFileMachine.I386:
-                {
-                    return DllMapArchitecture.x86;
-                }
-            case ImageFileMachine.AMD64:
-                {
-                    return DllMapArchitecture.x86_64;
-                }
-            case ImageFileMachine.ARM:
-                {
-                    return DllMapArchitecture.ARM;
-                }
-            case ImageFileMachine.IA64:
-                {
-                    return DllMapArchitecture.IA64;
-                }
-        }
-        throw new PlatformNotSupportedException("Couldn't detect the current architecture.");
-    }
-
-    public enum DllMapOS
-    {
-        Linux = 1 << 0,
-        OSX = 1 << 1,
-        Solaris = 1 << 2,
-        FreeBSD = 1 << 3,
-        OpenBSD = 1 << 4,
-        NetBSD = 1 << 5,
-        Windows = 1 << 6,
-        AIX = 1 << 7,
-        HPUX = 1 << 8
-    }
-
-    public enum DllMapArchitecture
-    {
-        x86 = 1 << 0,
-        x86_64 = 1 << 1,
-        SPARC = 1 << 2,
-        PPC = 1 << 3,
-        S390 = 1 << 4,
-        S390X = 1 << 5,
-        ARM = 1 << 6,
-        ARMV8 = 1 << 7,
-        MIPS = 1 << 8,
-        Alpha = 1 << 9,
-        HPPA = 1 << 10,
-        IA64 = 1 << 11
-    }
-}

ProjectName/Program.cs

@@ -14,10 +14,6 @@ namespace ProjectName
 
 		static void Main(string[] args)
 		{
-#if NETCOREAPP
-            DllMap.Initialise(false);
-#endif
-
 			// https://github.com/FNA-XNA/FNA/wiki/4:-FNA-and-Windows-API#64-bit-support
 			if (Environment.OSVersion.Platform == PlatformID.Win32NT)
 			{

ProjectName/ProjectName.Core.csproj

@@ -1,15 +1,16 @@
 <Project>
 	<PropertyGroup>
 		<BaseIntermediateOutputPath>obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<TargetName>ProjectName</TargetName>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
-    <LangVersion>8.0</LangVersion>
+		<LangVersion>7.3</LangVersion>
 		<StartupObject>ProjectName.Program</StartupObject>
 		<AssemblyName>ProjectName</AssemblyName>
 		<RootNamespace>ProjectName</RootNamespace>
@@ -25,6 +26,6 @@
 	<ItemGroup>
 		<ProjectReference Include="..\FNA\FNA.Core.csproj" />
 	</ItemGroup>
-  <Import Project="..\build\CopyFNALibs.targets"/>
+	<Import Project=".\CopyFNALibs.targets" />
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
 </Project>

ProjectName/ProjectName.Framework.csproj

@@ -1,15 +1,16 @@
 <Project>
 	<PropertyGroup>
 		<BaseIntermediateOutputPath>obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+		<Platforms>x64;x86</Platforms>
 	</PropertyGroup>
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 	<PropertyGroup>
-    <OutputType>WinExe</OutputType>
+		<OutputType>Exe</OutputType>
 		<TargetFramework>net461</TargetFramework>
 		<TargetName>ProjectName</TargetName>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
-    <LangVersion>8.0</LangVersion>
+		<LangVersion>7.3</LangVersion>
 		<StartupObject>ProjectName.Program</StartupObject>
 		<AssemblyName>ProjectName</AssemblyName>
 		<RootNamespace>ProjectName</RootNamespace>
@@ -28,6 +29,6 @@
 	<ItemGroup>
 		<ProjectReference Include="..\FNA\FNA.csproj" />
 	</ItemGroup>
-  <Import Project="..\build\CopyFNALibs.targets"/>
+	<Import Project=".\CopyFNALibs.targets" />
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
 </Project>

README.md

@@ -1,22 +1,25 @@
 # FNA-VSCode-Template
 
-Template and build tasks for developing a cross-platform multi-target .NET Framework and .NET Core FNA project in VSCode.
+Template and build tasks for developing a cross-platform multi-target .NET Framework, Mono, and .NET 6 FNA project in VSCode.
+
+The generated solution file will also work in regular Visual Studio.
 
 ## Features
 
 - Includes project boilerplate code
-- Build tasks for both .NET Framework and .NET Core side by side
+- Build tasks for both .NET Framework, Mono, and .NET 6 side by side
-- Press F5 to build and debug in-editor with Core Debugger
+- VSCode debugger integration
 
 ## Requirements
 
-- [Git](https://git-scm.com/)
+- [Git](https://git-scm.com/) or [Git for Windows](https://gitforwindows.org/) on Windows
-- [Git for Windows](https://gitforwindows.org/) if on Windows
+- [.NET 6 SDK](https://dotnet.microsoft.com/download/dotnet/6.0)
+- [.NET Framework 4.6.1 Developer Pack](https://dotnet.microsoft.com/download/dotnet-framework/net461) on Windows
+- [Build Tools for Visual Studio 2019](https://visualstudio.microsoft.com/downloads/) on Windows
+- [Mono](https://www.mono-project.com/) on OSX or Linux
 - [Visual Studio Code](https://code.visualstudio.com/)
 - [VSCode C# Extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp)
-- [.NET Core SDK](https://dotnet.microsoft.com/download/dotnet-core)
+- [VSCode Mono Debug Extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.mono-debug) if debugging using Mono
-- [.NET Framework SDK](https://dotnet.microsoft.com/download/visual-studio-sdks) or [Mono](https://www.mono-project.com/)
-
 
 ## Installation
 
@@ -24,14 +27,16 @@ Template and build tasks for developing a cross-platform multi-target .NET Frame
 - Download this repository
 - Run `install.sh`
 - Move the newly created project directory wherever you want
+- On Windows, add `C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin` to your system environment PATH variable after installing Build Tools for VS 2019
 
 ## Usage
 
 - Open the project directory in VSCode
 - Press Ctrl-Shift-B to open the build tasks menu
-- `Framework` tasks use .NET Framework or Mono to build and run
+- `Framework` tasks use .NET Framework to build and run (Windows only)
-- `Core` tasks use .NET Core to build and run
+- `Mono` tasks use Mono to build and run
-- Press F5 to build and debug with Core Debugger
+- `.NET 6` tasks use .NET 6 to build and run
+- Press F5 to build and debug
 
 ## Acknowledgments
 

install.sh

@@ -7,6 +7,8 @@
 # Get the directory of this script
 MY_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
+readlinkf(){ perl -MCwd -e 'print Cwd::abs_path shift' "$1";}
+
 # Checks if git is installed
 function checkGit()
 {
@@ -17,10 +19,11 @@ function checkGit()
 	fi
 }
 
-# Pulls FNA from the git master branch
+# Pulls FNA from github
 function pullFNA()
 {
 	checkGit
+	git submodule add https://github.com/FNA-XNA/FNA.git
 	echo "Updating to the latest git version of FNA..."
 	git submodule update --init --recursive
 	if [ $? -eq 0 ]; then
@@ -36,7 +39,7 @@ function getLibs()
 {
 	# Downloading
 	echo "Downloading latest fnalibs..."
-    curl http://fna.flibitijibibo.com/archive/fnalibs.tar.bz2 > "$MY_DIR/fnalibs.tar.bz2"
+	curl https://fna.flibitijibibo.com/archive/fnalibs.tar.bz2 > "$MY_DIR/fnalibs.tar.bz2"
 	if [ $? -eq 0 ]; then
 		echo "Finished downloading!"
 	else
@@ -58,22 +61,30 @@ function getLibs()
 	fi
 }
 
-getLibs
-pullFNA
-
 read -p "Enter your project name or 'exit' to quit: " newProjectName
 if [[ $newProjectName = 'exit' || -z "$newProjectName" ]]; then
 	exit 1
 fi
 
-# copy everything into new dir
 NEW_PROJECT_DIR="$MY_DIR/../$newProjectName"
+
+if [ -d "$NEW_PROJECT_DIR" ]; then
+	>&2 echo "ERROR: Project directory already exists."
+	exit 1
+fi
+
+getLibs
+
+# copy everything into new dir
 cp -R "$MY_DIR" "$NEW_PROJECT_DIR"
 
 cd "$NEW_PROJECT_DIR"
 files=(ProjectName.Core.sln ProjectName.Framework.sln .gitignore ProjectName/ProjectName.Core.csproj ProjectName/ProjectName.Framework.csproj ProjectName/ProjectNameGame.cs ProjectName/Program.cs .vscode/tasks.json .vscode/launch.json)
 for file in "${files[@]}"; do
 	sed -i -e "s/ProjectName/$newProjectName/g" "./$file"
+	if [ "$(uname)" == "Darwin" ]; then
+		rm ./${file}-e
+	fi
 done
 
 mv ./ProjectName.Core.sln "./$newProjectName.Core.sln"
@@ -83,5 +94,19 @@ mv ./ProjectName/ProjectName.Framework.csproj "./ProjectName/$newProjectName.Fra
 mv ./ProjectName/ProjectNameGame.cs ./ProjectName/${newProjectName}Game.cs
 mv ./ProjectName "./$newProjectName"
 rm ./install.sh
+rm ./LICENSE
 
-echo "Project $newProjectName created at $(readlink -f $NEW_PROJECT_DIR)"
+rm -rf .git
+git init
+pullFNA
+
+dotnet sln ${newProjectName}.Framework.sln add FNA/FNA.csproj
+dotnet sln ${newProjectName}.Core.sln add FNA/FNA.Core.csproj
+
+echo "Project $newProjectName created at: "
+
+if [ "$(uname)" == "Darwin" ]; then
+	echo $(readlinkf $NEW_PROJECT_DIR)
+else
+	echo $(readlink -f $NEW_PROJECT_DIR)
+fi