aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.BuildTasks
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-03-17 21:28:12 -0400
committerBob Arnson <bob@firegiant.com>2020-03-17 21:28:12 -0400
commitfe77cae987ea2bfc43d2ffec660bf773e922709d (patch)
treec73643831f2f7983090fca98f2e1c79f88da8a32 /src/WixToolset.BuildTasks
parent60085dfd1ac4a673d295f96a62196a2cf16dec8b (diff)
downloadwix-fe77cae987ea2bfc43d2ffec660bf773e922709d.tar.gz
wix-fe77cae987ea2bfc43d2ffec660bf773e922709d.tar.bz2
wix-fe77cae987ea2bfc43d2ffec660bf773e922709d.zip
Partial WixPdbs stop the backend before binding.
Diffstat (limited to 'src/WixToolset.BuildTasks')
-rw-r--r--src/WixToolset.BuildTasks/DoIt.cs6
-rw-r--r--src/WixToolset.BuildTasks/wix.targets13
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
47 47
48 public string OutputType { get; set; } 48 public string OutputType { get; set; }
49 49
50 public string PdbOutputFile { get; set; } 50 public ITaskItem PdbFile { get; set; }
51
52 public string PdbType { get; set; }
51 53
52 public bool Pedantic { get; set; } 54 public bool Pedantic { get; set; }
53 55
@@ -162,6 +164,8 @@ namespace WixToolset.BuildTasks
162 commandLineBuilder.AppendSwitchIfNotNull("-platform ", this.InstallerPlatform); 164 commandLineBuilder.AppendSwitchIfNotNull("-platform ", this.InstallerPlatform);
163 commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile); 165 commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
164 commandLineBuilder.AppendSwitchIfNotNull("-outputType ", this.OutputType); 166 commandLineBuilder.AppendSwitchIfNotNull("-outputType ", this.OutputType);
167 commandLineBuilder.AppendSwitchIfNotNull("-pdb ", this.PdbFile);
168 commandLineBuilder.AppendSwitchIfNotNull("-pdbType ", this.PdbType);
165 commandLineBuilder.AppendIfTrue("-nologo", this.NoLogo); 169 commandLineBuilder.AppendIfTrue("-nologo", this.NoLogo);
166 commandLineBuilder.AppendArrayIfNotNull("-culture ", this.Cultures); 170 commandLineBuilder.AppendArrayIfNotNull("-culture ", this.Cultures);
167 commandLineBuilder.AppendArrayIfNotNull("-d ", this.DefineConstants); 171 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 @@
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)' &lt; '4.0' " 231 Condition=" '$(MSBuildToolsVersion)' == '' OR '$(MSBuildToolsVersion)' &lt; '4.0' "
229 Text="MSBuild v$(MSBuildToolsVersion) is not supported by the project &quot;$(MSBuildProjectFile)&quot;. You must use MSBuild v4.0 or later." /> 232 Text="MSBuild v$(MSBuildToolsVersion) is not supported by the project &quot;$(MSBuildProjectFile)&quot;. 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 &quot;$(MSBuildProjectFile)&quot;. 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)"