Started work on reporting syntax version on .dll

Fixed text above search bar.

Engines/FlatRedBallXNA/FlatRedBall/FlatRedBallServices.cs

@@ -112,9 +112,15 @@ public object GetService(Type serviceType)
         #endregion
     }
 
+    public class SyntaxVersionAttribute : Attribute
+    {
+        public int Version = 51;
+    }
+
     public static partial class FlatRedBallServices
     {
         internal static SingleThreadSynchronizationContext singleThreadSynchronizationContext;
+
         #region Fields
 
         static List<IManager> mManagers = new List<IManager>();
@@ -164,6 +170,7 @@ public static partial class FlatRedBallServices
         private static SpriteBatch _loadingScreenSpriteBatch = null;
         private static Rectangle _sourceRect;
 
+
         #endregion
 
         #region Properties

FRBDK/Glue/Glue/GlueFormsCore.csproj

@@ -179,6 +179,8 @@
 			<!--<ExcludeAssets>runtime</ExcludeAssets>-->
 		</PackageReference>
 
+		<PackageReference Include="Mono.Cecil" Version="0.11.5" />
+
 		<PackageReference Include="NAudio" Version="2.1.0" />
 		<PackageReference Include="NAudio.Core" Version="2.1.0" />
 		<PackageReference Include="NAudio.Vorbis" Version="1.5.0" />

FRBDK/Glue/Glue/IO/BuiltFileCopier.cs

@@ -104,7 +104,7 @@ bool NeedsCopiedXnbs(ProjectBase project)
                 project is Windows8MonoGameProject || 
                 project is AndroidProject ||
                 project is UwpProject ||
-                project is DesktopGlProject;
+                project is MonoGameDesktopGlBaseProject;
 
         }
 

FRBDK/Glue/Glue/Plugins/EmbeddedPlugins/SyncedProjects/SyncedProjectLogic.cs

@@ -116,7 +116,7 @@ public bool GetIfHandledByContentPipelinePlugin(VisualStudioProject targetProjec
                     extension == "fbx" ||
                     (extension == "png" && rfs != null && rfs.UseContentPipeline);
             }
