Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 不一至的行尾 #65

Merged
merged 3 commits into from
Mar 3, 2022
Merged

Fix 不一至的行尾 #65

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a382c55
修复生成出来的文件在VS中提示“不一至的行尾”问题。
Mar 3, 2022
2626c84
Merge branch 'master' into fix_不一至的行尾
Mar 3, 2022
a1005f4
统一行尾为 \R\N
Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions src/SmartCode.App/Outputs/FileOutput.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using HandlebarsDotNet;
using SmartCode.Configuration;
using SmartCode.Utilities;
using System.Text.RegularExpressions;

namespace SmartCode.App.Outputs
{
Expand Down Expand Up @@ -69,23 +70,26 @@ public async Task Output(BuildContext context, Output output = null)
{
case Configuration.CreateMode.None:
case Configuration.CreateMode.Incre:
{
_logger.LogWarning(
$"------ Mode:{output.Mode},Build:{context.BuildKey},FilePath:{filePath} Exists ignore output End! ------");
return;
}
{
_logger.LogWarning(
$"------ Mode:{output.Mode},Build:{context.BuildKey},FilePath:{filePath} Exists ignore output End! ------");
return;
}
case Configuration.CreateMode.Full:
{
File.Delete(filePath);
_logger.LogWarning($"------ Mode:{output.Mode},FilePath:{filePath} Exists Deleted ! ------");
break;
}
{
File.Delete(filePath);
_logger.LogWarning($"------ Mode:{output.Mode},FilePath:{filePath} Exists Deleted ! ------");
break;
}
}
}

using (StreamWriter streamWriter = new StreamWriter(filePath))
//采购VS默认的UTF-8 WITH BOM 编码
using (StreamWriter streamWriter = new StreamWriter(filePath, false, new UTF8Encoding(true)))
{
await streamWriter.WriteAsync(context.Result.Trim());
//强制行尾为 \r\n
var result = Regex.Replace(context.Result.Trim(), @"[\r\n]+", "\r\n", RegexOptions.Multiline);
await streamWriter.WriteAsync(result);
}

_logger.LogInformation($"------ Mode:{output.Mode},Build:{context.BuildKey} -> {filePath} End! ------");
Expand Down