@joebigelow / wix / commits / 34e49f55

Normalize text files line endings because Git isn't being consistent

Rob Mensching committed Oct 4, 2018 at 15:15 UTC 34e49f5515995ec30d899879900473bbf07aeda1
1 file changed +4 -4
src/test/WixToolsetTest.WixCop/WixCopFixture.cs
+4 -4
@@ -34,8 +34,8 @@ namespace WixToolsetTest.WixCop
34
35 Assert.Equal(2, result.ExitCode);
36
37 - var expected = File.ReadAllText(Path.Combine(folder, afterFileName));
38 - var actual = File.ReadAllText(targetFile);
37 + var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n");
38 + var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n");
39 Assert.Equal(expected, actual);
40
41 var runner2 = new WixCopRunner
@@ -80,8 +80,8 @@ namespace WixToolsetTest.WixCop
80
81 Assert.Equal(2, result.ExitCode);
82
83 - var expected = File.ReadAllText(Path.Combine(folder, afterFileName));
84 - var actual = File.ReadAllText(targetFile);
83 + var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n");
84 + var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n");
85 Assert.Equal(expected, actual);
86
87 var runner2 = new WixCopRunner