Skip to content

Commit a0b7c3f

Browse files
authored
[3.10] Fix MSI build PlatformToolset detection (#101651)
Fix MSI build PlatformToolset detection
1 parent 8bc4111 commit a0b7c3f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Tools/msi/bundle/bootstrap/pythonba.vcxproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
<PropertyGroup Label="Globals">
2222
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
2323
<Platform Condition="'$(Platform)' == ''">Win32</Platform>
24-
<PlatformToolset Condition="'$(PlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '16.0' or '$(VisualStudioVersion)' == '16.0')">v142</PlatformToolset>
24+
<PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
25+
<PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
2526
<PlatformToolset Condition="'$(PlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '15.0' or '$(VisualStudioVersion)' == '15.0')">v141</PlatformToolset>
26-
<PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath14)' != ''">v140</PlatformToolset>
27-
<PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath14)' != ''">v140</PlatformToolset>
28-
<PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath12)' != ''">v120</PlatformToolset>
27+
<PlatformToolset Condition="'$(PlatformToolset)' == ''">v140</PlatformToolset>
2928
<ProjectGuid>{7A09B132-B3EE-499B-A700-A4B2157FEA3D}</ProjectGuid>
3029
<TargetName>PythonBA</TargetName>
3130
</PropertyGroup>

0 commit comments

Comments
 (0)