diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-10-04 15:15:50 -0700 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2018-10-04 18:20:52 -0400 |
| commit | 34e49f5515995ec30d899879900473bbf07aeda1 (patch) | |
| tree | 8652709cbd248b9bf5b27481f643dbdd3cbe1827 | |
| parent | b1dd80289ef7ba52adeb1a501d637f0399e2710d (diff) | |
| download | wix-34e49f5515995ec30d899879900473bbf07aeda1.tar.gz wix-34e49f5515995ec30d899879900473bbf07aeda1.tar.bz2 wix-34e49f5515995ec30d899879900473bbf07aeda1.zip | |
Normalize text files line endings because Git isn't being consistent
| -rw-r--r-- | src/test/WixToolsetTest.WixCop/WixCopFixture.cs | 8 |
1 files 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 | |||
| 34 | 34 | ||
| 35 | Assert.Equal(2, result.ExitCode); | 35 | Assert.Equal(2, result.ExitCode); |
| 36 | 36 | ||
| 37 | var expected = File.ReadAllText(Path.Combine(folder, afterFileName)); | 37 | var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); |
| 38 | var actual = File.ReadAllText(targetFile); | 38 | var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); |
| 39 | Assert.Equal(expected, actual); | 39 | Assert.Equal(expected, actual); |
| 40 | 40 | ||
| 41 | var runner2 = new WixCopRunner | 41 | var runner2 = new WixCopRunner |
| @@ -80,8 +80,8 @@ namespace WixToolsetTest.WixCop | |||
| 80 | 80 | ||
| 81 | Assert.Equal(2, result.ExitCode); | 81 | Assert.Equal(2, result.ExitCode); |
| 82 | 82 | ||
| 83 | var expected = File.ReadAllText(Path.Combine(folder, afterFileName)); | 83 | var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); |
| 84 | var actual = File.ReadAllText(targetFile); | 84 | var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); |
| 85 | Assert.Equal(expected, actual); | 85 | Assert.Equal(expected, actual); |
| 86 | 86 | ||
| 87 | var runner2 = new WixCopRunner | 87 | var runner2 = new WixCopRunner |