@joebigelow / wix / commits / 6452eb05

Update to latest repo-template

Rob Mensching committed May 7, 2019 at 23:04 UTC 6452eb0554b667318e9c2d11d3c957b57cd9d65b
2 files changed +10 -1
appveyor.yml
+7
@@ -3,6 +3,11 @@
3 # Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
4 # then update all of the repos.
5
6 +branches:
7 + only:
8 + - master
9 + - develop
10 +
11 image: Visual Studio 2017
12
13 version: 0.0.0.{build}
@@ -28,6 +33,8 @@ skip_tags: true
33 artifacts:
34 - path: build\Release\**\*.nupkg
35 name: nuget
36 +- path: build\Release\**\*.msi
37 + name: msi
38
39 notifications:
40 - provider: Slack
src/Directory.Build.props
+3 -1
@@ -8,6 +8,7 @@
8 <PropertyGroup>
9 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
10 <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
11 + <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages>
12
13 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
14 <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath>
@@ -21,6 +22,7 @@
22 <Product>WiX Toolset</Product>
23 </PropertyGroup>
24
24 - <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " />
25 + <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />
26 + <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " />
27 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
28 </Project>