2 files changed, 16 insertions, 3 deletions

diff --git a/src/WixToolset.BuildTasks/DoIt.cs b/src/WixToolset.BuildTasks/DoIt.cs
index 5faf163c..3aa9f5a3 100644
--- a/src/WixToolset.BuildTasks/DoIt.cs
+++ b/src/WixToolset.BuildTasks/DoIt.cs
@@ -47,7 +47,9 @@ namespace WixToolset.BuildTasks
 
         public string OutputType { get; set; }
 
-        public string PdbOutputFile { get; set; }
+        public ITaskItem PdbFile { get; set; }
+
+        public string PdbType { get; set; }
 
         public bool Pedantic { get; set; }
 
@@ -162,6 +164,8 @@ namespace WixToolset.BuildTasks
             commandLineBuilder.AppendSwitchIfNotNull("-platform ", this.InstallerPlatform);
             commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
             commandLineBuilder.AppendSwitchIfNotNull("-outputType ", this.OutputType);
+            commandLineBuilder.AppendSwitchIfNotNull("-pdb ", this.PdbFile);
+            commandLineBuilder.AppendSwitchIfNotNull("-pdbType ", this.PdbType);
             commandLineBuilder.AppendIfTrue("-nologo", this.NoLogo);
             commandLineBuilder.AppendArrayIfNotNull("-culture ", this.Cultures);
             commandLineBuilder.AppendArrayIfNotNull("-d ", this.DefineConstants);
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 @@
     <OutputName Condition=" '$(OutputName)'=='' ">$(MSBuildProjectName)</OutputName>
     <AssemblyName>$(OutputName)</AssemblyName>
 
-    <!-- Default the OutputType to a known WiX Toolset type.  -->
+    <!-- Default OutputType to a known WiX Toolset type.  -->
     <OutputType Condition=" '$(OutputType)' == '' ">Package</OutputType>
+
+    <!-- Default WixPdbType to a known WiX Toolset type.  -->
+    <WixPdbType Condition=" '$(WixPdbType)' == '' ">full</WixPdbType>
   </PropertyGroup>
 
   <!--
@@ -228,6 +231,11 @@
       Condition=" '$(MSBuildToolsVersion)' == '' OR '$(MSBuildToolsVersion)' &lt; '4.0' "
       Text="MSBuild v$(MSBuildToolsVersion) is not supported by the project &quot;$(MSBuildProjectFile)&quot;. You must use MSBuild v4.0 or later." />
 
+    <Error
+      Code="WIX103"
+      Condition=" '$(WixPdbType)' != 'none' and '$(WixPdbType)' != 'full' and '$(WixPdbType)' != 'partial' "
+      Text="The WixPdbType property '$(WixPdbType)' is not valid in project &quot;$(MSBuildProjectFile)&quot;. Supported values are: 'full', 'none', 'partial'" />
+
   </Target>
 
   <!--
@@ -636,7 +644,8 @@
 
         OutputFile="$(OutputFile)"
         OutputType="$(OutputType)"
-        PdbOutputFile="$(PdbOutputFile)"
+        PdbFile="$(PdbOutputFile)"
+        PdbType="$(WixPdbType)"
 
         AdditionalOptions="$(CompilerAdditionalOptions) $(LinkerAdditionalOptions)"
         DefineConstants="$(DefineConstants);$(SolutionDefineConstants);$(ProjectDefineConstants);$(ProjectReferenceDefineConstants)"