From 1fa19489a31dfb342602e79d690c01c7bfb98142 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 20 Jan 2023 21:41:05 -0800 Subject: [PATCH] ReadAllText not ReadAllLines --- CHANGELIST.md | 1 + MPF.Library/InfoTool.cs | 2 +- MPF.Modules/BaseParameters.cs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index edc4f8b7..5769abd6 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -38,6 +38,7 @@ - More strict when custom parameters editing - Use msbuild for .NET Framework 4.8 - Update nuget packages +- ReadAllText not ReadAllLines ### 2.4 (2022-10-26) - Update to DIC 20211001 diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs index 2a648c10..142144d5 100644 --- a/MPF.Library/InfoTool.cs +++ b/MPF.Library/InfoTool.cs @@ -496,7 +496,7 @@ namespace MPF.Library return BitConverter.ToString(bytes).Replace("-", string.Empty); } - return string.Join("\n", File.ReadAllLines(filename)); + return File.ReadAllText(filename); } /// diff --git a/MPF.Modules/BaseParameters.cs b/MPF.Modules/BaseParameters.cs index c8c78c36..e4a07739 100644 --- a/MPF.Modules/BaseParameters.cs +++ b/MPF.Modules/BaseParameters.cs @@ -344,7 +344,7 @@ namespace MPF.Modules return BitConverter.ToString(bytes).Replace("-", string.Empty); } - return string.Join("\n", File.ReadAllLines(filename)); + return File.ReadAllText(filename); } ///