From dc4573e484823851eef6d864d1e0028738081123 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Fri, 4 Sep 2015 14:41:35 -0700 Subject: [PATCH] Get four failing tests working on Linux - use consistent line endings on all platforms so that hashes and file versions match - add another `.gitattribute` file - move files to avoid required index recreation in all Linux repos --- ...Site.HtmlGeneration_Home.Link.Encoded.html | 84 +++++++++---------- ...ationWebSite.HtmlGeneration_Home.Link.html | 84 +++++++++---------- ...te.HtmlGeneration_Home.Script.Encoded.html | 40 ++++----- ...ionWebSite.HtmlGeneration_Home.Script.html | 40 ++++----- .../Views/HtmlGeneration_Home/Link.cshtml | 78 ++++++++--------- .../Views/HtmlGeneration_Home/Script.cshtml | 26 +++--- .../wwwroot/styles/.gitattributes | 2 + .../wwwroot/{ => styles}/site.css | 0 .../wwwroot/{ => styles}/site.js | 0 .../wwwroot/{ => styles}/sub/site2.css | 0 .../wwwroot/{ => styles}/sub/site2.js | 0 .../wwwroot/{ => styles}/sub/site3.css | 0 .../wwwroot/{ => styles}/sub/site3.js | 0 .../wwwroot/{ => styles}/sub/site3.min.css | 0 14 files changed, 178 insertions(+), 176 deletions(-) create mode 100644 test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes rename test/WebSites/HtmlGenerationWebSite/wwwroot/{ => styles}/site.css (100%) rename test/WebSites/HtmlGenerationWebSite/wwwroot/{ => styles}/site.js (100%) rename test/WebSites/HtmlGenerationWebSite/wwwroot/{ => styles}/sub/site2.css (100%) rename test/WebSites/HtmlGenerationWebSite/wwwroot/{ => styles}/sub/site2.js (100%) rename test/WebSites/HtmlGenerationWebSite/wwwroot/{ => styles}/sub/site3.css (100%) rename test/WebSites/HtmlGenerationWebSite/wwwroot/{ => styles}/sub/site3.js (100%) rename test/WebSites/HtmlGenerationWebSite/wwwroot/{ => styles}/sub/site3.min.css (100%) diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html index 642e4848b0..8a38510597 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html @@ -5,22 +5,22 @@ Link - + - + - + - + - + @@ -32,98 +32,98 @@ - + - + - - + + - + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - + - + - + - + - + - - + + - + diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html index a5c4e08137..aaf691484c 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html @@ -5,22 +5,22 @@ Link - + - + - + - + - + @@ -32,98 +32,98 @@ - + - + - - + + - + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - + - + - + - + - + - - + + - + diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html index 40810ebd8f..f1f2158a0a 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html @@ -6,34 +6,34 @@

Script tag helper test

- - + - + - + - + - + - + - + - + - + - - + @@ -87,32 +87,32 @@ - + - - + - + - - + - + \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html index 0693b89243..69adf8e151 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html @@ -6,34 +6,34 @@

Script tag helper test

- - + - + - + - + - + - + - + - + - + - - + @@ -87,32 +87,32 @@ - + - - + - + - - + - + \ No newline at end of file diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml index a9336cebb8..5cf25f73be 100644 --- a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml +++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml @@ -7,13 +7,13 @@ Link - + - + @@ -22,7 +22,7 @@ - + @@ -34,80 +34,80 @@ - + - + - - - - - - - - - - - - - - - - - - + - - + diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml index e8d2469394..bfe3310737 100644 --- a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml +++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml @@ -11,11 +11,11 @@

Script tag helper test

- - @@ -31,14 +31,14 @@ - - @@ -85,12 +85,12 @@ // Globbed script tag missing include - - + @@ -101,15 +101,15 @@ - - - @@ -117,7 +117,7 @@ // Fallback to globbed src with file version. - diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes new file mode 100644 index 0000000000..54a3709b28 --- /dev/null +++ b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes @@ -0,0 +1,2 @@ +site*.css eol=crlf +site*.js eol=crlf \ No newline at end of file diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/site.css b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.css similarity index 100% rename from test/WebSites/HtmlGenerationWebSite/wwwroot/site.css rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.css diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/site.js b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.js similarity index 100% rename from test/WebSites/HtmlGenerationWebSite/wwwroot/site.js rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.js diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site2.css b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.css similarity index 100% rename from test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site2.css rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.css diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site2.js b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.js similarity index 100% rename from test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site2.js rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.js diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.css b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.css similarity index 100% rename from test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.css rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.css diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.js b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.js similarity index 100% rename from test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.js rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.js diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.min.css b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.min.css similarity index 100% rename from test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.min.css rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.min.css