diff options
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 2aa25141..22f0df8f 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
| @@ -57,7 +57,7 @@ namespace WixToolset.Core | |||
| 57 | Icon, | 57 | Icon, |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | internal Compiler(IWixToolsetServiceProvider serviceProvider) | 60 | internal Compiler(IServiceProvider serviceProvider) |
| 61 | { | 61 | { |
| 62 | this.Messaging = serviceProvider.GetService<IMessaging>(); | 62 | this.Messaging = serviceProvider.GetService<IMessaging>(); |
| 63 | } | 63 | } |
| @@ -4298,9 +4298,9 @@ namespace WixToolset.Core | |||
| 4298 | } | 4298 | } |
| 4299 | } | 4299 | } |
| 4300 | else if ("TARGETDIR".Equals(id.Id, StringComparison.Ordinal) && !("SourceDir".Equals(name, StringComparison.Ordinal) && shortName == null && shortSourceName == null && sourceName == null)) | 4300 | else if ("TARGETDIR".Equals(id.Id, StringComparison.Ordinal) && !("SourceDir".Equals(name, StringComparison.Ordinal) && shortName == null && shortSourceName == null && sourceName == null)) |
| 4301 | { | 4301 | { |
| 4302 | this.Core.Write(ErrorMessages.IllegalTargetDirDefaultDir(sourceLineNumbers, name)); | 4302 | this.Core.Write(ErrorMessages.IllegalTargetDirDefaultDir(sourceLineNumbers, name)); |
| 4303 | } | 4303 | } |
| 4304 | 4304 | ||
| 4305 | // Update the file source path appropriately. | 4305 | // Update the file source path appropriately. |
| 4306 | if (fileSourceAttribSet) | 4306 | if (fileSourceAttribSet) |
