diff options
Diffstat (limited to 'src/WixToolset.Core/Compiler_2.cs')
-rw-r--r-- | src/WixToolset.Core/Compiler_2.cs | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs index 7e2485e1..29f240f4 100644 --- a/src/WixToolset.Core/Compiler_2.cs +++ b/src/WixToolset.Core/Compiler_2.cs | |||
@@ -4182,30 +4182,6 @@ namespace WixToolset.Core | |||
4182 | this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Show", showValue, "normal", "maximized", "minimized")); | 4182 | this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Show", showValue, "normal", "maximized", "minimized")); |
4183 | break; | 4183 | break; |
4184 | } | 4184 | } |
4185 | //if (showValue.Length == 0) | ||
4186 | //{ | ||
4187 | // show = CompilerConstants.IllegalInteger; | ||
4188 | //} | ||
4189 | //else | ||
4190 | //{ | ||
4191 | // var showType = Wix.Shortcut.ParseShowType(showValue); | ||
4192 | // switch (showType) | ||
4193 | // { | ||
4194 | // case Wix.Shortcut.ShowType.normal: | ||
4195 | // show = 1; | ||
4196 | // break; | ||
4197 | // case Wix.Shortcut.ShowType.maximized: | ||
4198 | // show = 3; | ||
4199 | // break; | ||
4200 | // case Wix.Shortcut.ShowType.minimized: | ||
4201 | // show = 7; | ||
4202 | // break; | ||
4203 | // default: | ||
4204 | // this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Show", showValue, "normal", "maximized", "minimized")); | ||
4205 | // show = CompilerConstants.IllegalInteger; | ||
4206 | // break; | ||
4207 | // } | ||
4208 | //} | ||
4209 | break; | 4185 | break; |
4210 | case "Target": | 4186 | case "Target": |
4211 | target = this.Core.GetAttributeValue(sourceLineNumbers, attrib); | 4187 | target = this.Core.GetAttributeValue(sourceLineNumbers, attrib); |
@@ -4325,11 +4301,11 @@ namespace WixToolset.Core | |||
4325 | } | 4301 | } |
4326 | else if ("Component" == parentElementLocalName || "CreateFolder" == parentElementLocalName) | 4302 | else if ("Component" == parentElementLocalName || "CreateFolder" == parentElementLocalName) |
4327 | { | 4303 | { |
4328 | target = String.Format(CultureInfo.InvariantCulture, "[{0}]", defaultTarget); | 4304 | target = "[" + defaultTarget + "]"; |
4329 | } | 4305 | } |
4330 | else if ("File" == parentElementLocalName) | 4306 | else if ("File" == parentElementLocalName) |
4331 | { | 4307 | { |
4332 | target = String.Format(CultureInfo.InvariantCulture, "[#{0}]", defaultTarget); | 4308 | target = "[#" + defaultTarget + "]"; |
4333 | } | 4309 | } |
4334 | 4310 | ||
4335 | this.Core.AddSymbol(new ShortcutSymbol(sourceLineNumbers, id) | 4311 | this.Core.AddSymbol(new ShortcutSymbol(sourceLineNumbers, id) |