From 647843e5c749c8cdabad423a33197056ed1fb1d0 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 31 Jul 2018 15:28:24 -0700 Subject: Add error messages for source file command line processing --- src/WixToolset.Data/ErrorMessages.cs | 13 ++++++++++++- src/WixToolset.Data/FileStructure.cs | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/WixToolset.Data/ErrorMessages.cs b/src/WixToolset.Data/ErrorMessages.cs index a50615f3..9b59d6b9 100644 --- a/src/WixToolset.Data/ErrorMessages.cs +++ b/src/WixToolset.Data/ErrorMessages.cs @@ -3,7 +3,6 @@ namespace WixToolset.Data { using System; - using System.Collections; using System.Collections.Generic; using System.Resources; @@ -2225,6 +2224,16 @@ namespace WixToolset.Data return Message(null, Ids.WrongFileExtensionForNumberOfInputs, "The extension '{0}' on the input specified '{1}' does not match the number of inputs required to handle an input with this extension. Check if you are missing an input or have too many.", inputExtension, input); } + public static Message NoSourceFiles() + { + return Message(null, Ids.NoSourceFiles, "No source files specified."); + } + + public static Message WixiplSourceFileIsExclusive() + { + return Message(null, Ids.WixiplSourceFileIsExclusive, "When an intermediate post link source file is specified, it must be the only source file provided."); + } + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) { return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); @@ -2618,6 +2627,8 @@ namespace WixToolset.Data InsecureBundleFilename = 388, PayloadMustBeRelativeToCache = 389, MsiTransactionX86BeforeX64 = 390, + NoSourceFiles = 391, + WixiplSourceFileIsExclusive = 392, } } } diff --git a/src/WixToolset.Data/FileStructure.cs b/src/WixToolset.Data/FileStructure.cs index 722125d8..2667df1e 100644 --- a/src/WixToolset.Data/FileStructure.cs +++ b/src/WixToolset.Data/FileStructure.cs @@ -23,6 +23,7 @@ namespace WixToolset.Data { { "wir", FileFormat.WixIR }, { "wixirf", FileFormat.WixIR }, + { "wixipl", FileFormat.WixIR }, { "wixobj", FileFormat.Wixobj }, { "wixlib", FileFormat.Wixlib }, { "wixout", FileFormat.Wixout }, -- cgit v1.2.3-55-g6feb