Skip to content

Commit f992bc4

Browse files
Scottj1sScottj1s
authored
catch is evidently incompatible with VS 2022 (platform toolset v143) - backing off to unblock (#1127)
* catch is evidently incompatible with VS 2022 (platform toolset v143) - backing off to unblock * unlikely to be needed, but reordered to support other platform toolset overriding * pipeline now running out of disk space - clean intermediates as we go * standardize OutDir, IntDir. ensure they are different for visualizer.
1 parent 768139a commit f992bc4

File tree

25 files changed

+37
-220
lines changed

25 files changed

+37
-220
lines changed

‎Directory.Build.Props‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<!-- Set common MSBuild properties and item metadata for CppWinRT tool and tests -->
44

55
<PropertyGroup>
6-
<PlatformToolset>v143</PlatformToolset>
7-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
8-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
6+
<PlatformToolset Condition="'$(PlatformToolset)'=='' and '$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
7+
<PlatformToolset Condition="'$(PlatformToolset)'=='' and '$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
8+
<PlatformToolset Condition="'$(PlatformToolset)'==''">v143</PlatformToolset>
99
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1010
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
1111
</PropertyGroup>
@@ -33,12 +33,11 @@
3333

3434
<PropertyGroup>
3535
<CppWinRTBuildVersion Condition="'$(CppWinRTBuildVersion)'==''">2.3.4.5</CppWinRTBuildVersion>
36-
<CmakePlatform>$(Platform)</CmakePlatform>
37-
<CmakePlatform Condition="'$(Platform)'=='Win32'">x86</CmakePlatform>
38-
<CmakeOutDir Condition="'$(CmakeOutDir)'==''">$(SolutionDir)_build\$(CmakePlatform)\$(Configuration)</CmakeOutDir>
39-
<CppWinRTDir>$(CmakeOutDir)\</CppWinRTDir>
36+
<CppWinRTPlatform>$(Platform)</CppWinRTPlatform>
37+
<CppWinRTPlatform Condition="'$(Platform)'=='Win32'">x86</CppWinRTPlatform>
38+
<OutDir>$(SolutionDir)_build\$(CppWinRTPlatform)\$(Configuration)\</OutDir>
39+
<CppWinRTDir>$(OutDir)</CppWinRTDir>
4040
<CppWinRTDir Condition="'$(Platform)'=='ARM' or '$(Platform)'=='ARM64'">$(SolutionDir)_build\x86\$(Configuration)\</CppWinRTDir>
41-
<OutDir>$(CmakeOutDir)\</OutDir>
4241
</PropertyGroup>
4342

4443
<ItemDefinitionGroup>
@@ -64,4 +63,10 @@
6463
</ResourceCompile>
6564
</ItemDefinitionGroup>
6665

66+
<!-- Each release of Visual Studio produces larger intermediate files.
67+
To prevent build agents from running out of disk space, clean as we go. -->
68+
<Target Name="CleanIntermediateFiles" AfterTargets="Build" Condition="'$(clean_intermediate_files)'=='true'">
69+
<RemoveDir Directories="$(IntDir)" />
70+
</Target>
71+
6772
</Project>

‎Directory.Build.Targets‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<PropertyGroup>
4+
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
5+
</PropertyGroup>
6+
7+
</Project>

‎build_test_all.cmd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
set target_platform=%1
44
set target_configuration=%2
55
set target_version=%3
6+
set clean_intermediate_files=%4
67

78
if "%target_platform%"=="" set target_platform=x64
89
if "%target_configuration%"=="" set target_configuration=Release

‎cppwinrt/cppwinrt.vcxproj‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -190,20 +190,6 @@
190190
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
191191
</ImportGroup>
192192
<PropertyGroup Label="UserMacros" />
193-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
194-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
195-
</PropertyGroup>
196-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" />
197-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
198-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
199-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
200-
</PropertyGroup>
201-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
202-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
203-
</PropertyGroup>
204-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
205-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
206-
</PropertyGroup>
207193
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
208194
<ClCompile>
209195
<Optimization>Disabled</Optimization>

‎natvis/cppwinrtvisualizer.vcxproj‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,14 @@
6767
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6868
</ImportGroup>
6969
<PropertyGroup Label="UserMacros" />
70-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
70+
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
7171
<LinkIncremental>true</LinkIncremental>
72-
<OutDir>x86\$(Configuration)\$(Deployment)\</OutDir>
73-
<IntDir>x86\$(Configuration)\$(Deployment)\</IntDir>
7472
</PropertyGroup>
75-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
76-
<LinkIncremental>true</LinkIncremental>
77-
<OutDir>x64\$(Configuration)\$(Deployment)\</OutDir>
78-
<IntDir>x64\$(Configuration)\$(Deployment)\</IntDir>
79-
</PropertyGroup>
80-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
73+
<PropertyGroup Condition="'$(Configuration)'=='Release'">
8174
<LinkIncremental>false</LinkIncremental>
82-
<OutDir>x86\$(Configuration)\$(Deployment)\</OutDir>
83-
<IntDir>x86\$(Configuration)\$(Deployment)\</IntDir>
8475
</PropertyGroup>
85-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
86-
<LinkIncremental>false</LinkIncremental>
87-
<OutDir>x64\$(Configuration)\$(Deployment)\</OutDir>
88-
<IntDir>x64\$(Configuration)\$(Deployment)\</IntDir>
76+
<PropertyGroup>
77+
<OutDir>$(CppWinRTPlatform)\$(Configuration)\$(Deployment)\</OutDir>
8978
</PropertyGroup>
9079
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9180
<ClCompile>

‎prebuild/prebuild.vcxproj‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,20 +106,6 @@
106106
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
107107
</ImportGroup>
108108
<PropertyGroup Label="UserMacros" />
109-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
110-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
111-
</PropertyGroup>
112-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" />
113-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
114-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
115-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
116-
</PropertyGroup>
117-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
118-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
119-
</PropertyGroup>
120-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
121-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
122-
</PropertyGroup>
123109
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
124110
<ClCompile>
125111
<Optimization>Disabled</Optimization>

‎scratch/scratch.vcxproj‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,6 @@
107107
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
108108
</ImportGroup>
109109
<PropertyGroup Label="UserMacros" />
110-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
111-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
112-
</PropertyGroup>
113-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" />
114-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
115-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
116-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
117-
</PropertyGroup>
118-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
119-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
120-
</PropertyGroup>
121-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
122-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
123-
</PropertyGroup>
124110
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
125111
<ClCompile>
126112
<Optimization>MaxSpeed</Optimization>

‎test/Directory.Build.Props‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<PropertyGroup>
4+
<!-- Catch is somehow incompatible with the v143 platform toolset - backing off to VS2019 for now -->
5+
<PlatformToolset>v142</PlatformToolset>
6+
</PropertyGroup>
7+
8+
<Import Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props','$(MSBuildThisFileDirectory)../')))" Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props','$(MSBuildThisFileDirectory)../'))" />
9+
10+
</Project>

