diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wix/WixToolset.BuildTasks/WixBuild.cs | 4 | ||||
| -rw-r--r-- | src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs | 12 | ||||
| -rw-r--r-- | src/wix/WixToolset.BuildTasks/WixExeBaseTask_Inproc.cs (renamed from src/wix/WixToolset.BuildTasks/WixBuild_InProc.cs) | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/wix/WixToolset.BuildTasks/WixBuild.cs b/src/wix/WixToolset.BuildTasks/WixBuild.cs index 3d4617f6..2d35c391 100644 --- a/src/wix/WixToolset.BuildTasks/WixBuild.cs +++ b/src/wix/WixToolset.BuildTasks/WixBuild.cs | |||
| @@ -9,7 +9,7 @@ namespace WixToolset.BuildTasks | |||
| 9 | /// <summary> | 9 | /// <summary> |
| 10 | /// An MSBuild task to run the WiX compiler. | 10 | /// An MSBuild task to run the WiX compiler. |
| 11 | /// </summary> | 11 | /// </summary> |
| 12 | public sealed partial class WixBuild : ToolsetTask | 12 | public sealed partial class WixBuild : WixExeBaseTask |
| 13 | { | 13 | { |
| 14 | public string[] Cultures { get; set; } | 14 | public string[] Cultures { get; set; } |
| 15 | 15 | ||
| @@ -72,8 +72,6 @@ namespace WixToolset.BuildTasks | |||
| 72 | 72 | ||
| 73 | public string AdditionalCub { get; set; } | 73 | public string AdditionalCub { get; set; } |
| 74 | 74 | ||
| 75 | protected override string ToolName => "wix.exe"; | ||
| 76 | |||
| 77 | protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder) | 75 | protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder) |
| 78 | { | 76 | { |
| 79 | commandLineBuilder.AppendTextUnquoted("build"); | 77 | commandLineBuilder.AppendTextUnquoted("build"); |
diff --git a/src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs b/src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs new file mode 100644 index 00000000..c1904213 --- /dev/null +++ b/src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs | |||
| @@ -0,0 +1,12 @@ | |||
| 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 | |||
| 3 | namespace WixToolset.BuildTasks | ||
| 4 | { | ||
| 5 | /// <summary> | ||
| 6 | /// An MSBuild task to run WiX to update cabinet signatures in a MSI. | ||
| 7 | /// </summary> | ||
| 8 | public abstract partial class WixExeBaseTask : ToolsetTask | ||
| 9 | { | ||
| 10 | protected override string ToolName => "wix.exe"; | ||
| 11 | } | ||
| 12 | } | ||
diff --git a/src/wix/WixToolset.BuildTasks/WixBuild_InProc.cs b/src/wix/WixToolset.BuildTasks/WixExeBaseTask_Inproc.cs index 9cba0f62..cda5f57f 100644 --- a/src/wix/WixToolset.BuildTasks/WixBuild_InProc.cs +++ b/src/wix/WixToolset.BuildTasks/WixExeBaseTask_Inproc.cs | |||
| @@ -10,7 +10,7 @@ namespace WixToolset.BuildTasks | |||
| 10 | using WixToolset.Core.WindowsInstaller; | 10 | using WixToolset.Core.WindowsInstaller; |
| 11 | using WixToolset.Extensibility.Services; | 11 | using WixToolset.Extensibility.Services; |
| 12 | 12 | ||
| 13 | public partial class WixBuild | 13 | public abstract partial class WixExeBaseTask |
| 14 | { | 14 | { |
| 15 | protected override string TaskShortName => "WIX"; | 15 | protected override string TaskShortName => "WIX"; |
| 16 | 16 | ||
