From 2bdbd49966a7d2a1f2491ceaa106b07a6e8245ff Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Mon, 17 Feb 2014 23:28:52 -0800
Subject: [PATCH] Remove #if NET45 for GetUnicodeCategory and just use
 CharUnicodeInfo everywhere.

.NET FX Team will not be adding Char.GetUnicodeCategory because it breaks layering. We cannot have a dependency form System.Runtime.dll to System.Globalization.dll.
---
 .../Parser/ParserHelpers.cs                   | 42 +------------------
 .../Tokenizer/CSharpHelpers.cs                | 15 +------
 2 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/src/Microsoft.AspNet.Razor/Parser/ParserHelpers.cs b/src/Microsoft.AspNet.Razor/Parser/ParserHelpers.cs
index 417ea46e31..a31305cf0d 100644
--- a/src/Microsoft.AspNet.Razor/Parser/ParserHelpers.cs
+++ b/src/Microsoft.AspNet.Razor/Parser/ParserHelpers.cs
@@ -33,13 +33,7 @@ namespace Microsoft.AspNet.Razor.Parser
                    value == '\f' ||
                    value == '\t' ||
                    value == '\u000B' || // Vertical Tab
-#if NET45
-                   // No GetUnicodeCategory on Char in CoreCLR
-
-                   Char.GetUnicodeCategory(value) == UnicodeCategory.SpaceSeparator;
-#else
                    CharUnicodeInfo.GetUnicodeCategory(value) == UnicodeCategory.SpaceSeparator;
-#endif
         }
 
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Whitespace", Justification = "This would be a breaking change in a shipping API")]
@@ -94,13 +88,7 @@ namespace Microsoft.AspNet.Razor.Parser
 
         public static bool IsDecimalDigit(char value)
         {
-#if NET45
-            // No GetUnicodeCategory on Char in CoreCLR
-
-            return Char.GetUnicodeCategory(value) == UnicodeCategory.DecimalDigitNumber;
-#else
             return CharUnicodeInfo.GetUnicodeCategory(value) == UnicodeCategory.DecimalDigitNumber;
-#endif
         }
 
         public static bool IsLetterOrDecimalDigit(char value)
@@ -110,14 +98,8 @@ namespace Microsoft.AspNet.Razor.Parser
 
         public static bool IsLetter(char value)
         {
-            UnicodeCategory cat;
-#if NET45
-            // No GetUnicodeCategory on Char in CoreCLR
+            UnicodeCategory cat = CharUnicodeInfo.GetUnicodeCategory(value);
 
-            cat = Char.GetUnicodeCategory(value);
-#else
-            cat = CharUnicodeInfo.GetUnicodeCategory(value);
-#endif
             return cat == UnicodeCategory.UppercaseLetter
                    || cat == UnicodeCategory.LowercaseLetter
                    || cat == UnicodeCategory.TitlecaseLetter
@@ -128,26 +110,12 @@ namespace Microsoft.AspNet.Razor.Parser
 
         public static bool IsFormatting(char value)
         {
-#if NET45
-            // No GetUnicodeCategory on Char in CoreCLR
-
-            return Char.GetUnicodeCategory(value) == UnicodeCategory.Format;
-#else
-
             return CharUnicodeInfo.GetUnicodeCategory(value) == UnicodeCategory.Format;
-#endif
         }
 
         public static bool IsCombining(char value)
         {
-            UnicodeCategory cat;
-#if NET45
-            // No GetUnicodeCategory on Char in CoreCLR
-
-            cat = Char.GetUnicodeCategory(value);
-#else
-            cat = CharUnicodeInfo.GetUnicodeCategory(value);
-#endif
+            UnicodeCategory cat= CharUnicodeInfo.GetUnicodeCategory(value);
 
             return cat == UnicodeCategory.SpacingCombiningMark || cat == UnicodeCategory.NonSpacingMark;
 
@@ -155,13 +123,7 @@ namespace Microsoft.AspNet.Razor.Parser
 
         public static bool IsConnecting(char value)
         {
-#if NET45
-            // No GetUnicodeCategory on Char in CoreCLR
-
-            return Char.GetUnicodeCategory(value) == UnicodeCategory.ConnectorPunctuation;
-#else
             return CharUnicodeInfo.GetUnicodeCategory(value) == UnicodeCategory.ConnectorPunctuation;
-#endif
         }
 
         public static string SanitizeClassName(string inputName)
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/CSharpHelpers.cs b/src/Microsoft.AspNet.Razor/Tokenizer/CSharpHelpers.cs
index 52fb36dd1f..c29797f43f 100644
--- a/src/Microsoft.AspNet.Razor/Tokenizer/CSharpHelpers.cs
+++ b/src/Microsoft.AspNet.Razor/Tokenizer/CSharpHelpers.cs
@@ -12,13 +12,7 @@ namespace Microsoft.AspNet.Razor.Tokenizer
         {
             return Char.IsLetter(character) ||
                    character == '_' ||
-#if NET45 
-                   // No GetUnicodeCategory on Char in CoreCLR
-
-                   Char.GetUnicodeCategory(character) == UnicodeCategory.LetterNumber;
-#else
                    CharUnicodeInfo.GetUnicodeCategory(character) == UnicodeCategory.LetterNumber;
-#endif
         }
 
         public static bool IsIdentifierPart(char character)
@@ -40,14 +34,7 @@ namespace Microsoft.AspNet.Razor.Tokenizer
 
         private static bool IsIdentifierPartByUnicodeCategory(char character)
         {
-            UnicodeCategory category;
-#if NET45 
-            // No GetUnicodeCategory on Char in CoreCLR
-
-            category = Char.GetUnicodeCategory(character);
-#else
-            category = CharUnicodeInfo.GetUnicodeCategory(character);
-#endif
+            UnicodeCategory category = CharUnicodeInfo.GetUnicodeCategory(character);
 
             return category == UnicodeCategory.NonSpacingMark || // Mn
                    category == UnicodeCategory.SpacingCombiningMark || // Mc