aboutsummaryrefslogtreecommitdiff
path: root/src/Directory.Build.props
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2017-09-17 15:31:56 -0700
committerRob Mensching <rob@firegiant.com>2017-09-17 15:31:56 -0700
commit4ab327b217b9c3dce1f3ba0c52745bfe729db5a2 (patch)
treed77496a4cebb023519cc1a1ae7625d9dd3defe49 /src/Directory.Build.props
parenta77ee1d51a3683542abd10aff768ad1c14554a98 (diff)
downloadwix-4ab327b217b9c3dce1f3ba0c52745bfe729db5a2.tar.gz
wix-4ab327b217b9c3dce1f3ba0c52745bfe729db5a2.tar.bz2
wix-4ab327b217b9c3dce1f3ba0c52745bfe729db5a2.zip
Update to latest GitVersioning and Directory.Build.props standards
Diffstat (limited to 'src/Directory.Build.props')
-rw-r--r--src/Directory.Build.props4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 0ea54cfe..25cb6d36 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -7,7 +7,7 @@
7 <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath> 7 <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
8 <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath> 8 <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath>
9 9
10 <Authors>Rob Mensching, Bob Arnson</Authors> 10 <Authors>WiX Toolset Team</Authors>
11 <Company>WiX Toolset</Company> 11 <Company>WiX Toolset</Company>
12 <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> 12 <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
13 </PropertyGroup> 13 </PropertyGroup>
@@ -15,4 +15,6 @@
15 <PropertyGroup> 15 <PropertyGroup>
16 <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder> 16 <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder>
17 </PropertyGroup> 17 </PropertyGroup>
18
19 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
18</Project> 20</Project>