From 6dd045318f7ee405e92e76d311ad1424c20157c1 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 16 Oct 2017 23:48:48 -0700 Subject: Introduce integration test --- src/WixToolset.Core/CommandLine/BuildCommand.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/WixToolset.Core/CommandLine/BuildCommand.cs') diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index 32da5bcf..b3909451 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs @@ -70,6 +70,11 @@ namespace WixToolset.Core { var intermediates = this.CompilePhase(); + if (!intermediates.Any()) + { + return 1; + } + var tableDefinitions = new TableDefinitionCollection(WindowsInstallerStandard.GetTableDefinitions()); if (this.OutputType == OutputType.Library) @@ -162,6 +167,12 @@ namespace WixToolset.Core var resolver = CreateWixResolverWithVariables(localizer, output); + var intermediateFolder = this.IntermediateFolder; + if (String.IsNullOrEmpty(intermediateFolder)) + { + intermediateFolder = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); + } + var context = new BindContext(); context.Messaging = Messaging.Instance; context.ExtensionManager = this.ExtensionManager; @@ -171,7 +182,7 @@ namespace WixToolset.Core context.Codepage = localizer.Codepage; //context.DefaultCompressionLevel = this.DefaultCompressionLevel; //context.Ices = this.Ices; - context.IntermediateFolder = this.IntermediateFolder; + context.IntermediateFolder = intermediateFolder; context.IntermediateRepresentation = output; context.OutputPath = this.OutputPath; context.OutputPdbPath = Path.ChangeExtension(this.OutputPath, ".wixpdb"); -- cgit v1.2.3-55-g6feb