Standardize on props with NCrunch support
Rob Mensching committed
Oct 3, 2018 at 13:51 UTC
df46bd7e832cb313ecb43479c4a48670f930f8d4
5 files changed
+25
-8
appveyor.cmd
+2
@@ -1,6 +1,8 @@
1
@setlocal
2
@pushd %~dp0
3
4
+nuget restore
5
+
6
msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140_xp
7
msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140_xp
8
src/Cpp.Build.props
+2
-2
@@ -3,8 +3,8 @@
3
4
<Project>
5
<PropertyGroup>
6
- <BaseOutputPath>$(OutputPath)</BaseOutputPath>
7
- <IntDir>$(BaseIntermediateOutputPath)$(Platform)\</IntDir>
6
+ <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
7
+ <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
8
<OutDir>$(OutputPath)$(Platform)\</OutDir>
9
</PropertyGroup>
10
src/Directory.Build.props
+11
-3
@@ -1,15 +1,23 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
-
3
+<!--
4
+ Do NOT modify this file. Update the canonical version in Home\src\Directory.Build.props
5
+ then update all of the repos.
6
+-->
7
<Project>
8
<PropertyGroup>
9
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7
- <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
8
- <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath>
10
+ <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
11
+
12
+ <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
13
+ <BaseOutputPath>$(MSBuildThisFileDirectory)..\build\</BaseOutputPath>
14
+ <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
15
+ <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
16
17
<Authors>WiX Toolset Team</Authors>
18
<Company>WiX Toolset</Company>
19
<Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
20
+ <Product>WiX Toolset</Product>
21
</PropertyGroup>
22
23
<PropertyGroup>
src/NativeMultiTargeting.Build.props
+1
-1
@@ -4,7 +4,7 @@
4
<Project>
5
<!-- Overrides the standard Cpp.Build.props to include the PlatformToolset in the output path. -->
6
<PropertyGroup>
7
- <IntDir>$(BaseIntermediateOutputPath)$(PlatformToolset)\$(PlatformTarget)\</IntDir>
7
+ <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\</IntDir>
8
<OutDir>$(OutputPath)$(PlatformToolset)\$(PlatformTarget)\</OutDir>
9
</PropertyGroup>
10
</Project>
src/wcautil/wcautil.vcxproj
+9
-2
@@ -29,12 +29,14 @@
29
<CharacterSet>MultiByte</CharacterSet>
30
<Description>WiX Toolset Custom Action native utility library</Description>
31
</PropertyGroup>
32
+
33
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
34
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
35
<ImportGroup Label="Shared">
36
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets')" />
37
</ImportGroup>
38
<Import Project="..\NativeMultiTargeting.Build.props" />
39
+
40
<ItemGroup>
41
<ClCompile Include="exbinary.cpp" />
42
<ClCompile Include="wcalog.cpp" />
@@ -47,6 +49,7 @@
49
<ClCompile Include="wcawrap.cpp" />
50
<ClCompile Include="qtexec.cpp" />
51
</ItemGroup>
52
+
53
<ItemGroup Condition="'$(Platform)' == 'Win32'">
54
<ClInclude Include="custommsierrors.h">
55
<GenerateWixInclude>caerr.wxi</GenerateWixInclude>
@@ -62,12 +65,16 @@
65
<ClInclude Include="inc\wcawow64.h" />
66
<ClInclude Include="inc\wcawrapquery.h" />
67
</ItemGroup>
68
+
69
<ItemGroup>
70
<None Include="packages.config" />
71
</ItemGroup>
68
- <Target Name="PackNativeNuget" DependsOnTargets="GetBuildVersion">
69
- <Exec Command="nuget pack wcautil.nuspec -OutputDirectory $(BaseOutputPath) -Properties Configuration=$(Configuration);Id=WixToolset.WcaUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"" />
72
+
73
+ <Target Name="PackNativeNuget"
74
+ DependsOnTargets="GetBuildVersion">
75
+ <Exec Command='nuget pack wcautil.nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=WixToolset.WcaUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
76
</Target>
77
+
78
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
79
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
80
<PropertyGroup>