From 3fe0b569d62913e6641a053508d3a53f8af14ba0 Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Sun, 5 Mar 2017 22:35:34 -0800
Subject: [PATCH] Fix tests on Windows with `core.autocrlf=input` - #5907

---
 .../ViewComponentTagHelperPassTest.cs         | 21 +++++++++++++------
 .../Components/DanViewComponent.cs            |  3 ++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/ViewComponentTagHelperPassTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/ViewComponentTagHelperPassTest.cs
index 650c3285bb..fc3a2ea5c2 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/ViewComponentTagHelperPassTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/ViewComponentTagHelperPassTest.cs
@@ -111,7 +111,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Host
             Assert.Equal(3, @class.Children.Count);
 
             var vcthClass = Assert.IsType<CSharpStatementIRNode>(@class.Children[2]);
-            Assert.Equal(@"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
+            Assert.Equal(
+                @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
 public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
 {
     private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
@@ -130,7 +131,9 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
         output.Content.SetHtmlContent(content);
     }
 }
-", vcthClass.Content);
+",
+                vcthClass.Content,
+                ignoreLineEndingDifferences: true);
         }
 
         [Fact]
@@ -192,7 +195,8 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
             Assert.Equal(3, @class.Children.Count);
 
             var vcthClass = Assert.IsType<CSharpStatementIRNode>(@class.Children[2]);
-            Assert.Equal(@"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
+            Assert.Equal(
+                @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
 public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
 {
     private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
@@ -212,7 +216,9 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
         output.Content.SetHtmlContent(content);
     }
 }
-", vcthClass.Content);
+",
+                vcthClass.Content,
+                ignoreLineEndingDifferences: true);
         }
 
         [Fact]
@@ -286,7 +292,8 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
             Assert.Equal(3, @class.Children.Count);
 
             var vcthClass = Assert.IsType<CSharpStatementIRNode>(@class.Children[2]);
-            Assert.Equal(@"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
+            Assert.Equal(
+                @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
 public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
 {
     private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
@@ -305,7 +312,9 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
         output.Content.SetHtmlContent(content);
     }
 }
-", vcthClass.Content);
+",
+                vcthClass.Content,
+                ignoreLineEndingDifferences: true);
         }
 
         private RazorCodeDocument CreateDocument(string content)
diff --git a/test/WebSites/TagHelpersWebSite/Components/DanViewComponent.cs b/test/WebSites/TagHelpersWebSite/Components/DanViewComponent.cs
index 76e3721d8d..30f2d2d5e3 100644
--- a/test/WebSites/TagHelpersWebSite/Components/DanViewComponent.cs
+++ b/test/WebSites/TagHelpersWebSite/Components/DanViewComponent.cs
@@ -14,7 +14,8 @@ namespace TagHelpersWebSite
 
             var resultString = DanString
                 .Replace("#", colorReplacement)
-                .Replace(Environment.NewLine, "<br>");
+                .Replace(Environment.NewLine, "<br>")
+                .Replace("\n", "<br>");
 
             return View<string>(resultString);
         }