diff options
Diffstat (limited to '')
-rw-r--r-- | src/internal/WixToolset.BaseBuildTasks.Sources/BaseToolsetTask.cs (renamed from src/wix/WixToolset.BuildTasks/ToolsetTask.cs) | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/wix/WixToolset.BuildTasks/ToolsetTask.cs b/src/internal/WixToolset.BaseBuildTasks.Sources/BaseToolsetTask.cs index 3eee7625..d9e3b5e8 100644 --- a/src/wix/WixToolset.BuildTasks/ToolsetTask.cs +++ b/src/internal/WixToolset.BaseBuildTasks.Sources/BaseToolsetTask.cs | |||
@@ -1,13 +1,13 @@ | |||
1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
2 | 2 | ||
3 | namespace WixToolset.BuildTasks | 3 | namespace WixToolset.BaseBuildTasks |
4 | { | 4 | { |
5 | using System; | 5 | using System; |
6 | using System.IO; | 6 | using System.IO; |
7 | using System.Runtime.InteropServices; | 7 | using System.Runtime.InteropServices; |
8 | using Microsoft.Build.Utilities; | 8 | using Microsoft.Build.Utilities; |
9 | 9 | ||
10 | public abstract class ToolsetTask : ToolTask | 10 | public abstract class BaseToolsetTask : ToolTask |
11 | { | 11 | { |
12 | /// <summary> | 12 | /// <summary> |
13 | /// Gets or sets additional options that are appended the the tool command-line. | 13 | /// Gets or sets additional options that are appended the the tool command-line. |
@@ -88,6 +88,7 @@ namespace WixToolset.BuildTasks | |||
88 | commandLineBuilder.AppendIfTrue("-v", this.VerboseOutput); | 88 | commandLineBuilder.AppendIfTrue("-v", this.VerboseOutput); |
89 | commandLineBuilder.AppendArrayIfNotNull("-wx", this.TreatSpecificWarningsAsErrors); | 89 | commandLineBuilder.AppendArrayIfNotNull("-wx", this.TreatSpecificWarningsAsErrors); |
90 | commandLineBuilder.AppendIfTrue("-wx", this.TreatWarningsAsErrors); | 90 | commandLineBuilder.AppendIfTrue("-wx", this.TreatWarningsAsErrors); |
91 | commandLineBuilder.AppendTextIfNotNull(this.AdditionalOptions); | ||
91 | } | 92 | } |
92 | 93 | ||
93 | protected sealed override string GenerateResponseFileCommands() | 94 | protected sealed override string GenerateResponseFileCommands() |
@@ -152,11 +153,11 @@ namespace WixToolset.BuildTasks | |||
152 | private string GetDefaultToolFullPath() | 153 | private string GetDefaultToolFullPath() |
153 | { | 154 | { |
154 | #if NETCOREAPP | 155 | #if NETCOREAPP |
155 | var thisTaskFolder = Path.GetDirectoryName(typeof(ToolsetTask).Assembly.Location); | 156 | var thisTaskFolder = Path.GetDirectoryName(typeof(BaseToolsetTask).Assembly.Location); |
156 | 157 | ||
157 | return Path.Combine(thisTaskFolder, this.ToolExe); | 158 | return Path.Combine(thisTaskFolder, this.ToolExe); |
158 | #else | 159 | #else |
159 | var thisTaskFolder = Path.GetDirectoryName(new Uri(typeof(ToolsetTask).Assembly.CodeBase).AbsolutePath); | 160 | var thisTaskFolder = Path.GetDirectoryName(new Uri(typeof(BaseToolsetTask).Assembly.CodeBase).AbsolutePath); |
160 | 161 | ||
161 | var archFolder = GetArchitectureFolder(thisTaskFolder); | 162 | var archFolder = GetArchitectureFolder(thisTaskFolder); |
162 | 163 | ||