diff options
| author | Bob Arnson <bob@firegiant.com> | 2019-08-18 19:11:12 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-05-19 20:24:49 -0400 |
| commit | d84ed7360adec89569eaab3793e9723f38d2a855 (patch) | |
| tree | 7b136232190c9629027831b57ebbba6bcec2d20d /src | |
| parent | df8cf532fb8f77947664b95901122b8b47fe562b (diff) | |
| download | wix-d84ed7360adec89569eaab3793e9723f38d2a855.tar.gz wix-d84ed7360adec89569eaab3793e9723f38d2a855.tar.bz2 wix-d84ed7360adec89569eaab3793e9723f38d2a855.zip | |
Don't warn about missing netfx4 switches.
Fixes wixtoolset/issues#5390.
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Core/Compiler_Bundle.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs index c95cb2b4..9858ae17 100644 --- a/src/WixToolset.Core/Compiler_Bundle.cs +++ b/src/WixToolset.Core/Compiler_Bundle.cs | |||
| @@ -1989,12 +1989,12 @@ namespace WixToolset.Core | |||
| 1989 | this.Core.Write(WarningMessages.AttributeShouldContain(sourceLineNumbers, node.Name.LocalName, "InstallCommand", installCommand, expectedArgument, "Protocol", "netfx4")); | 1989 | this.Core.Write(WarningMessages.AttributeShouldContain(sourceLineNumbers, node.Name.LocalName, "InstallCommand", installCommand, expectedArgument, "Protocol", "netfx4")); |
| 1990 | } | 1990 | } |
| 1991 | 1991 | ||
| 1992 | if (null == repairCommand || -1 == repairCommand.IndexOf(expectedArgument, StringComparison.OrdinalIgnoreCase)) | 1992 | if (!String.IsNullOrEmpty(repairCommand) && -1 == repairCommand.IndexOf(expectedArgument, StringComparison.OrdinalIgnoreCase)) |
| 1993 | { | 1993 | { |
| 1994 | this.Core.Write(WarningMessages.AttributeShouldContain(sourceLineNumbers, node.Name.LocalName, "RepairCommand", repairCommand, expectedArgument, "Protocol", "netfx4")); | 1994 | this.Core.Write(WarningMessages.AttributeShouldContain(sourceLineNumbers, node.Name.LocalName, "RepairCommand", repairCommand, expectedArgument, "Protocol", "netfx4")); |
| 1995 | } | 1995 | } |
| 1996 | 1996 | ||
| 1997 | if (null == uninstallCommand || -1 == uninstallCommand.IndexOf(expectedArgument, StringComparison.OrdinalIgnoreCase)) | 1997 | if (!String.IsNullOrEmpty(uninstallCommand) && -1 == uninstallCommand.IndexOf(expectedArgument, StringComparison.OrdinalIgnoreCase)) |
| 1998 | { | 1998 | { |
| 1999 | this.Core.Write(WarningMessages.AttributeShouldContain(sourceLineNumbers, node.Name.LocalName, "UninstallCommand", uninstallCommand, expectedArgument, "Protocol", "netfx4")); | 1999 | this.Core.Write(WarningMessages.AttributeShouldContain(sourceLineNumbers, node.Name.LocalName, "UninstallCommand", uninstallCommand, expectedArgument, "Protocol", "netfx4")); |
| 2000 | } | 2000 | } |