diff options
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller')
-rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | 4 | ||||
-rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs | 6 |
2 files changed, 5 insertions, 5 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) |
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs index 34049dfd..0a356ba9 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs | |||
@@ -88,7 +88,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
88 | } | 88 | } |
89 | else // not a supported unscheduled action. | 89 | else // not a supported unscheduled action. |
90 | { | 90 | { |
91 | throw new InvalidOperationException(WixStrings.EXP_FoundActionRowWithNoSequenceBeforeOrAfterColumnSet); | 91 | throw new InvalidOperationException("Found an ActionRow with no Sequence, Before, or After column set."); |
92 | } | 92 | } |
93 | } | 93 | } |
94 | 94 | ||
@@ -575,7 +575,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
575 | } | 575 | } |
576 | else if (actionRow.Before == null) | 576 | else if (actionRow.Before == null) |
577 | { | 577 | { |
578 | throw new InvalidOperationException(WixStrings.EXP_FoundActionRowWithNoSequenceBeforeOrAfterColumnSet); | 578 | throw new InvalidOperationException("Found an ActionRow with no Sequence, Before, or After column set."); |
579 | } | 579 | } |
580 | 580 | ||
581 | var parentActionName = (after ? actionRow.After : actionRow.Before); | 581 | var parentActionName = (after ? actionRow.After : actionRow.Before); |
@@ -593,7 +593,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
593 | } | 593 | } |
594 | else | 594 | else |
595 | { | 595 | { |
596 | throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, WixStrings.EXP_FoundActionRowWinNonExistentAction, (after ? "After" : "Before"), parentActionName)); | 596 | throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Found an ActionRow with a non-existent {0} action: {1}.", (after ? "After" : "Before"), parentActionName)); |
597 | } | 597 | } |
598 | } | 598 | } |
599 | else if (actionRow == parentActionRow || this.ContainsChildActionRow(actionRow, parentActionRow)) // cycle detected | 599 | else if (actionRow == parentActionRow || this.ContainsChildActionRow(actionRow, parentActionRow)) // cycle detected |