‎test/old_tests/Component/Component.vcxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
<IgnoreImportLibrary>false</IgnoreImportLibrary>
122122
<ExecutablePath>..\..;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
123123
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
124-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
125124
</PropertyGroup>
126125
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
127126
<GenerateManifest>false</GenerateManifest>
@@ -140,7 +139,6 @@
140139
<IgnoreImportLibrary>false</IgnoreImportLibrary>
141140
<ExecutablePath>..\..;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
142141
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
143-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
144142
</PropertyGroup>
145143
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
146144
<GenerateManifest>false</GenerateManifest>
@@ -159,14 +157,12 @@
159157
<IgnoreImportLibrary>false</IgnoreImportLibrary>
160158
<ExecutablePath>..\..;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
161159
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
162-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
163160
</PropertyGroup>
164161
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
165162
<GenerateManifest>false</GenerateManifest>
166163
<IgnoreImportLibrary>false</IgnoreImportLibrary>
167164
<ExecutablePath>..\..;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
168165
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
169-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
170166
</PropertyGroup>
171167
<ItemDefinitionGroup>
172168
<CustomBuildStep>

‎test/old_tests/Composable/Composable.vcxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
<IgnoreImportLibrary>false</IgnoreImportLibrary>
122122
<ExecutablePath>..\..;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
123123
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
124-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
125124
</PropertyGroup>
126125
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
127126
<GenerateManifest>false</GenerateManifest>
@@ -140,7 +139,6 @@
140139
<IgnoreImportLibrary>false</IgnoreImportLibrary>
141140
<ExecutablePath>..\..;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
142141
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
143-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
144142
</PropertyGroup>
145143
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
146144
<GenerateManifest>false</GenerateManifest>
@@ -159,14 +157,12 @@
159157
<IgnoreImportLibrary>false</IgnoreImportLibrary>
160158
<ExecutablePath>..\..;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
161159
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
162-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
163160
</PropertyGroup>
164161
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
165162
<GenerateManifest>false</GenerateManifest>
166163
<IgnoreImportLibrary>false</IgnoreImportLibrary>
167164
<ExecutablePath>..\..;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
168165
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
169-
<IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
170166
</PropertyGroup>
171167
<ItemDefinitionGroup>
172168
<CustomBuildStep>

0 commit comments

Comments
 (0)