Merge branch 'GoaLitiuM-vs2026'

Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs

@@ -54,6 +54,9 @@ namespace FlaxEditor.Modules.SourceCodeEditing
             case CodeEditorTypes.VS2022:
                 Name = "Visual Studio 2022";
                 break;
+            case CodeEditorTypes.VS2026:
+                Name = "Visual Studio 2026";
+                break;
             case CodeEditorTypes.VSCode:
                 Name = "Visual Studio Code";
                 break;
@@ -110,6 +113,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
             case CodeEditorTypes.VS2017:
             case CodeEditorTypes.VS2019:
             case CodeEditorTypes.VS2022:
+            case CodeEditorTypes.VS2026:
                 // TODO: finish dynamic files adding to the project
                 //Editor.Instance.ProgressReporting.GenerateScriptsProjectFiles.RunAsync();
                 break;

Source/Editor/Scripting/CodeEditor.h

@@ -62,6 +62,11 @@ API_ENUM(Namespace="FlaxEditor", Attributes="HideInEditor") enum class CodeEdito
     /// </summary>
     VS2022,
 
+    /// <summary>
+    /// Visual Studio 2026
+    /// </summary>
+    VS2026,
+
     /// <summary>
     /// Visual Studio Code
     /// </summary>

Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp

@@ -43,6 +43,9 @@ VisualStudioEditor::VisualStudioEditor(VisualStudioVersion version, const String
     case VisualStudioVersion::VS2022:
         _type = CodeEditorTypes::VS2022;
         break;
+    case VisualStudioVersion::VS2026:
+        _type = CodeEditorTypes::VS2026;
+        break;
     default: CRASH;
         break;
     }
@@ -70,6 +73,9 @@ void VisualStudioEditor::FindEditors(Array<CodeEditor*>* output)
         VisualStudioVersion version;
         switch (info.VersionMajor)
         {
+        case 18:
+            version = VisualStudioVersion::VS2026;
+            break;
         case 17:
             version = VisualStudioVersion::VS2022;
             break;

Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.h

@@ -10,7 +10,7 @@
 /// <summary>
 /// Microsoft Visual Studio version types
 /// </summary>
-DECLARE_ENUM_8(VisualStudioVersion, VS2008, VS2010, VS2012, VS2013, VS2015, VS2017, VS2019, VS2022);
+DECLARE_ENUM_9(VisualStudioVersion, VS2008, VS2010, VS2012, VS2013, VS2015, VS2017, VS2019, VS2022, VS2026);
 
 /// <summary>
 /// Implementation of code editor utility that is using Microsoft Visual Studio.

Source/Tools/Flax.Build/Build/Builder.Projects.cs

@@ -192,6 +192,8 @@ namespace Flax.Build
             {
                 // Pick the project format
                 var projectFormats = new HashSet<ProjectFormat>();
+                if (Configuration.ProjectFormatVS2026)
+                    projectFormats.Add(ProjectFormat.VisualStudio2026);
                 if (Configuration.ProjectFormatVS2022)
                     projectFormats.Add(ProjectFormat.VisualStudio2022);
                 if (Configuration.ProjectFormatVS2019)
@@ -209,8 +211,13 @@ namespace Flax.Build
                 if (projectFormats.Count == 0)
                     projectFormats.Add(Platform.BuildPlatform.DefaultProjectFormat);
 
-                // Always generate VS solution files for project (needed for C# Intellisense support)
+                // Always generate VS solution files for project (needed for C# Intellisense support in other IDEs)
-                projectFormats.Add(ProjectFormat.VisualStudio2022);
+                if (!projectFormats.Contains(ProjectFormat.VisualStudio2026) &&
+                    !projectFormats.Contains(ProjectFormat.VisualStudio2022) &&
+                    !projectFormats.Contains(ProjectFormat.VisualStudio))
+                {
+                    projectFormats.Add(ProjectFormat.VisualStudio2022);
+                }
 
                 foreach (ProjectFormat projectFormat in projectFormats)
                     GenerateProject(projectFormat);

Source/Tools/Flax.Build/Configuration.cs

@@ -201,6 +201,12 @@ namespace Flax.Build
         [CommandLine("vs2022", "Generates Visual Studio 2022 project format files. Valid only with -genproject option.")]
         public static bool ProjectFormatVS2022 = false;
 
+        /// <summary>
+        /// Generates Visual Studio 2026 project format files. Valid only with -genproject option.
+        /// </summary>
+        [CommandLine("vs2026", "Generates Visual Studio 2026 project format files. Valid only with -genproject option.")]
+        public static bool ProjectFormatVS2026 = false;
+
         /// <summary>
         /// Generates Visual Studio Code project format files. Valid only with -genproject option.
         /// </summary>

Source/Tools/Flax.Build/Platforms/GDK/GDKPlatform.cs

@@ -32,8 +32,11 @@ namespace Flax.Build.Platforms
             if (!toolsets.ContainsKey(WindowsPlatformToolset.v141) &&
                 !toolsets.ContainsKey(WindowsPlatformToolset.v142) &&
                 !toolsets.ContainsKey(WindowsPlatformToolset.v143) &&
-                !toolsets.ContainsKey(WindowsPlatformToolset.v144))
+                !toolsets.ContainsKey(WindowsPlatformToolset.v144) &&
+                !toolsets.ContainsKey(WindowsPlatformToolset.v145))
+            {
                 _hasRequiredSDKsInstalled = false;
+            }
         }
     }
 }

