From b8bd03960b79e92d38ee7094a88e246253dad800 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 5 Jul 2020 23:26:48 -0700 Subject: Improve compiler performance by removing regex and other string fixes --- src/WixToolset.Core/Compiler_2.cs | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'src/WixToolset.Core/Compiler_2.cs') 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 this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Show", showValue, "normal", "maximized", "minimized")); break; } - //if (showValue.Length == 0) - //{ - // show = CompilerConstants.IllegalInteger; - //} - //else - //{ - // var showType = Wix.Shortcut.ParseShowType(showValue); - // switch (showType) - // { - // case Wix.Shortcut.ShowType.normal: - // show = 1; - // break; - // case Wix.Shortcut.ShowType.maximized: - // show = 3; - // break; - // case Wix.Shortcut.ShowType.minimized: - // show = 7; - // break; - // default: - // this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Show", showValue, "normal", "maximized", "minimized")); - // show = CompilerConstants.IllegalInteger; - // break; - // } - //} break; case "Target": target = this.Core.GetAttributeValue(sourceLineNumbers, attrib); @@ -4325,11 +4301,11 @@ namespace WixToolset.Core } else if ("Component" == parentElementLocalName || "CreateFolder" == parentElementLocalName) { - target = String.Format(CultureInfo.InvariantCulture, "[{0}]", defaultTarget); + target = "[" + defaultTarget + "]"; } else if ("File" == parentElementLocalName) { - target = String.Format(CultureInfo.InvariantCulture, "[#{0}]", defaultTarget); + target = "[#" + defaultTarget + "]"; } this.Core.AddSymbol(new ShortcutSymbol(sourceLineNumbers, id) -- cgit v1.2.3-55-g6feb