Merge branch 'vs2022v1710' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-vs2022v1710

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

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

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

@@ -45,8 +45,11 @@ namespace Flax.Build.Platforms
             var toolsets = GetToolsets();
             if (!toolsets.ContainsKey(WindowsPlatformToolset.v141) &&
                 !toolsets.ContainsKey(WindowsPlatformToolset.v142) &&
-                !toolsets.ContainsKey(WindowsPlatformToolset.v143))
+                !toolsets.ContainsKey(WindowsPlatformToolset.v143) &&
+                !toolsets.ContainsKey(WindowsPlatformToolset.v144))
+            {
                 _hasRequiredSDKsInstalled = false;
+            }
         }
 
         /// <inheritdoc />

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

@@ -39,7 +39,8 @@ namespace Flax.Build.Platforms
             if (!toolsets.ContainsKey(WindowsPlatformToolset.v140) &&
                 !toolsets.ContainsKey(WindowsPlatformToolset.v141) &&
                 !toolsets.ContainsKey(WindowsPlatformToolset.v142) &&
-                !toolsets.ContainsKey(WindowsPlatformToolset.v143))
+                !toolsets.ContainsKey(WindowsPlatformToolset.v143) &&
+                !toolsets.ContainsKey(WindowsPlatformToolset.v144))
             {
                 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

@@ -49,6 +49,11 @@ namespace Flax.Build.Platforms
         /// Visual Studio 2022
         /// </summary>
         v143 = 143,
+
+        /// <summary>
+        /// Visual Studio 2022 (v17.10 and later)
+        /// </summary>
+        v144 = 144,
     }
 
     /// <summary>
@@ -240,6 +245,10 @@ namespace Flax.Build.Platforms
                         _toolsets[WindowsPlatformToolset.v142] = toolset;
                     else if (version.Major == 14 && version.Minor / 10 == 3)
                         _toolsets[WindowsPlatformToolset.v143] = toolset;
+                    else if (version.Major == 14 && version.Minor / 10 == 4)
+                        _toolsets[WindowsPlatformToolset.v144] = toolset;
+                    else
+                        Log.Warning("Found Unsupported MSVC toolset version: " + version);
                 }
             }
         }
@@ -424,6 +433,7 @@ namespace Flax.Build.Platforms
             case WindowsPlatformToolset.v141:
             case WindowsPlatformToolset.v142:
             case WindowsPlatformToolset.v143:
+            case WindowsPlatformToolset.v144:
             {
                 /*
                 string crossCompilerPath = Path.Combine(vcToolChainDir, "bin", "HostX64", "x86", "cl.exe");
@@ -477,6 +487,7 @@ namespace Flax.Build.Platforms
             case WindowsPlatformToolset.v141:
             case WindowsPlatformToolset.v142:
             case WindowsPlatformToolset.v143:
+            case WindowsPlatformToolset.v144:
             {
                 string nativeCompilerPath = Path.Combine(vcToolChainDir, "bin", "HostX64", "x64", "cl.exe");
                 if (File.Exists(nativeCompilerPath))

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

@@ -90,7 +90,14 @@ namespace Flax.Build.Platforms
             {
                 if (VisualStudioInstance.HasIDE(VisualStudioVersion.VisualStudio2022))
                 {
-                    toolsetVer = WindowsPlatformToolset.v143;
+                    if (toolsets.Keys.Contains(WindowsPlatformToolset.v144))
+                    {
+                        toolsetVer = WindowsPlatformToolset.v144;
+                    }
+                    else
+                    {
+                        toolsetVer = WindowsPlatformToolset.v143;
+                    }
                 }
                 else if (VisualStudioInstance.HasIDE(VisualStudioVersion.VisualStudio2019))
                 {
@@ -199,6 +206,7 @@ namespace Flax.Build.Platforms
             case WindowsPlatformToolset.v141:
             case WindowsPlatformToolset.v142:
             case WindowsPlatformToolset.v143:
+            case WindowsPlatformToolset.v144:
             {
                 switch (Architecture)
                 {
@@ -378,6 +386,7 @@ namespace Flax.Build.Platforms
             var vcToolChainDir = toolsets[Toolset];
             switch (Toolset)
             {
+            case WindowsPlatformToolset.v144:
             case WindowsPlatformToolset.v143:
             case WindowsPlatformToolset.v142:
             case WindowsPlatformToolset.v141: return Path.Combine(vcToolChainDir, "lib", "x86", "store", "references");