Source/Tools/Flax.Build/Platforms/UWP/UWPPlatform.cs

@@ -31,7 +31,12 @@ namespace Flax.Build.Platforms
             }
 
             // Visual Studio 2017+ supported only
-            var visualStudio = VisualStudioInstance.GetInstances().FirstOrDefault(x => x.Version == VisualStudioVersion.VisualStudio2017 || x.Version == VisualStudioVersion.VisualStudio2019 || x.Version == VisualStudioVersion.VisualStudio2022);
+            var visualStudio = VisualStudioInstance.GetInstances().FirstOrDefault(x =>
+                x.Version == VisualStudioVersion.VisualStudio2017 || 
+                x.Version == VisualStudioVersion.VisualStudio2019 || 
+                x.Version == VisualStudioVersion.VisualStudio2022 ||
+                x.Version == VisualStudioVersion.VisualStudio2026
+                );
             if (visualStudio == null)
                 _hasRequiredSDKsInstalled = false;
 
@@ -46,7 +51,8 @@ namespace Flax.Build.Platforms
             if (!toolsets.ContainsKey(WindowsPlatformToolset.v141) &&
                 !toolsets.ContainsKey(WindowsPlatformToolset.v142) &&
                 !toolsets.ContainsKey(WindowsPlatformToolset.v143) &&
-                !toolsets.ContainsKey(WindowsPlatformToolset.v144))
+                !toolsets.ContainsKey(WindowsPlatformToolset.v144) &&
+                !toolsets.ContainsKey(WindowsPlatformToolset.v145))
             {
                 _hasRequiredSDKsInstalled = false;
             }

Source/Tools/Flax.Build/Platforms/UWP/UWPToolchain.cs

