diff options
Diffstat (limited to 'src/WixToolset.BuildTasks/wix.targets')
-rw-r--r-- | src/WixToolset.BuildTasks/wix.targets | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/WixToolset.BuildTasks/wix.targets b/src/WixToolset.BuildTasks/wix.targets index a3787309..4f8b9999 100644 --- a/src/WixToolset.BuildTasks/wix.targets +++ b/src/WixToolset.BuildTasks/wix.targets | |||
@@ -54,8 +54,11 @@ | |||
54 | <OutputName Condition=" '$(OutputName)'=='' ">$(MSBuildProjectName)</OutputName> | 54 | <OutputName Condition=" '$(OutputName)'=='' ">$(MSBuildProjectName)</OutputName> |
55 | <AssemblyName>$(OutputName)</AssemblyName> | 55 | <AssemblyName>$(OutputName)</AssemblyName> |
56 | 56 | ||
57 | <!-- Default the OutputType to a known WiX Toolset type. --> | 57 | <!-- Default OutputType to a known WiX Toolset type. --> |
58 | <OutputType Condition=" '$(OutputType)' == '' ">Package</OutputType> | 58 | <OutputType Condition=" '$(OutputType)' == '' ">Package</OutputType> |
59 | |||
60 | <!-- Default WixPdbType to a known WiX Toolset type. --> | ||
61 | <WixPdbType Condition=" '$(WixPdbType)' == '' ">full</WixPdbType> | ||
59 | </PropertyGroup> | 62 | </PropertyGroup> |
60 | 63 | ||
61 | <!-- | 64 | <!-- |
@@ -228,6 +231,11 @@ | |||
228 | Condition=" '$(MSBuildToolsVersion)' == '' OR '$(MSBuildToolsVersion)' < '4.0' " | 231 | Condition=" '$(MSBuildToolsVersion)' == '' OR '$(MSBuildToolsVersion)' < '4.0' " |
229 | Text="MSBuild v$(MSBuildToolsVersion) is not supported by the project "$(MSBuildProjectFile)". You must use MSBuild v4.0 or later." /> | 232 | Text="MSBuild v$(MSBuildToolsVersion) is not supported by the project "$(MSBuildProjectFile)". You must use MSBuild v4.0 or later." /> |
230 | 233 | ||
234 | <Error | ||
235 | Code="WIX103" | ||
236 | Condition=" '$(WixPdbType)' != 'none' and '$(WixPdbType)' != 'full' and '$(WixPdbType)' != 'partial' " | ||
237 | Text="The WixPdbType property '$(WixPdbType)' is not valid in project "$(MSBuildProjectFile)". Supported values are: 'full', 'none', 'partial'" /> | ||
238 | |||
231 | </Target> | 239 | </Target> |
232 | 240 | ||
233 | <!-- | 241 | <!-- |
@@ -636,7 +644,8 @@ | |||
636 | 644 | ||
637 | OutputFile="$(OutputFile)" | 645 | OutputFile="$(OutputFile)" |
638 | OutputType="$(OutputType)" | 646 | OutputType="$(OutputType)" |
639 | PdbOutputFile="$(PdbOutputFile)" | 647 | PdbFile="$(PdbOutputFile)" |
648 | PdbType="$(WixPdbType)" | ||
640 | 649 | ||
641 | AdditionalOptions="$(CompilerAdditionalOptions) $(LinkerAdditionalOptions)" | 650 | AdditionalOptions="$(CompilerAdditionalOptions) $(LinkerAdditionalOptions)" |
642 | DefineConstants="$(DefineConstants);$(SolutionDefineConstants);$(ProjectDefineConstants);$(ProjectReferenceDefineConstants)" | 651 | DefineConstants="$(DefineConstants);$(SolutionDefineConstants);$(ProjectDefineConstants);$(ProjectReferenceDefineConstants)" |