Skip to content

Commit 768139a

Browse files
Scottj1sScottj1s
authored
Several nuget tests failing to build with VS2022. Standardize on directory.build.props to use PlatformToolset v143 (#1125)
1 parent e0012b0 commit 768139a

File tree

39 files changed

+42
-159
lines changed

39 files changed

+42
-159
lines changed

Diff for: ‎cppwinrt.props renamed to ‎Directory.Build.Props

+4-13
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,12 @@
22

33
<!-- Set common MSBuild properties and item metadata for CppWinRT tool and tests -->
44

5-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '15.0'">
6-
<PlatformToolset>v141</PlatformToolset>
7-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
8-
</PropertyGroup>
9-
10-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '16.0'">
11-
<PlatformToolset>v142</PlatformToolset>
12-
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
13-
</PropertyGroup>
14-
15-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'">
5+
<PropertyGroup>
166
<PlatformToolset>v143</PlatformToolset>
7+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
8+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
179
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
10+
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
1811
</PropertyGroup>
1912

2013
<!--
@@ -38,8 +31,6 @@
3831
<CLToolPath>C:\Program Files\LLVM\bin</CLToolPath>
3932
</PropertyGroup>
4033

41-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
42-
4334
<PropertyGroup>
4435
<CppWinRTBuildVersion Condition="'$(CppWinRTBuildVersion)'==''">2.3.4.5</CppWinRTBuildVersion>
4536
<CmakePlatform>$(Platform)</CmakePlatform>

Diff for: ‎cppwinrt/cppwinrt.vcxproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,8 @@
122122
<VCProjectVersion>15.0</VCProjectVersion>
123123
<ProjectGuid>{D613FB39-5035-4043-91E2-BAB323908AF4}</ProjectGuid>
124124
<RootNamespace>cppwinrt</RootNamespace>
125-
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
126125
</PropertyGroup>
127-
<Import Project="$(SolutionDir)\cppwinrt.props" />
126+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
128127
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
129128
<ConfigurationType>Application</ConfigurationType>
130129
<UseDebugLibraries>true</UseDebugLibraries>

Diff for: ‎fast_fwd/fast_fwd.vcxproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@
3939
<ProjectGuid>{A63B3AD1-AB7B-461E-9FFF-2447F5BCD459}</ProjectGuid>
4040
<Keyword>Win32Proj</Keyword>
4141
<RootNamespace>fastfwd</RootNamespace>
42-
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
4342
</PropertyGroup>
44-
<Import Project="$(SolutionDir)\cppwinrt.props" />
43+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4544
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
4645
<ConfigurationType>StaticLibrary</ConfigurationType>
4746
<UseDebugLibraries>true</UseDebugLibraries>
@@ -120,12 +119,11 @@
120119
<FileType>Document</FileType>
121120
<IncludePaths>src</IncludePaths>
122121
<UseSafeExceptionHandlers Condition="'$(Platform)'=='Win32'">true</UseSafeExceptionHandlers>
123-
<UseSafeExceptionHandlers Condition="'$(Platform)'=='ARM'">true</UseSafeExceptionHandlers>
124-
<UseSafeExceptionHandlers Condition="'$(Platform)'=='ARM64'">true</UseSafeExceptionHandlers>
125122
</MASM>
126123
</ItemGroup>
127124
<ItemGroup Condition="$(Platform_Arm)">
128125
<MARMASM Include="$(IntDir)thunks.pp">
126+
<PreprocessWithCl Condition="'$(VisualStudioVersion)' &gt;= '17.0'">false</PreprocessWithCl>
129127
<FileType>Document</FileType>
130128
<IncludePaths>src</IncludePaths>
131129
</MARMASM>

Diff for: ‎natvis/cppwinrtvisualizer.vcxproj

-8
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@
2727
<TargetName>cppwinrtvisualizer</TargetName>
2828
<NugetPackagesDirectory>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)packages\))</NugetPackagesDirectory>
2929
</PropertyGroup>
30-
<PropertyGroup Condition="'$(VisualStudioVersion)' &gt;= '16.0'">
31-
<PlatformToolset>v142</PlatformToolset>
32-
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
33-
</PropertyGroup>
34-
<PropertyGroup Condition="'$(VisualStudioVersion)' &lt; '16.0'">
35-
<PlatformToolset>v141</PlatformToolset>
36-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
37-
</PropertyGroup>
3830
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3931
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4032
<ConfigurationType>DynamicLibrary</ConfigurationType>