@@ -29,7 +29,12 @@ namespace Flax.Build.Platforms
         public UWPToolchain(UWPPlatform platform, TargetArchitecture architecture, WindowsPlatformToolset toolsetVer = WindowsPlatformToolset.Latest, WindowsPlatformSDK sdkVer = WindowsPlatformSDK.Latest)
         : base(platform, architecture, toolsetVer, sdkVer)
         {
-            var visualStudio = VisualStudioInstance.GetInstances().FirstOrDefault(x => x.Version == VisualStudioVersion.VisualStudio2017 || x.Version == VisualStudioVersion.VisualStudio2019 || x.Version == VisualStudioVersion.VisualStudio2022);
+            var visualStudio = VisualStudioInstance.GetInstances().FirstOrDefault(x =>
+                x.Version == VisualStudioVersion.VisualStudio2017 ||
+                x.Version == VisualStudioVersion.VisualStudio2019 ||
+                x.Version == VisualStudioVersion.VisualStudio2022 ||
+                x.Version == VisualStudioVersion.VisualStudio2026
+                );
             if (visualStudio == null)
                 throw new Exception("Missing Visual Studio 2017 or newer. It's required to build for UWP.");
             _usingDirs.Add(Path.Combine(visualStudio.Path, "VC", "vcpackages"));

Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatform.cs

@@ -40,7 +40,8 @@ namespace Flax.Build.Platforms
                 !toolsets.ContainsKey(WindowsPlatformToolset.v141) &&
                 !toolsets.ContainsKey(WindowsPlatformToolset.v142) &&
                 !toolsets.ContainsKey(WindowsPlatformToolset.v143) &&
-                !toolsets.ContainsKey(WindowsPlatformToolset.v144))
+                !toolsets.ContainsKey(WindowsPlatformToolset.v144) &&
+                !toolsets.ContainsKey(WindowsPlatformToolset.v145))
             {
                 Log.Warning("Missing MSVC toolset v140 or later (VS 2015 or later C++ build tools). Cannot build for Windows platform.");
                 _hasRequiredSDKsInstalled = false;

Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs

@@ -54,6 +54,11 @@ namespace Flax.Build.Platforms
         /// Visual Studio 2022 (v17.10 and later)
         /// </summary>
         v144 = 144,
+
+        /// <summary>
+        /// Visual Studio 2026
+        /// </summary>
+        v145 = 145,
     }
 
     /// <summary>
@@ -252,6 +257,8 @@ namespace Flax.Build.Platforms
                         _toolsets[WindowsPlatformToolset.v143] = toolset;
                     else if (version.Major == 14 && version.Minor / 10 == 4)
                         _toolsets[WindowsPlatformToolset.v144] = toolset;
+                    else if (version.Major == 14 && version.Minor / 10 == 5)
+                        _toolsets[WindowsPlatformToolset.v145] = toolset;
                     else
                         Log.Warning("Found Unsupported MSVC toolset version: " + version);
                 }
@@ -287,11 +294,12 @@ namespace Flax.Build.Platforms
                 }
             }
 
