From 127e095370e24049faf62e753c89b9b74566e10d Mon Sep 17 00:00:00 2001
From: Crystal Qian <crystaljqian@gmail.com>
Date: Thu, 25 Aug 2016 09:31:29 -0700
Subject: [PATCH] Added property bag to tag helper descriptor. (#822)

aspnet/Mvc#1051
---
 .../Compilation/TagHelpers/TagHelperDescriptor.cs     |  2 +-
 .../CodeGenerators/CSharpCodeGeneratorTest.cs         | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs
index 49286a3a50..ad8df46691 100644
--- a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs
+++ b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
         private IDictionary<string, string> _propertyBag;
         private IEnumerable<TagHelperAttributeDescriptor> _attributes =
             Enumerable.Empty<TagHelperAttributeDescriptor>();
-        private IEnumerable<TagHelperRequiredAttributeDescriptor> _requiredAttributes = 
+        private IEnumerable<TagHelperRequiredAttributeDescriptor> _requiredAttributes =
             Enumerable.Empty<TagHelperRequiredAttributeDescriptor>();
 
         /// <summary>
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeGeneratorTest.cs
index 5bab80810c..d2e8fdcfa4 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeGeneratorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeGeneratorTest.cs
@@ -70,7 +70,7 @@ namespace Microsoft.AspNetCore.Razor.CodeGenerators
                 BaselineWriter.WriteBaseline( baselinePath, result.Code);
             }
 #else
-            Assert.Equal(expectedOutput, result.Code);
+            Assert.Equal(expectedOutput, NormalizeLineEndings(result.Code));
 #endif
         }
 
@@ -103,11 +103,11 @@ namespace Microsoft.AspNetCore.Razor.CodeGenerators
                 };
             }
         }
-        
+
         [Theory]
         [MemberData(nameof(ModifyOutputData))]
         public void BuildAfterExecuteContent_ModifyChunks_ModifyOutput(
-            CSharpCodeGenerator generator, 
+            CSharpCodeGenerator generator,
             CodeGeneratorResult expectedResult,
             string fileName)
         {
@@ -123,7 +123,7 @@ namespace Microsoft.AspNetCore.Razor.CodeGenerators
                 BaselineWriter.WriteBaseline( baselinePath, result.Code);
             }
 #else
-            Assert.Equal(result.Code, expectedResult.Code);
+            Assert.Equal(expectedResult.Code, NormalizeLineEndings(result.Code));
 #endif
         }
 
@@ -212,5 +212,8 @@ namespace Microsoft.AspNetCore.Razor.CodeGenerators
                 return base.Generate();
             }
         }
+
+        private static string NormalizeLineEndings(string content) =>
+            content.Replace("\r", "").Replace("\n", "\r\n");
     }
 }
\ No newline at end of file