Skip to content

Commit 392930b

Browse files
BCSharpBCSharp
authored
Update toolchain for C++ Test projects (#297)
1 parent a74a504 commit 392930b

File tree

5 files changed

+35
-132
lines changed

5 files changed

+35
-132
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ packages/*
1717
# Temporary VS files
1818
*.suo
1919
*.csproj.user
20+
*.vcxproj.user
2021
*.wixproj.user
2122
*.pidb
2223

‎Tests/.gitignore‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Output directories
2+
Debug/
3+
Release/
4+
5+
# MIDL compiler generated files
6+
*_i.h
7+
*_i.c
8+
*_p.c
9+
*_i.obj
10+
dlldata.c
11+
dlldata.obj
12+
*.tlb
13+
14+
# Debug files
15+
*.pdb
16+
17+
# Log files
18+
*.log
19+
*.tlog

‎Tests/DlrComLibrary/DlrComLibrary.slnx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<Solution>
22
<Configurations>
3-
<Platform Name="Itanium" />
43
<Platform Name="Win32" />
54
<Platform Name="x64" />
65
</Configurations>
7-
<Project Path="DlrComLibrary.vcxproj" />
8-
<Project Path="DlrComLibraryPS.vcxproj">
6+
<Project Path="DlrComLibrary.vcxproj" Id="36658253-c676-41e7-997f-018caf277ebb" />
7+
<Project Path="DlrComLibraryPS.vcxproj" Id="6ecf7674-7549-455d-933b-dbbb7016f3e9">
98
<Build Project="false" />
109
</Project>
1110
<Project Path="Setup/Setup.vdproj" Type="Installer">
1211
<Build Solution="*|x64" />
13-
<Build Solution="Release|Itanium" />
1412
</Project>
1513
</Solution>

‎Tests/DlrComLibrary/DlrComLibrary.vcxproj‎

Lines changed: 9 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Itanium">
5-
<Configuration>Debug</Configuration>
6-
<Platform>Itanium</Platform>
7-
</ProjectConfiguration>
84
<ProjectConfiguration Include="Debug|Win32">
95
<Configuration>Debug</Configuration>
106
<Platform>Win32</Platform>
@@ -13,10 +9,6 @@
139
<Configuration>Debug</Configuration>
1410
<Platform>x64</Platform>
1511
</ProjectConfiguration>
16-
<ProjectConfiguration Include="Release|Itanium">
17-
<Configuration>Release</Configuration>
18-
<Platform>Itanium</Platform>
19-
</ProjectConfiguration>
2012
<ProjectConfiguration Include="Release|Win32">
2113
<Configuration>Release</Configuration>
2214
<Platform>Win32</Platform>
@@ -36,34 +28,27 @@
3628
<ConfigurationType>DynamicLibrary</ConfigurationType>
3729
<UseOfAtl>Dynamic</UseOfAtl>
3830
<CharacterSet>Unicode</CharacterSet>
31+
<PlatformToolset>v145</PlatformToolset>
3932
</PropertyGroup>
4033
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4134
<ConfigurationType>DynamicLibrary</ConfigurationType>
4235
<UseOfMfc>Static</UseOfMfc>
4336
<UseOfAtl>false</UseOfAtl>
4437
<CharacterSet>Unicode</CharacterSet>
45-
</PropertyGroup>
46-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
47-
<ConfigurationType>DynamicLibrary</ConfigurationType>
48-
<UseOfAtl>Dynamic</UseOfAtl>
49-
<CharacterSet>Unicode</CharacterSet>
50-
</PropertyGroup>
51-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
52-
<ConfigurationType>DynamicLibrary</ConfigurationType>
53-
<UseOfMfc>Static</UseOfMfc>
54-
<UseOfAtl>false</UseOfAtl>
55-
<CharacterSet>Unicode</CharacterSet>
38+
<PlatformToolset>v145</PlatformToolset>
5639
</PropertyGroup>
5740
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5841
<ConfigurationType>DynamicLibrary</ConfigurationType>
5942
<UseOfAtl>Dynamic</UseOfAtl>
6043
<CharacterSet>Unicode</CharacterSet>
44+
<PlatformToolset>v145</PlatformToolset>
6145
</PropertyGroup>
6246
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
6347
<ConfigurationType>DynamicLibrary</ConfigurationType>
6448
<UseOfMfc>Static</UseOfMfc>
6549
<UseOfAtl>false</UseOfAtl>
6650
<CharacterSet>Unicode</CharacterSet>
51+
<PlatformToolset>v145</PlatformToolset>
6752
</PropertyGroup>
6853
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6954
<ImportGroup Label="ExtensionSettings">
@@ -74,12 +59,6 @@
7459
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
7560
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7661
</ImportGroup>
77-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
78-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
79-
</ImportGroup>
80-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
81-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
82-
</ImportGroup>
8362
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
8463
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
8564
</ImportGroup>
@@ -105,26 +84,12 @@
10584
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
10685
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
10786
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
108-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">$(Platform)\$(Configuration)\</OutDir>
109-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">$(Platform)\$(Configuration)\</IntDir>
110-
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</IgnoreImportLibrary>
111-
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
112-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">$(Platform)\$(Configuration)\</OutDir>
113-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">$(Platform)\$(Configuration)\</IntDir>
114-
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</IgnoreImportLibrary>
115-
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
116-
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
117-
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
118-
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
11987
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
12088
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
12189
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
12290
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
12391
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
12492
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
125-
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
126-
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
127-
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
12893
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
12994
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
13095
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
@@ -170,6 +135,7 @@
170135
<GenerateDebugInformation>true</GenerateDebugInformation>
171136
<SubSystem>Windows</SubSystem>
172137
<TargetMachine>MachineX86</TargetMachine>
138+
<PerUserRedirection>true</PerUserRedirection>
173139
</Link>
174140
</ItemDefinitionGroup>
175141
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -208,6 +174,7 @@
208174
<OptimizeReferences>true</OptimizeReferences>
209175
<EnableCOMDATFolding>true</EnableCOMDATFolding>
210176
<TargetMachine>MachineX86</TargetMachine>
177+
<PerUserRedirection>true</PerUserRedirection>
211178
</Link>
212179
</ItemDefinitionGroup>
213180
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -246,6 +213,7 @@
246213
<GenerateDebugInformation>true</GenerateDebugInformation>
247214
<SubSystem>Windows</SubSystem>
248215
<TargetMachine>MachineX64</TargetMachine>
216+
<PerUserRedirection>true</PerUserRedirection>
249217
</Link>
250218
</ItemDefinitionGroup>
251219
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -282,97 +250,18 @@
282250
<OptimizeReferences>true</OptimizeReferences>
283251
<EnableCOMDATFolding>true</EnableCOMDATFolding>
284252
<TargetMachine>MachineX64</TargetMachine>
285-
</Link>
286-
</ItemDefinitionGroup>
287-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
288-
<Midl>
289-
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
290-
<MkTypLibCompatible>false</MkTypLibCompatible>
291-
<WarningLevel>1</WarningLevel>
292-
<WarnAsError>false</WarnAsError>
293-
<TargetEnvironment>Itanium</TargetEnvironment>
294-
<GenerateStublessProxies>true</GenerateStublessProxies>
295-
<TypeLibraryName>$(IntDir)DlrComLibrary.tlb</TypeLibraryName>
296-
<HeaderFileName>DlrComLibrary_i.h</HeaderFileName>
297-
<DllDataFileName>
298-
</DllDataFileName>
299-
<InterfaceIdentifierFileName>DlrComLibrary_i.c</InterfaceIdentifierFileName>
300-
<ProxyFileName>DlrComLibrary_p.c</ProxyFileName>
301-
</Midl>
302-
<ClCompile>
303-
<Optimization>Disabled</Optimization>
304-
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
305-
<MinimalRebuild>true</MinimalRebuild>
306-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
307-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
308-
<PrecompiledHeader>Use</PrecompiledHeader>
309-
<WarningLevel>Level3</WarningLevel>
310-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
311-
</ClCompile>
312-
<ResourceCompile>
313-
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
314-
<Culture>0x0409</Culture>
315-
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
316-
</ResourceCompile>
317-
<Link>
318-
<AdditionalDependencies>comsvcs.lib;%(AdditionalDependencies)</AdditionalDependencies>
319-
<ModuleDefinitionFile>.\DlrComLibrary.def</ModuleDefinitionFile>
320-
<GenerateDebugInformation>true</GenerateDebugInformation>
321-
<SubSystem>Windows</SubSystem>
322-
<TargetMachine>MachineIA64</TargetMachine>
323-
</Link>
324-
</ItemDefinitionGroup>
325-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
326-
<Midl>
327-
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
328-
<MkTypLibCompatible>false</MkTypLibCompatible>
329-
<TargetEnvironment>Itanium</TargetEnvironment>
330-
<GenerateStublessProxies>true</GenerateStublessProxies>
331-
<TypeLibraryName>$(IntDir)DlrComLibrary.tlb</TypeLibraryName>
332-
<HeaderFileName>DlrComLibrary_i.h</HeaderFileName>
333-
<DllDataFileName>
334-
</DllDataFileName>
335-
<InterfaceIdentifierFileName>DlrComLibrary_i.c</InterfaceIdentifierFileName>
336-
<ProxyFileName>DlrComLibrary_p.c</ProxyFileName>
337-
</Midl>
338-
<ClCompile>
339-
<Optimization>MaxSpeed</Optimization>
340-
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
341-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
342-
<PrecompiledHeader>Use</PrecompiledHeader>
343-
<WarningLevel>Level3</WarningLevel>
344-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
345-
</ClCompile>
346-
<ResourceCompile>
347-
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
348-
<Culture>0x0409</Culture>
349-
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
350-
</ResourceCompile>
351-
<Link>
352-
<AdditionalDependencies>comsvcs.lib;%(AdditionalDependencies)</AdditionalDependencies>
353-
<ModuleDefinitionFile>.\DlrComLibrary.def</ModuleDefinitionFile>
354-
<GenerateDebugInformation>true</GenerateDebugInformation>
355-
<SubSystem>Windows</SubSystem>
356-
<OptimizeReferences>true</OptimizeReferences>
357-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
358-
<TargetMachine>MachineIA64</TargetMachine>
253+
<PerUserRedirection>true</PerUserRedirection>
359254
</Link>
360255
</ItemDefinitionGroup>
361256
<ItemGroup>
362257
<ClCompile Include="DispEvents.cpp" />
363258
<ClCompile Include="dllmain.cpp">
364-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
365-
</PrecompiledHeader>
366-
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</CompileAsManaged>
367259
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
368260
</PrecompiledHeader>
369261
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
370262
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
371263
</PrecompiledHeader>
372264
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
373-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
374-
</PrecompiledHeader>
375-
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</CompileAsManaged>
376265
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
377266
</PrecompiledHeader>
378267
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
@@ -398,26 +287,18 @@
398287
<ClCompile Include="ReturnValues.cpp" />
399288
<ClCompile Include="SimpleErrors.cpp" />
400289
<ClCompile Include="stdafx.cpp">
401-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">Create</PrecompiledHeader>
402290
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
403291
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
404-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">Create</PrecompiledHeader>
405292
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
406293
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
407294
</ClCompile>
408295
<ClCompile Include="DlrComLibrary_i.c">
409-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
410-
</PrecompiledHeader>
411-
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</CompileAsManaged>
412296
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
413297
</PrecompiledHeader>
414298
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
415299
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
416300
</PrecompiledHeader>
417301
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
418-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
419-
</PrecompiledHeader>
420-
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</CompileAsManaged>
421302
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
422303
</PrecompiledHeader>
423304
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>

‎Tests/DlrComLibrary/DlrComLibraryPS.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,22 @@
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2727
<ConfigurationType>DynamicLibrary</ConfigurationType>
2828
<CharacterSet>Unicode</CharacterSet>
29+
<PlatformToolset>v145</PlatformToolset>
2930
</PropertyGroup>
3031
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3132
<ConfigurationType>DynamicLibrary</ConfigurationType>
3233
<CharacterSet>Unicode</CharacterSet>
34+
<PlatformToolset>v145</PlatformToolset>
3335
</PropertyGroup>
3436
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3537
<ConfigurationType>DynamicLibrary</ConfigurationType>
3638
<CharacterSet>Unicode</CharacterSet>
39+
<PlatformToolset>v145</PlatformToolset>
3740
</PropertyGroup>
3841
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3942
<ConfigurationType>DynamicLibrary</ConfigurationType>
4043
<CharacterSet>Unicode</CharacterSet>
44+
<PlatformToolset>v145</PlatformToolset>
4145
</PropertyGroup>
4246
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4347
<ImportGroup Label="ExtensionSettings">

0 commit comments

Comments
 (0)