diff --git a/.editorconfig b/.editorconfig
index a2f93af3f56a..02fa54f62392 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,3 +18,7 @@ indent_style = space
 
 [*.svg]
 insert_final_newline = false
+
+[{*.props,*.vcxproj}]
+indent_style = space
+indent_size = 2
diff --git a/methods.py b/methods.py
index 85fdf1978fb1..a368d89ce9f0 100644
--- a/methods.py
+++ b/methods.py
@@ -1217,11 +1217,16 @@ def get_dependencies(file, env, exts, headers, sources, others):
             properties.append(
                 "<ActiveProjectItemList_%s>;%s;</ActiveProjectItemList_%s>" % (x, ";".join(itemlist[x]), x)
             )
-        output = f"bin\\godot{env['PROGSUFFIX']}"
+        output = os.path.join("bin", f"godot{env['PROGSUFFIX']}")
 
         with open("misc/msvs/props.template", "r", encoding="utf-8") as file:
             props_template = file.read()
 
+        toolset = "v143"
+        if not env.msvc:
+            toolset = "CLang"
+        props_template = props_template.replace("%%PlatformToolset%%", toolset)
+
         props_template = props_template.replace("%%VSCONF%%", vsconf)
         props_template = props_template.replace("%%CONDITION%%", condition)
         props_template = props_template.replace("%%PROPERTIES%%", "\n    ".join(properties))
@@ -1235,6 +1240,7 @@ def get_dependencies(file, env, exts, headers, sources, others):
 
         proplist = [str(j) for j in env["CPPPATH"]]
         proplist += [str(j) for j in env.get("VSHINT_INCLUDES", [])]
+        proplist += [str(j) for j in get_default_include_paths(env)]
         props_template = props_template.replace("%%INCLUDES%%", ";".join(proplist))
 
         proplist = env["CCFLAGS"]
@@ -1270,17 +1276,17 @@ def get_dependencies(file, env, exts, headers, sources, others):
 
         commands = "scons"
         if len(common_build_prefix) == 0:
-            commands = "echo Starting SCons &amp;&amp; cmd /V /C " + commands
+            commands = "echo Starting SCons &amp;" + commands
         else:
-            common_build_prefix[0] = "echo Starting SCons &amp;&amp; cmd /V /C " + common_build_prefix[0]
+            common_build_prefix[0] = "echo Starting SCons &amp;" + common_build_prefix[0]
 
-        cmd = " ^&amp; ".join(common_build_prefix + [" ".join([commands] + common_build_postfix)])
+        cmd = " ".join(common_build_prefix + [" ".join([commands] + common_build_postfix)])
         props_template = props_template.replace("%%BUILD%%", cmd)
 
-        cmd = " ^&amp; ".join(common_build_prefix + [" ".join([commands] + cmd_rebuild)])
+        cmd = " ".join(common_build_prefix + [" ".join([commands] + cmd_rebuild)])
         props_template = props_template.replace("%%REBUILD%%", cmd)
 
