From 2e19daa04721d583724d4be2af301d7814728c83 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 18 Oct 2021 17:09:36 +0200 Subject: [PATCH] updated netcorebeauty --- GameBundle/.config/dotnet-tools.json | 2 +- GameBundle/Program.cs | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/GameBundle/.config/dotnet-tools.json b/GameBundle/.config/dotnet-tools.json index 8229967..9c23529 100644 --- a/GameBundle/.config/dotnet-tools.json +++ b/GameBundle/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "nulastudio.ncbeauty": { - "version": "1.2.9", + "version": "1.2.9.3", "commands": [ "ncbeauty" ] diff --git a/GameBundle/Program.cs b/GameBundle/Program.cs index 997ba14..3e4a889 100644 --- a/GameBundle/Program.cs +++ b/GameBundle/Program.cs @@ -71,14 +71,9 @@ namespace GameBundle { if (!options.SkipLib) { var excludes = $"\"{string.Join(";", options.ExcludedFiles)}\""; var log = options.Verbose ? "Detail" : "Error"; - var beautyResult = RunProcess(options, "dotnet", $"ncbeauty --loglevel={log} --force=True \"{buildDir.FullName}\" \"{options.LibFolder}\" {excludes}", AppDomain.CurrentDomain.BaseDirectory); + var beautyResult = RunProcess(options, "dotnet", $"ncbeauty --loglevel={log} --force=True --noflag=True \"{buildDir.FullName}\" \"{options.LibFolder}\" {excludes}", AppDomain.CurrentDomain.BaseDirectory); if (beautyResult != 0) return beautyResult; - - // Remove the beauty file since it's just a marker - var beautyFile = new FileInfo(Path.Combine(buildDir.FullName, "NetCoreBeauty")); - if (beautyFile.Exists) - beautyFile.Delete(); } // Rename build folder if named builds are enabled