Merge pull request #27271 from shartte/fix-msbuild-detection
Add support for new MSBuild directory naming introduced in VS 2019
This commit is contained in:
commit
b0fbefe9da
1 changed files with 8 additions and 0 deletions
|
@ -29,6 +29,7 @@
|
|||
/*************************************************************************/
|
||||
|
||||
#include "mono_reg_utils.h"
|
||||
#include "core/os/dir_access.h"
|
||||
|
||||
#ifdef WINDOWS_ENABLED
|
||||
|
||||
|
@ -200,6 +201,13 @@ String find_msbuild_tools_path() {
|
|||
val += "\\";
|
||||
}
|
||||
|
||||
// Since VS2019, the directory is simply named "Current"
|
||||
String msBuildDirectory = val + "MSBuild\\Current\\Bin";
|
||||
if (DirAccess::exists(msBuildDirectory)) {
|
||||
return msBuildDirectory;
|
||||
}
|
||||
|
||||
// Directory name "15.0" is used in VS 2017
|
||||
return val + "MSBuild\\15.0\\Bin";
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue