From 34e49f5515995ec30d899879900473bbf07aeda1 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 4 Oct 2018 15:15:50 -0700 Subject: Normalize text files line endings because Git isn't being consistent --- src/test/WixToolsetTest.WixCop/WixCopFixture.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/WixToolsetTest.WixCop/WixCopFixture.cs b/src/test/WixToolsetTest.WixCop/WixCopFixture.cs index 2bbc3d9f..9877f9c8 100644 --- a/src/test/WixToolsetTest.WixCop/WixCopFixture.cs +++ b/src/test/WixToolsetTest.WixCop/WixCopFixture.cs @@ -34,8 +34,8 @@ namespace WixToolsetTest.WixCop Assert.Equal(2, result.ExitCode); - var expected = File.ReadAllText(Path.Combine(folder, afterFileName)); - var actual = File.ReadAllText(targetFile); + var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); + var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); Assert.Equal(expected, actual); var runner2 = new WixCopRunner @@ -80,8 +80,8 @@ namespace WixToolsetTest.WixCop Assert.Equal(2, result.ExitCode); - var expected = File.ReadAllText(Path.Combine(folder, afterFileName)); - var actual = File.ReadAllText(targetFile); + var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); + var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); Assert.Equal(expected, actual); var runner2 = new WixCopRunner -- cgit v1.2.3-55-g6feb