From af9e9f9113fb88d443c69925d5d77d7b3e450281 Mon Sep 17 00:00:00 2001
From: Bruce Bowyer-Smyth <bbowyersmyth@live.com.au>
Date: Thu, 1 Jan 2015 16:16:29 +1000
Subject: [PATCH] Remove boxing of chars when concatenated with strings

---
 .../ApplicationModels/AttributeRouteModel.cs                  | 2 +-
 .../Directives/InjectChunkMerger.cs                           | 2 +-
 .../Directives/SetBaseTypeChunkMerger.cs                      | 2 +-
 src/Microsoft.AspNet.Mvc.Razor.Host/InjectChunkVisitor.cs     | 4 ++--
 src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs           | 2 +-
 test/Microsoft.AspNet.Mvc.FunctionalTests/RoutingTests.cs     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AttributeRouteModel.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
index 626f5aa35f..bd13b89380 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
@@ -130,7 +130,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
             }
 
             // Both templates contain some text.
-            return left + '/' + right;
+            return left + "/" + right;
         }
 
         private static bool IsOverridePattern(string template)
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/Directives/InjectChunkMerger.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/Directives/InjectChunkMerger.cs
index 70ab3a878c..ac03716cf3 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/Directives/InjectChunkMerger.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/Directives/InjectChunkMerger.cs
@@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Directives
         /// <param name="modelType">The model type to be used to replace &lt;TModel&gt; tokens.</param>
         public InjectChunkMerger([NotNull] string modelType)
         {
-            _modelType = '<' + modelType + '>';
+            _modelType = "<" + modelType + ">";
         }
 
         /// <inheritdoc />
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/Directives/SetBaseTypeChunkMerger.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/Directives/SetBaseTypeChunkMerger.cs
index 72723c8866..8d3bcb8f1c 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/Directives/SetBaseTypeChunkMerger.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/Directives/SetBaseTypeChunkMerger.cs
@@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Directives
         /// <param name="defaultModelType">The type name of the model used by default.</param>
         public SetBaseTypeChunkMerger(string modelType)
         {
-            _modelType = '<' + modelType + '>';
+            _modelType = "<" + modelType + ">";
         }
 
         /// <inheritdoc />
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/InjectChunkVisitor.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/InjectChunkVisitor.cs
index 5cd8548fb5..3fb71b5029 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/InjectChunkVisitor.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/InjectChunkVisitor.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Mvc.Razor
                                   [NotNull] string activateAttributeName)
             : base(writer, context)
         {
-            _activateAttribute = '[' + activateAttributeName + ']';
+            _activateAttribute = "[" + activateAttributeName + "]";
         }
 
         public List<InjectChunk> InjectChunks
@@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Mvc.Razor
 
                 var code = string.IsNullOrEmpty(chunk.MemberName) ?
                             chunk.TypeName :
-                            chunk.TypeName + ' ' + chunk.MemberName;
+                            chunk.TypeName + " " + chunk.MemberName;
                 var csharpVisitor = new CSharpCodeVisitor(Writer, Context);
                 csharpVisitor.CreateExpressionCodeMapping(code, chunk);
                 Writer.WriteLine("{ get; private set; }");
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs
index 0007518f79..450c96c5e5 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs
@@ -60,7 +60,7 @@ namespace Microsoft.AspNet.Mvc.Razor
             _baseType = BaseType;
 
             TagHelperDescriptorResolver = new TagHelperDescriptorResolver();
-            DefaultBaseClass = BaseType + '<' + DefaultModel + '>';
+            DefaultBaseClass = BaseType + "<" + DefaultModel + ">";
             DefaultNamespace = "Asp";
             // Enable instrumentation by default to allow precompiled views to work with BrowserLink.
             EnableInstrumentation = true;
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/RoutingTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/RoutingTests.cs
index 623e961b3d..8160aff7cb 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/RoutingTests.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/RoutingTests.cs
@@ -1422,7 +1422,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
 
             public override string ToString()
             {
-                return Url + '?' + string.Join("&", Values.Select(kvp => kvp.Key + '=' + kvp.Value));
+                return Url + "?" + string.Join("&", Values.Select(kvp => kvp.Key + "=" + kvp.Value));
             }
 
             public static implicit operator string (LinkBuilder builder)