From 1ed894bc0f39397ec7f7f6344370fc2123420c43 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 21 May 2019 23:59:59 -0700 Subject: Use full path in source line numbers --- src/WixToolset.Core/Preprocessor.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core/Preprocessor.cs b/src/WixToolset.Core/Preprocessor.cs index 5a255234..d086cbd9 100644 --- a/src/WixToolset.Core/Preprocessor.cs +++ b/src/WixToolset.Core/Preprocessor.cs @@ -1348,9 +1348,11 @@ namespace WixToolset.Core throw new WixException(ErrorMessages.TooDeeplyIncluded(state.Context.CurrentSourceLineNumber, state.CurrentFileStack.Count)); } - state.CurrentFileStack.Push(fileName); + var path = Path.GetFullPath(fileName); + + state.CurrentFileStack.Push(path); state.SourceStack.Push(state.Context.CurrentSourceLineNumber); - state.Context.CurrentSourceLineNumber = new SourceLineNumber(fileName); + state.Context.CurrentSourceLineNumber = new SourceLineNumber(path); state.IncludeNextStack.Push(true); } @@ -1468,8 +1470,10 @@ namespace WixToolset.Core { public ProcessingState(IServiceProvider serviceProvider, IPreprocessContext context) { + var path = Path.GetFullPath(context.SourcePath); + this.Context = context; - this.Context.CurrentSourceLineNumber = new SourceLineNumber(context.SourcePath); + this.Context.CurrentSourceLineNumber = new SourceLineNumber(path); this.Context.Variables = this.Context.Variables == null ? new Dictionary() : new Dictionary(this.Context.Variables); this.Helper = serviceProvider.GetService(); -- cgit v1.2.3-55-g6feb