File tree Expand file tree Collapse file tree 4 files changed +5
-2
lines changed
Tools/msi/bundle/bootstrap Expand file tree Collapse file tree 4 files changed +5
-2
lines changed Original file line number Diff line number Diff line change 1+ When building with Visual Studio 2026 (Version 18), use PlatformToolSet v145
2+ by default. Patch by Chris Eibl.
Original file line number Diff line number Diff line change 1111
1212 We set BasePlatformToolset for ICC's benefit, it's otherwise ignored.
1313 -->
14- <BasePlatformToolset Condition =" '$(BasePlatformToolset)' == '' and '$(VisualStudioVersion)' == '18.0'" >v143 </BasePlatformToolset >
14+ <BasePlatformToolset Condition =" '$(BasePlatformToolset)' == '' and '$(VisualStudioVersion)' == '18.0'" >v145 </BasePlatformToolset >
1515 <BasePlatformToolset Condition =" '$(BasePlatformToolset)' == '' and '$(VisualStudioVersion)' == '17.0'" >v143</BasePlatformToolset >
1616 <BasePlatformToolset Condition =" '$(BasePlatformToolset)' == '' and '$(VisualStudioVersion)' == '16.0'" >v142</BasePlatformToolset >
1717 <BasePlatformToolset Condition =" '$(BasePlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '15.0' or '$(VisualStudioVersion)' == '15.0')" >v141</BasePlatformToolset >
Original file line number Diff line number Diff line change 730730 </ClCompile >
731731 </ItemGroup >
732732 </Target >
733- <Target Name =" _WarnAboutToolset" BeforeTargets =" PrepareForBuild" Condition =" $(PlatformToolset) != 'v141 ' and $(PlatformToolset) != 'v142' and $(PlatformToolset) != 'v143 '" >
733+ <Target Name =" _WarnAboutToolset" BeforeTargets =" PrepareForBuild" Condition =" $(PlatformToolset) != 'v143 ' and $(PlatformToolset) != 'v145 '" >
734734 <Warning Text =" Toolset $(PlatformToolset) is not used for official builds. Your build may have errors or incompatibilities." />
735735 </Target >
736736 <Target Name =" _WarnAboutZlib" BeforeTargets =" PrepareForBuild" Condition =" !$(IncludeExternals)" >
Original file line number Diff line number Diff line change 2121 <PropertyGroup Label =" Globals" >
2222 <Configuration Condition =" '$(Configuration)' == ''" >Release</Configuration >
2323 <Platform Condition =" '$(Platform)' == ''" >Win32</Platform >
24+ <PlatformToolset Condition =" '$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '18.0'" >v145</PlatformToolset >
2425 <PlatformToolset Condition =" '$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '17.0'" >v143</PlatformToolset >
2526 <PlatformToolset Condition =" '$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '16.0'" >v142</PlatformToolset >
2627 <PlatformToolset Condition =" '$(PlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '15.0' or '$(VisualStudioVersion)' == '15.0')" >v141</PlatformToolset >
You can’t perform that action at this time.
0 commit comments