-            else if(targetProject is DesktopGlLinuxProject || targetProject is DesktopGlProject)
+            else if(targetProject is DesktopGlLinuxProject || targetProject is MonoGameDesktopGlBaseProject)
             {
                 // DesktopGL can support other audio engines like NAudio. I don't know if other
                 // platforms will get this, but we may want to expand this at some point in the future...

FRBDK/Glue/Glue/Plugins/ExportedImplementations/GlueState.cs

@@ -467,7 +467,7 @@ public bool IsReferencingFrbSource
                 }
                 else
                 {
-                    if(CurrentMainProject is DesktopGlProject)
+                    if(CurrentMainProject is MonoGameDesktopGlBaseProject)
                     {
                         // todo - handle different types of projects
                         string projectReferenceName;

FRBDK/Glue/Glue/SaveClasses/GlueProjectSave.cs

@@ -135,6 +135,8 @@ public enum GluxVersions
             // Technically this isn't referencing GumCommon project, but it's referencing code from GumCommon
             GumCommonCodeReferencing = 50,
             GumTextSupportsBbCode = 51
+
+            // Stop! If adding an entry here, modify SyntaxVersionAttribute.Version
         }
 
         #endregion

FRBDK/Glue/Glue/VSHelpers/Projects/DesktopGlLinuxProject.cs

@@ -7,7 +7,7 @@
 
 namespace FlatRedBall.Glue.VSHelpers.Projects
 {
-    public class DesktopGlLinuxProject : DesktopGlProject
+    public class DesktopGlLinuxProject : MonoGameDesktopGlNetFrameworkProject
     {
 
         public override string ProjectId { get { return "DesktopGlLinux"; } }

FRBDK/Glue/Glue/VSHelpers/Projects/MonoGameDesktopGlBaseProject.cs

@@ -0,0 +1,42 @@
+using Microsoft.Build.Evaluation;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlatRedBall.Glue.VSHelpers.Projects
+{
+    public abstract class MonoGameDesktopGlBaseProject : VisualStudioProject
+    {
+        public override string ProjectId { get { return "DesktopGl"; } }
+        public override string PrecompilerDirective { get { return "DESKTOP_GL"; } }
+
+        public override bool AllowContentCompile => false;
+
+        public override string ContentDirectory => "Content/";
+
+
+        public override string FolderName => "DesktopGl";
+
+        protected override bool NeedToSaveContentProject  => false;
+
+        public MonoGameDesktopGlBaseProject(Project project) : base(project)
+        {
+        }
+
+        public override string ProcessInclude(string path)
+        {
+            var returnValue = base.ProcessInclude(path);
+
+            return returnValue.ToLowerInvariant();
+        }
+
+        public override string ProcessLink(string path)
+        {
+            var returnValue = base.ProcessLink(path);
+            // Linux is case-sensitive
+            return returnValue.ToLowerInvariant();
+        }
+    }
+}

FRBDK/Glue/Glue/VSHelpers/Projects/MonoGameDesktopGlNetCoreProject.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Build.Evaluation;
+
+namespace FlatRedBall.Glue.VSHelpers.Projects
+{
+    public class MonoGameDesktopGlNetCoreProject : MonoGameDesktopGlBaseProject
+    {
+
+        const string FlatRedBallDll = "FlatRedBallDesktopGL.dll";
+
+        public override List<string> LibraryDlls
+        {
+            get
+            {
+                return new List<string>
+                {
+                    FlatRedBallDll
+                };
+            }
+        }
+
+        public override string NeededVisualStudioVersion
+        {
+            get { return "14.0"; }
+
+        }
+
+        public MonoGameDesktopGlNetCoreProject(Project project) : base(project)
+        {
+        }
+
+
+
+    }
+}

FRBDK/Glue/Glue/VSHelpers/Projects/MonoGameDesktopGlNetFrameworkProject.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Build.Evaluation;
+
+namespace FlatRedBall.Glue.VSHelpers.Projects
+{
+    public class MonoGameDesktopGlNetFrameworkProject : MonoGameDesktopGlBaseProject
+    {
+
+        const string FlatRedBallDll = "FlatRedBallDesktopGL.dll";
+
+        public override List<string> LibraryDlls
+        {
+            get
+            {
+                return new List<string>
+                {
+                    FlatRedBallDll
+                };
+            }
+        }
+
+        public override string NeededVisualStudioVersion
+        {
+            get { return "14.0"; }
+
+        }
+
+        public MonoGameDesktopGlNetFrameworkProject(Project project) : base(project)
+        {
+        }
+
+
+
+    }
+}

FRBDK/Glue/Glue/VSHelpers/Projects/ProjectCreator.cs

@@ -235,18 +235,42 @@ class PreprocessorAndFunc
         {
             public string Preprocessor;
             public Func<ProjectBase> Func;
+            public Version MinVersion;
 
             public PreprocessorAndFunc(string preprocessor, Func<ProjectBase> func)
             {
                 Preprocessor = preprocessor;
                 Func = func;
             }
+
+            public PreprocessorAndFunc(string preprocessor, Version minVersion, Func<ProjectBase> func)
+            {
+                Preprocessor = preprocessor;
+                Func = func;
+                MinVersion = minVersion;
+            }
         }
 
 
         private static ProjectBase TryGetProjectTypeFromDefineConstants(Project coreVisualStudioProject, out string message)
         {
             string preProcessorConstants = GetPreProcessorConstantsFromProject(coreVisualStudioProject);
+            var frameworkProperty = coreVisualStudioProject.AllEvaluatedProperties.FirstOrDefault(item => item.Name == "TargetFrameworkVersion");
+            var dotNetVersionString = frameworkProperty?.EvaluatedValue;
+            Version version = null;
+            if (dotNetVersionString?.StartsWith("v") == true)
+            {
+                var afterV = dotNetVersionString.Substring(1);
+                try
+                {
+                    version = new Version(afterV);
+                }
+                catch
+                {
+
+                }
+
+            }
 
             //string sasfd = ProjectManager.LibrariesPath;
 
@@ -272,7 +296,8 @@ private static ProjectBase TryGetProjectTypeFromDefineConstants(Project coreVisu
                 loadCalls.Add(new PreprocessorAndFunc("ANDROID", () => new AndroidProject(coreVisualStudioProject)));
                 loadCalls.Add(new PreprocessorAndFunc("IOS", () => new IosMonogameProject(coreVisualStudioProject)));
                 loadCalls.Add(new PreprocessorAndFunc("UWP", () => new UwpProject(coreVisualStudioProject)));
-                loadCalls.Add(new PreprocessorAndFunc("DESKTOP_GL", () => new DesktopGlProject(coreVisualStudioProject)));
+                loadCalls.Add(new PreprocessorAndFunc("DESKTOP_GL", new Version(6,0), () => new MonoGameDesktopGlNetCoreProject(coreVisualStudioProject)));
+                loadCalls.Add(new PreprocessorAndFunc("DESKTOP_GL", () => new MonoGameDesktopGlNetFrameworkProject(coreVisualStudioProject)));
                 loadCalls.Add(new PreprocessorAndFunc("FNA", () => new FnaDesktopProject(coreVisualStudioProject)));
                 // Do XNA_4 last, since every 
                 // other project type has this 
@@ -285,7 +310,12 @@ private static ProjectBase TryGetProjectTypeFromDefineConstants(Project coreVisu
 
                 foreach (var call in loadCalls)
                 {
-                    if(preProcessorConstants?.Contains(call.Preprocessor) == true)
+                    var matchesPreprocessor =
+                        preProcessorConstants?.Contains(call.Preprocessor) == true;
+
+                    var matchesOrExceedsVersion = call.MinVersion == null || version >= call.MinVersion;
+
+                    if (matchesPreprocessor && matchesOrExceedsVersion)
                     {
                         toReturn = call.Func();
                         break;
@@ -306,9 +336,9 @@ private static ProjectBase TryGetProjectTypeFromDefineConstants(Project coreVisu
                         message += "\n\nThis project has no preprocessor directives. An unknown error has occurred.";
 
                         message += "\n\nThe project has the following properties:";
-                        foreach (var property in coreVisualStudioProject.Properties)
+                        foreach (var vsProperty in coreVisualStudioProject.Properties)
                         {
-                            message += $"{property.Name} {property.EvaluatedValue}";
+                            message += $"{vsProperty.Name} {vsProperty.EvaluatedValue}";
                         }
                     }
                     else

FRBDK/Glue/Glue/VSHelpers/Projects/VisualStudioProject.cs

@@ -33,6 +33,8 @@ public abstract class VisualStudioProject : ProjectBase
 
         List<string> mExtensionsToIgnore = new List<string>();
 
+        public int? FlatRedBallSyntaxVersion { get; set; } 
+
         #endregion
 
         #region Properties
@@ -631,6 +633,13 @@ public override void Load(string fileName)
             }
 
             LoadContentProject();
+
+            FindSyntaxVersion();
+        }
+
+        protected virtual void FindSyntaxVersion()
+        {
+            // derived are responsible for this
         }
 
         public override void Unload()

FRBDK/Glue/OfficialPlugins/ContentPipelinePlugin/BuildLogic.cs

@@ -87,7 +87,7 @@ public async Task RefreshBuiltFilesFor(VisualStudioProject project, bool forcePn
 
         public static bool GetIfNeedsMonoGameFilesBuilt(ProjectBase project)
         {
-            return project is DesktopGlProject ||
+            return project is MonoGameDesktopGlBaseProject ||
                 project is AndroidProject ||
                 project is UwpProject
                 // todo: need to support iOS
@@ -294,7 +294,7 @@ private static string GetPipelinePlatformNameFor(ProjectBase project)
             // PSVita
             // XboxOne
             // Switch
-            if (project is DesktopGlProject)
+            if (project is MonoGameDesktopGlBaseProject)
             {
                 platform = "DesktopGL";
             }