-            // Visual Studio 2017-2022 - multiple instances
+            // Visual Studio 2017 or later - multiple instances
             foreach (var vs in vsInstances.Where(x =>
                                                  x.Version == VisualStudioVersion.VisualStudio2017 ||
                                                  x.Version == VisualStudioVersion.VisualStudio2019 ||
-                                                 x.Version == VisualStudioVersion.VisualStudio2022
+                                                 x.Version == VisualStudioVersion.VisualStudio2022 ||
+                                                 x.Version == VisualStudioVersion.VisualStudio2026
                                                 ))
             {
                 FindMsvcToolsets(Path.Combine(vs.Path, "VC", "Tools", "MSVC"));
@@ -469,6 +477,7 @@ namespace Flax.Build.Platforms
             case WindowsPlatformToolset.v142:
             case WindowsPlatformToolset.v143:
             case WindowsPlatformToolset.v144:
+            case WindowsPlatformToolset.v145:
             {
                 string hostFolder = hostArchitecture == TargetArchitecture.x86 ? "HostX86" : $"Host{hostArchitecture.ToString().ToLower()}";
                 string nativeCompilerPath = Path.Combine(vcToolChainDir, "bin", hostFolder, architecture.ToString().ToLower(), "cl.exe");

Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs

@@ -89,7 +89,11 @@ namespace Flax.Build.Platforms
             // Pick the newest installed Visual Studio version if using the default toolset
             if (toolsetVer == WindowsPlatformToolset.Default)
             {
-                if (VisualStudioInstance.HasIDE(VisualStudioVersion.VisualStudio2022))
+                if (VisualStudioInstance.HasIDE(VisualStudioVersion.VisualStudio2026))
+                {
+                    toolsetVer = WindowsPlatformToolset.v145;
+                }
+                else if (VisualStudioInstance.HasIDE(VisualStudioVersion.VisualStudio2022))
                 {
                     if (toolsets.Keys.Contains(WindowsPlatformToolset.v144))
                     {
@@ -206,6 +210,7 @@ namespace Flax.Build.Platforms
             case WindowsPlatformToolset.v142:
             case WindowsPlatformToolset.v143:
             case WindowsPlatformToolset.v144:
+            case WindowsPlatformToolset.v145:
             {
                 switch (Architecture)
                 {
@@ -392,6 +397,7 @@ namespace Flax.Build.Platforms
             var vcToolChainDir = toolsets[Toolset];
             switch (Toolset)
             {
+            case WindowsPlatformToolset.v145:
             case WindowsPlatformToolset.v144:
             case WindowsPlatformToolset.v143:
             case WindowsPlatformToolset.v142:

Source/Tools/Flax.Build/Projects/ProjectFormat.cs

@@ -37,6 +37,11 @@ namespace Flax.Build.Projects
         /// </summary>
         VisualStudio2022,
 
+        /// <summary>
+        /// Visual Studio 2026.
+        /// </summary>
+        VisualStudio2026,
+
         /// <summary>
         /// Visual Studio Code.
         /// </summary>

Source/Tools/Flax.Build/Projects/ProjectGenerator.cs

@@ -84,7 +84,11 @@ namespace Flax.Build.Projects
             // Pick the newest installed Visual Studio version
             if (format == ProjectFormat.VisualStudio)
             {
-                if (VisualStudioInstance.HasIDE(VisualStudioVersion.VisualStudio2022))
+                if (VisualStudioInstance.HasIDE(VisualStudioVersion.VisualStudio2026))
+                {
+                    format = ProjectFormat.VisualStudio2026;
+                }
+                else if (VisualStudioInstance.HasIDE(VisualStudioVersion.VisualStudio2022))
                 {
                     format = ProjectFormat.VisualStudio2022;
                 }
@@ -113,6 +117,7 @@ namespace Flax.Build.Projects
             case ProjectFormat.VisualStudio2017:
             case ProjectFormat.VisualStudio2019:
             case ProjectFormat.VisualStudio2022:
+            case ProjectFormat.VisualStudio2026:
             {
                 VisualStudioVersion vsVersion;
                 switch (format)
@@ -129,6 +134,9 @@ namespace Flax.Build.Projects
                 case ProjectFormat.VisualStudio2022:
                     vsVersion = VisualStudioVersion.VisualStudio2022;
                     break;
+                case ProjectFormat.VisualStudio2026:
+                    vsVersion = VisualStudioVersion.VisualStudio2026;
+                    break;
                 default: throw new ArgumentOutOfRangeException(nameof(format), format, null);
                 }
                 switch (type)

Source/Tools/Flax.Build/Projects/VisualStudio/CSProjectGenerator.cs

@@ -50,7 +50,9 @@ namespace Flax.Build.Projects.VisualStudio
                 projectTypes = ProjectTypeGuids.ToOption(ProjectTypeGuids.FlaxVS) + ';' + projectTypes;
 
             // Try to reuse the existing project guid from solution file
-            vsProject.ProjectGuid = GetProjectGuid(solutionPath, vsProject.Name);
+            vsProject.ProjectGuid = GetProjectGuid(vsProject.Path, vsProject.Name);
+            if (vsProject.ProjectGuid == Guid.Empty)
+                vsProject.ProjectGuid = GetProjectGuid(solutionPath, vsProject.Name);
             if (vsProject.ProjectGuid == Guid.Empty)
                 vsProject.ProjectGuid = Guid.NewGuid();
 

Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs

@@ -55,7 +55,9 @@ namespace Flax.Build.Projects.VisualStudio
             }
 
             // Try to reuse the existing project guid from solution file
-            vsProject.ProjectGuid = GetProjectGuid(solutionPath, vsProject.Name);
+            vsProject.ProjectGuid = GetProjectGuid(vsProject.Path, vsProject.Name);
+            if (vsProject.ProjectGuid == Guid.Empty)
+                vsProject.ProjectGuid = GetProjectGuid(solutionPath, vsProject.Name);
             if (vsProject.ProjectGuid == Guid.Empty)
                 vsProject.ProjectGuid = Guid.NewGuid();
 

Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs

@@ -28,6 +28,7 @@ namespace Flax.Build.Projects.VisualStudio
                 case VisualStudioVersion.VisualStudio2017: return "v141";
                 case VisualStudioVersion.VisualStudio2019: return "v142";
                 case VisualStudioVersion.VisualStudio2022: return "v143";
+                case VisualStudioVersion.VisualStudio2026: return "v145";
                 }
                 return string.Empty;
             }

Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioInstance.cs

@@ -128,6 +128,8 @@ namespace Flax.Build.Projects.VisualStudio
                                 version = VisualStudioVersion.VisualStudio2019;
                             else if (displayName.Contains("2022"))
                                 version = VisualStudioVersion.VisualStudio2022;
+                            else if (displayName.Contains("2026"))
+                                version = VisualStudioVersion.VisualStudio2026;
                             else
                             {
                                 Log.Warning(string.Format("Unknown Visual Studio installation. Display name: {0}", displayName));

Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs

@@ -128,6 +128,7 @@ namespace Flax.Build.Projects.VisualStudio
                 case VisualStudioVersion.VisualStudio2017: return "15.0";
                 case VisualStudioVersion.VisualStudio2019: return "16.0";
                 case VisualStudioVersion.VisualStudio2022: return "17.0";
+                case VisualStudioVersion.VisualStudio2026: return "18.0";
                 }
 
                 return string.Empty;
@@ -193,7 +194,7 @@ namespace Flax.Build.Projects.VisualStudio
         }
 
         /// <inheritdoc />
-        public override string SolutionFileExtension => "sln";
+        public override string SolutionFileExtension => /*Version >= VisualStudioVersion.VisualStudio2026 ? "slnx" :*/ "sln";
 
         /// <inheritdoc />
         public override Project CreateProject()
@@ -277,6 +278,20 @@ namespace Flax.Build.Projects.VisualStudio
                 }
             }
 
+            if (Version >= VisualStudioVersion.VisualStudio2026)
+                GenerateXmlSolution(solution);
+            else
+                GenerateAsciiSolution(solution);
+        }
+
+        private void GenerateXmlSolution(Solution solution)
+        {
+            // TODO: Generate the solution file in new format
+            GenerateAsciiSolution(solution);
+        }
+
+        private void GenerateAsciiSolution(Solution solution)
+        {
             // Try to extract solution folder info from the existing solution file to make random IDs stable
             var solutionId = Guid.NewGuid();
             var folderIds = new Dictionary<string, Guid>();
@@ -313,7 +328,7 @@ namespace Flax.Build.Projects.VisualStudio
             var projects = solution.Projects.Cast<VisualStudioProject>().ToArray();
 
             // Header
-            if (Version == VisualStudioVersion.VisualStudio2022)
+            if (Version >= VisualStudioVersion.VisualStudio2022)
             {
                 vcSolutionFileContent.AppendLine("Microsoft Visual Studio Solution File, Format Version 12.00");
                 vcSolutionFileContent.AppendLine("# Visual Studio Version 17");

Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioVersion.cs

@@ -26,5 +26,10 @@ namespace Flax.Build.Projects.VisualStudio
         /// The Visual Studio 2022.
         /// </summary>
         VisualStudio2022,
+
+        /// <summary>
+        /// The Visual Studio 2026.
+        /// </summary>
+        VisualStudio2026,
     }
 }