Diff for: ‎prebuild/prebuild.vcxproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@
3838
<VCProjectVersion>15.0</VCProjectVersion>
3939
<ProjectGuid>{FB239623-7D19-4025-BCEA-B43298D4A315}</ProjectGuid>
4040
<RootNamespace>cppwinrt</RootNamespace>
41-
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
4241
</PropertyGroup>
43-
<Import Project="$(SolutionDir)\cppwinrt.props" />
42+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4443
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4544
<ConfigurationType>Application</ConfigurationType>
4645
<UseDebugLibraries>true</UseDebugLibraries>

Diff for: ‎scratch/scratch.vcxproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@
3939
<ProjectGuid>{E893622C-47DE-4F83-B422-0A26711590A4}</ProjectGuid>
4040
<RootNamespace>scratch</RootNamespace>
4141
<ProjectName>scratch</ProjectName>
42-
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
4342
</PropertyGroup>
44-
<Import Project="$(SolutionDir)\cppwinrt.props" />
43+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4544
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4645
<ConfigurationType>Application</ConfigurationType>
4746
<UseDebugLibraries>true</UseDebugLibraries>

Diff for: ‎test/nuget/ConsoleApplication1/ConsoleApplication1.vcxproj

-5
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<ProjectGuid>{4dd64eae-4b27-415a-863e-55cb8d5863dd}</ProjectGuid>
1212
<Keyword>Win32Proj</Keyword>
1313
<RootNamespace>ConsoleApplication1</RootNamespace>
14-
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
15-
<WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
1614
</PropertyGroup>
1715
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1816
<ItemGroup Label="ProjectConfigurations">
@@ -35,9 +33,6 @@
3533
</ItemGroup>
3634
<PropertyGroup Label="Configuration">
3735
<ConfigurationType>Application</ConfigurationType>
38-
<PlatformToolset>v140</PlatformToolset>
39-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
40-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
4136
<CharacterSet>Unicode</CharacterSet>
4237
</PropertyGroup>
4338
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

Diff for: ‎test/nuget/TestApp/TestApp.vcxproj

-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
<AppContainerApplication>true</AppContainerApplication>
1414
<ApplicationType>Windows Store</ApplicationType>
1515
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
16-
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
17-
<WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
1816
</PropertyGroup>
1917
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2018
<ItemGroup Label="ProjectConfigurations">
@@ -45,9 +43,6 @@
4543
</ItemGroup>
4644
<PropertyGroup Label="Configuration">
4745
<ConfigurationType>Application</ConfigurationType>
48-
<PlatformToolset>v140</PlatformToolset>
49-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
50-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
5146
<CharacterSet>Unicode</CharacterSet>
5247
</PropertyGroup>
5348
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

Diff for: ‎test/nuget/TestRuntimeComponent1/TestRuntimeComponent1.vcxproj

-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
<AppContainerApplication>true</AppContainerApplication>
1414
<ApplicationType>Windows Store</ApplicationType>
1515
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
16-
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion>
17-
<WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
1816
</PropertyGroup>
1917
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2018
<ItemGroup Label="ProjectConfigurations">
@@ -45,9 +43,6 @@
4543
</ItemGroup>
4644
<PropertyGroup Label="Configuration">
4745
<ConfigurationType>DynamicLibrary</ConfigurationType>
48-
<PlatformToolset>v140</PlatformToolset>
49-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
50-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
5146
<CharacterSet>Unicode</CharacterSet>
5247
<GenerateManifest>false</GenerateManifest>
5348
</PropertyGroup>

Diff for: ‎test/nuget/TestRuntimeComponent2/TestRuntimeComponent2.vcxproj

