diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-02-28 16:54:54 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@robmensching.com> | 2019-03-01 07:57:55 -0800 |
| commit | a4cd45daef6b6705c0fcf2296e2a78427f702b30 (patch) | |
| tree | dbb5c8b53d05e073e8e076281d816a29debaea0e | |
| parent | bcd212a2ef41459789528c5956d8e6abd1b7d405 (diff) | |
| download | wix-a4cd45daef6b6705c0fcf2296e2a78427f702b30.tar.gz wix-a4cd45daef6b6705c0fcf2296e2a78427f702b30.tar.bz2 wix-a4cd45daef6b6705c0fcf2296e2a78427f702b30.zip | |
Update to latest repo-template
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | src/Directory.Build.props | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/appveyor.yml b/appveyor.yml index c1df03cc..8d80c6af 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
| @@ -33,6 +33,8 @@ skip_tags: true | |||
| 33 | artifacts: | 33 | artifacts: |
| 34 | - path: build\Release\**\*.nupkg | 34 | - path: build\Release\**\*.nupkg |
| 35 | name: nuget | 35 | name: nuget |
| 36 | - path: build\Release\**\*.msi | ||
| 37 | name: msi | ||
| 36 | 38 | ||
| 37 | notifications: | 39 | notifications: |
| 38 | - provider: Slack | 40 | - provider: Slack |
diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e853e22d..a22f4470 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | <PropertyGroup> | 8 | <PropertyGroup> |
| 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
| 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> |
| 11 | <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages> | ||
| 11 | 12 | ||
| 12 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | 13 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> |
| 13 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | 14 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> |
| @@ -21,6 +22,7 @@ | |||
| 21 | <Product>WiX Toolset</Product> | 22 | <Product>WiX Toolset</Product> |
| 22 | </PropertyGroup> | 23 | </PropertyGroup> |
| 23 | 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' " /> | ||
| 25 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | 27 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> |
| 26 | </Project> | 28 | </Project> |