Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5f67de3cb8 | |||
| a3d8285717 | |||
| 7d48ae37c1 |
+15
-6
@@ -168,7 +168,7 @@ def _find_msbuild_vswhere(vs_version: str) -> Optional[Tuple[Path, str, str]]:
|
|||||||
continue
|
continue
|
||||||
try:
|
try:
|
||||||
result = subprocess.run(
|
result = subprocess.run(
|
||||||
[str(_VSWHERE), '-version', _VS_RANGES[ver], '-latest',
|
[str(_VSWHERE), '-products', '*', '-version', _VS_RANGES[ver], '-latest',
|
||||||
'-requires', 'Microsoft.Component.MSBuild',
|
'-requires', 'Microsoft.Component.MSBuild',
|
||||||
'-find', r'MSBuild\**\Bin\MSBuild.exe'],
|
'-find', r'MSBuild\**\Bin\MSBuild.exe'],
|
||||||
capture_output=True, text=True, timeout=15,
|
capture_output=True, text=True, timeout=15,
|
||||||
@@ -184,17 +184,26 @@ def _find_msbuild_vswhere(vs_version: str) -> Optional[Tuple[Path, str, str]]:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
_VS_NUMERIC_FOLDER = {'2026': '18', '2022': '2022'}
|
||||||
|
|
||||||
|
|
||||||
def find_msbuild(vs_version: str = 'auto') -> Optional[Tuple[Path, str, str]]:
|
def find_msbuild(vs_version: str = 'auto') -> Optional[Tuple[Path, str, str]]:
|
||||||
result = _find_msbuild_vswhere(vs_version)
|
result = _find_msbuild_vswhere(vs_version)
|
||||||
if result:
|
if result:
|
||||||
return result
|
return result
|
||||||
# Fallback: well-known paths
|
# Fallback: well-known paths (incl. BuildTools and VS2026 numeric folder)
|
||||||
to_try = ['2026', '2022'] if vs_version == 'auto' else [vs_version]
|
to_try = ['2026', '2022'] if vs_version == 'auto' else [vs_version]
|
||||||
for ver in to_try:
|
for ver in to_try:
|
||||||
for edition in ('Community', 'Professional', 'Enterprise', 'BuildTools'):
|
numeric = _VS_NUMERIC_FOLDER.get(ver, ver)
|
||||||
p = Path(rf'C:\Program Files\Microsoft Visual Studio\{ver}\{edition}\MSBuild\Current\Bin\MSBuild.exe')
|
base_paths = [
|
||||||
if p.exists():
|
Path(rf'C:\Program Files (x86)\Microsoft Visual Studio\{numeric}'),
|
||||||
return p, _VS_TOOLSETS[ver], ver
|
Path(rf'C:\Program Files\Microsoft Visual Studio\{ver}'),
|
||||||
|
]
|
||||||
|
for base in base_paths:
|
||||||
|
for edition in ('Community', 'Professional', 'Enterprise', 'BuildTools'):
|
||||||
|
p = base / edition / 'MSBuild' / 'Current' / 'Bin' / 'MSBuild.exe'
|
||||||
|
if p.exists():
|
||||||
|
return p, _VS_TOOLSETS[ver], ver
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user