-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
<AppContainerApplication>true</AppContainerApplication>
1414
<ApplicationType>Windows Store</ApplicationType>
1515
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
16-
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion>
17-
<WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
1816
<CppWinRTParameters>-lib $(MSBuildProjectName)</CppWinRTParameters>
1917
</PropertyGroup>
2018
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -46,9 +44,6 @@
4644
</ItemGroup>
4745
<PropertyGroup Label="Configuration">
4846
<ConfigurationType>DynamicLibrary</ConfigurationType>
49-
<PlatformToolset>v140</PlatformToolset>
50-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
51-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
5247
<CharacterSet>Unicode</CharacterSet>
5348
<GenerateManifest>false</GenerateManifest>
5449
</PropertyGroup>

Diff for: ‎test/nuget/TestRuntimeComponent3/TestRuntimeComponent3.vcxproj

-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
<AppContainerApplication>true</AppContainerApplication>
1414
<ApplicationType>Windows Store</ApplicationType>
1515
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
16-
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion>
17-
<WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
1816
<CppWinRTParameters>-lib $(MSBuildProjectName)</CppWinRTParameters>
1917
</PropertyGroup>
2018
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -46,9 +44,6 @@
4644
</ItemGroup>
4745
<PropertyGroup Label="Configuration">
4846
<ConfigurationType>DynamicLibrary</ConfigurationType>
49-
<PlatformToolset>v140</PlatformToolset>
50-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
51-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
5247
<CharacterSet>Unicode</CharacterSet>
5348
<GenerateManifest>false</GenerateManifest>
5449
</PropertyGroup>

Diff for: ‎test/nuget/TestRuntimeComponentCX/TestRuntimeComponentCX.vcxproj

+8-12
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,11 @@
4343
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
4444
<AppContainerApplication>true</AppContainerApplication>
4545
<ApplicationType>Windows Store</ApplicationType>
46-
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
47-
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
4846
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
4947
</PropertyGroup>
5048
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
5149
<PropertyGroup Label="Configuration">
5250
<ConfigurationType>DynamicLibrary</ConfigurationType>
53-
<PlatformToolset>v141</PlatformToolset>
54-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
5551
</PropertyGroup>
5652
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
5753
<UseDebugLibraries>true</UseDebugLibraries>
@@ -124,7 +120,7 @@
124120
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
125121
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
126122
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
127-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
123+
<AdditionalOptions>/bigobj /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
128124
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
129125
<CompileAsWinRT>true</CompileAsWinRT>
130126
</ClCompile>
@@ -140,7 +136,7 @@
140136
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
141137
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
142138
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
143-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
139+
<AdditionalOptions>/bigobj /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
144140
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
145141
<CompileAsWinRT>true</CompileAsWinRT>
146142
</ClCompile>
@@ -156,7 +152,7 @@
156152
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
157153
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
158154
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
159-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
155+
<AdditionalOptions>/bigobj /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
160156
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
161157
<CompileAsWinRT>true</CompileAsWinRT>
162158
</ClCompile>
@@ -172,7 +168,7 @@
172168
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
173169
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
174170
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
175-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
171+
<AdditionalOptions>/bigobj /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
176172
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
177173
<CompileAsWinRT>true</CompileAsWinRT>
178174
</ClCompile>
@@ -188,7 +184,7 @@
188184
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
189185
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
190186
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
191-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
187+
<AdditionalOptions>/bigobj /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
192188
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
193189
<CompileAsWinRT>true</CompileAsWinRT>
194190
</ClCompile>
@@ -204,7 +200,7 @@
204200
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
205201
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
206202
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
207-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
203+
<AdditionalOptions>/bigobj /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
208204
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
209205
<CompileAsWinRT>true</CompileAsWinRT>
210206
</ClCompile>
@@ -220,7 +216,7 @@
220216
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
221217
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
222218
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
223-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
219+
<AdditionalOptions>/bigobj /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
224220
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
225221
<CompileAsWinRT>true</CompileAsWinRT>
226222
</ClCompile>
@@ -236,7 +232,7 @@
236232
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
237233
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
238234
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
239-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
235+
<AdditionalOptions>/bigobj /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
240236
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
241237
<CompileAsWinRT>true</CompileAsWinRT>
242238
</ClCompile>

0 commit comments

Comments
 (0)