diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-12-26 17:14:40 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-12-26 17:14:40 -0800 |
| commit | 7d1e5deed7304612eccfa9cb57b0decf083a868c (patch) | |
| tree | 8b0bee8e4ad15eb724718b3b57d170d780bfc5a2 /src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | |
| parent | c620681374ad7fbf38ebeb53255bdf140fa90c28 (diff) | |
| download | wix-7d1e5deed7304612eccfa9cb57b0decf083a868c.tar.gz wix-7d1e5deed7304612eccfa9cb57b0decf083a868c.tar.bz2 wix-7d1e5deed7304612eccfa9cb57b0decf083a868c.zip | |
Remove lingering uses of .resx from WixToolset.Core
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs index 8d1edb41..385ed33f 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | |||
| @@ -171,14 +171,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 171 | this.Messaging.Write(ErrorMessages.MergePlatformMismatch(wixMergeRow.SourceLineNumbers, wixMergeRow.SourceFile)); | 171 | this.Messaging.Write(ErrorMessages.MergePlatformMismatch(wixMergeRow.SourceLineNumbers, wixMergeRow.SourceFile)); |
| 172 | break; | 172 | break; |
| 173 | default: | 173 | default: |
| 174 | this.Messaging.Write(ErrorMessages.UnexpectedException(String.Format(CultureInfo.CurrentUICulture, WixStrings.EXP_UnexpectedMergerErrorWithType, Enum.GetName(typeof(MsmErrorType), mergeError.Type), logPath), "InvalidOperationException", Environment.StackTrace)); | 174 | this.Messaging.Write(ErrorMessages.UnexpectedException(String.Format(CultureInfo.CurrentUICulture, "Encountered an unexpected merge error of type '{0}' for which there is currently no error message to display. More information about the merge and the failure can be found in the merge log: '{1}'", Enum.GetName(typeof(MsmErrorType), mergeError.Type), logPath), "InvalidOperationException", Environment.StackTrace)); |
| 175 | break; | 175 | break; |
| 176 | } | 176 | } |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | if (0 >= mergeErrors.Count && !commit) | 179 | if (0 >= mergeErrors.Count && !commit) |
| 180 | { | 180 | { |
| 181 | this.Messaging.Write(ErrorMessages.UnexpectedException(String.Format(CultureInfo.CurrentUICulture, WixStrings.EXP_UnexpectedMergerErrorInSourceFile, wixMergeRow.SourceFile, logPath), "InvalidOperationException", Environment.StackTrace)); | 181 | this.Messaging.Write(ErrorMessages.UnexpectedException(String.Format(CultureInfo.CurrentUICulture, "Encountered an unexpected error while merging '{0}'. More information about the merge and the failure can be found in the merge log: '{1}'", wixMergeRow.SourceFile, logPath), "InvalidOperationException", Environment.StackTrace)); |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | if (moduleOpen) | 184 | if (moduleOpen) |
