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/ExtensibilityServices/Messaging.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/ExtensibilityServices/Messaging.cs')
-rw-r--r-- | src/WixToolset.Core/ExtensibilityServices/Messaging.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/WixToolset.Core/ExtensibilityServices/Messaging.cs b/src/WixToolset.Core/ExtensibilityServices/Messaging.cs index 4510f264..f4673952 100644 --- a/src/WixToolset.Core/ExtensibilityServices/Messaging.cs +++ b/src/WixToolset.Core/ExtensibilityServices/Messaging.cs | |||
@@ -65,10 +65,10 @@ namespace WixToolset.Core.ExtensibilityServices | |||
65 | { | 65 | { |
66 | if (fileNames.Count == 0) | 66 | if (fileNames.Count == 0) |
67 | { | 67 | { |
68 | errorFileName = String.Format(CultureInfo.CurrentUICulture, WixStrings.Format_FirstLineNumber, sln.FileName, sln.LineNumber); | 68 | errorFileName = String.Format(CultureInfo.CurrentUICulture, "{0}({1})", sln.FileName, sln.LineNumber); |
69 | } | 69 | } |
70 | 70 | ||
71 | fileNames.Add(String.Format(CultureInfo.CurrentUICulture, WixStrings.Format_LineNumber, sln.FileName, sln.LineNumber)); | 71 | fileNames.Add(String.Format(CultureInfo.CurrentUICulture, "{0}: line {1}", sln.FileName, sln.LineNumber)); |
72 | } | 72 | } |
73 | else | 73 | else |
74 | { | 74 | { |
@@ -84,11 +84,11 @@ namespace WixToolset.Core.ExtensibilityServices | |||
84 | var levelString = String.Empty; | 84 | var levelString = String.Empty; |
85 | if (MessageLevel.Warning == level) | 85 | if (MessageLevel.Warning == level) |
86 | { | 86 | { |
87 | levelString = WixStrings.MessageType_Warning; | 87 | levelString = "warning"; |
88 | } | 88 | } |
89 | else if (MessageLevel.Error == level) | 89 | else if (MessageLevel.Error == level) |
90 | { | 90 | { |
91 | levelString = WixStrings.MessageType_Error; | 91 | levelString = "error"; |
92 | } | 92 | } |
93 | 93 | ||
94 | string formatted; | 94 | string formatted; |
@@ -104,20 +104,20 @@ namespace WixToolset.Core.ExtensibilityServices | |||
104 | var builder = new StringBuilder(); | 104 | var builder = new StringBuilder(); |
105 | if (level == MessageLevel.Information || level == MessageLevel.Verbose) | 105 | if (level == MessageLevel.Information || level == MessageLevel.Verbose) |
106 | { | 106 | { |
107 | builder.AppendFormat(WixStrings.Format_InfoMessage, formatted); | 107 | builder.Append(formatted); |
108 | } | 108 | } |
109 | else | 109 | else |
110 | { | 110 | { |
111 | builder.AppendFormat(WixStrings.Format_NonInfoMessage, errorFileName, levelString, shortAppName, message.Id, formatted); | 111 | builder.AppendFormat("{0} : {1} {2}{3:0000} : {4}", errorFileName, levelString, shortAppName, message.Id, formatted); |
112 | } | 112 | } |
113 | 113 | ||
114 | if (fileNames.Count > 1) | 114 | if (fileNames.Count > 1) |
115 | { | 115 | { |
116 | builder.AppendFormat(WixStrings.INF_SourceTrace, Environment.NewLine); | 116 | builder.AppendFormat("Source trace:{0}", Environment.NewLine); |
117 | 117 | ||
118 | foreach (var fileName in fileNames) | 118 | foreach (var fileName in fileNames) |
119 | { | 119 | { |
120 | builder.AppendFormat(WixStrings.INF_SourceTraceLocation, fileName, Environment.NewLine); | 120 | builder.AppendFormat("Source trace:{0}", fileName, Environment.NewLine); |
121 | } | 121 | } |
122 | 122 | ||
123 | builder.AppendLine(); | 123 | builder.AppendLine(); |