-        cmd = " ^&amp; ".join(common_build_prefix + [" ".join([commands] + cmd_clean)])
+        cmd = " ".join(common_build_prefix + [" ".join([commands] + cmd_clean)])
         props_template = props_template.replace("%%CLEAN%%", cmd)
 
         with open(
@@ -1554,3 +1560,15 @@ def to_raw_cstring(value: Union[str, List[str]]) -> str:
         split += [segment]
 
     return " ".join(f'R"<!>({x.decode()})<!>"' for x in split)
+
+
+def get_default_include_paths(env):
+    compiler = env.subst("$CXX")
+    target = os.path.join(env.Dir("#main").abspath, "main.cpp")
+    args = [compiler, target, "-x", "c++", "-v"]
+    ret = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+    output = ret.stdout
+    match = re.search(r"#include <\.\.\.> search starts here:([\S\s]*)End of search list.", output)
+    if not match:
+        return []  # msvc case
+    return [x.strip() for x in match[1].strip().splitlines()]
diff --git a/misc/msvs/nmake.substitution.props b/misc/msvs/nmake.substitution.props
new file mode 100644
index 000000000000..58a7badbb173
--- /dev/null
+++ b/misc/msvs/nmake.substitution.props
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- NMake is Windows only, so we need to wrap everything useful for non-windows msbuild -->
+  <PropertyGroup>
+    <LocalDebuggerCommand Condition="'$(LocalDebuggerCommand)' == ''">$(NMakeOutput)</LocalDebuggerCommand>
+  </PropertyGroup>
+
+  <Target Name="Build">
+    <Exec Command="$(NMakeBuildCommandLine)"/>
+  </Target>
+  <Target Name="Rebuild">
+    <Exec Command="$(NMakeReBuildCommandLine)"/>
+  </Target>
+  <Target Name="Clean">
+    <Exec Command="$(NMakeCleanCommandLine)"/>
+  </Target>
+</Project>
diff --git a/misc/msvs/props.template b/misc/msvs/props.template
index 82e3e81f1827..f6fdb0a78065 100644
--- a/misc/msvs/props.template
+++ b/misc/msvs/props.template
@@ -11,6 +11,7 @@
     <NMakeAssemblySearchPath>$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
     <NMakeForcedUsingAssemblies>$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <AdditionalOptions>%%OPTIONS%% $(AdditionalOptions)</AdditionalOptions>
+    <PlatformToolset>%%PlatformToolset%%</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="%%CONDITION%%">
     %%PROPERTIES%%
@@ -18,6 +19,9 @@
   <ItemGroup Condition="%%CONDITION%%">
     %%EXTRA_ITEMS%%
   </ItemGroup>
+
+  <!-- NMake is Windows only, so we need to wrap everything useful for non-windows msbuild -->
+  <Import Project="$(MSBuildProjectDirectory)/misc/msvs/nmake.substitution.props" Condition="'$(GodotConfiguration)|$(GodotPlatform)'=='%%VSCONF%%' And '$(OS)' != 'Windows_NT'" />
 </Project>
 <!-- CHECKSUM
 %%HASH%%
diff --git a/misc/msvs/vcxproj.template b/misc/msvs/vcxproj.template
index 2cdb82d01f20..8d7b45b3579e 100644
--- a/misc/msvs/vcxproj.template
+++ b/misc/msvs/vcxproj.template
@@ -10,16 +10,16 @@
     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
   </PropertyGroup>
   %%PROPERTIES%%
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" Condition=" exists('$(VCTargetsPath)\Microsoft.Cpp.Default.props') "/>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v143</PlatformToolset>
+    <DefaultPlatformToolset Condition="'$(DefaultPlatformToolset)'==''"/>
     <OutDir>$(SolutionDir)\bin\$(GodotPlatform)\$(GodotConfiguration)\</OutDir>
     <IntDir>obj\$(GodotPlatform)\$(GodotConfiguration)\</IntDir>
     <LayoutDir>$(OutDir)\Layout</LayoutDir>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" Condition=" exists('$(VCTargetsPath)\Microsoft.Cpp.Default.props') "/>
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
@@ -34,7 +34,7 @@
   <ItemGroup Condition="'$(IncludeListImported)'==''">
     %%DEFAULT_ITEMS%%
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition=" exists('$(VCTargetsPath)\Microsoft.Cpp.Default.props') "/>
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 </Project>
diff --git a/platform/linuxbsd/msvs.py b/platform/linuxbsd/msvs.py
new file mode 100644
index 000000000000..475573e8d974
--- /dev/null
+++ b/platform/linuxbsd/msvs.py
@@ -0,0 +1,11 @@
+# Tuples with the name of the arch
+def get_platforms():
+    return [("arm64", "arm64"), ("x86_64", "x86_64")]
+
+
+def get_configurations():
+    return ["editor", "template_debug", "template_release"]
+
+
+def get_build_prefix(env):
+    return []
diff --git a/platform/macos/msvs.py b/platform/macos/msvs.py
new file mode 100644
index 000000000000..475573e8d974
--- /dev/null
+++ b/platform/macos/msvs.py
@@ -0,0 +1,11 @@
+# Tuples with the name of the arch
+def get_platforms():
+    return [("arm64", "arm64"), ("x86_64", "x86_64")]
+
+
+def get_configurations():
+    return ["editor", "template_debug", "template_release"]
+
+
+def get_build_prefix(env):
+    return []
diff --git a/platform/windows/msvs.py b/platform/windows/msvs.py
index 2d5ebe811a4f..ff8a379867d8 100644
--- a/platform/windows/msvs.py
+++ b/platform/windows/msvs.py
@@ -12,9 +12,13 @@ def get_configurations():
 
 
 def get_build_prefix(env):
+    if not env.msvc:
+        return []
     batch_file = methods.find_visual_c_batch_file(env)
     return [
+        "cmd /V /C",
         "set &quot;plat=$(PlatformTarget)&quot;",
-        "(if &quot;$(PlatformTarget)&quot;==&quot;x64&quot; (set &quot;plat=x86_amd64&quot;))",
-        f"call &quot;{batch_file}&quot; !plat!",
+        "^&amp; (if &quot;$(PlatformTarget)&quot;==&quot;x64&quot; (set &quot;plat=x86_amd64&quot;))",
+        f"^&amp; call &quot;{batch_file}&quot; !plat!",
+        "^&amp;",
     ]