fixed file exclusions

This commit is contained in:
Ellpeck 2020-04-23 23:41:27 +02:00
parent 68f3ef47d8
commit dc77203ee2
3 changed files with 5 additions and 6 deletions

View file

@ -20,7 +20,7 @@ namespace GameBundle {
public bool BuildMac { get; set; } public bool BuildMac { get; set; }
[Option('e', "exclude", HelpText = "Files that should not be moved to the library folder")] [Option('e', "exclude", HelpText = "Files that should not be moved to the library folder")]
public string[] ExcludedFiles { get; set; } public IEnumerable<string> ExcludedFiles { get; set; }
[Option("32-bit", HelpText = "Publish for 32 bit instead of 64 bit. Note that this is only possible on Windows")] [Option("32-bit", HelpText = "Publish for 32 bit instead of 64 bit. Note that this is only possible on Windows")]
public bool Publish32Bit { get; set; } public bool Publish32Bit { get; set; }
[Option('t', "no-trim", HelpText = "Skip trimming the application when publishing")] [Option('t', "no-trim", HelpText = "Skip trimming the application when publishing")]

View file

@ -1,6 +1,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using CommandLine; using CommandLine;
@ -47,11 +48,9 @@ namespace GameBundle {
RunProcess(options, "dotnet", $"publish {proj.FullName} -o {path} -r {rid} -c {options.BuildConfig} /p:PublishTrimmed={!options.NoTrim}"); RunProcess(options, "dotnet", $"publish {proj.FullName} -o {path} -r {rid} -c {options.BuildConfig} /p:PublishTrimmed={!options.NoTrim}");
// Run beauty // Run beauty
var excludes = string.Empty; var excludes = '"' + string.Join(";", options.ExcludedFiles) + '"';
if (options.ExcludedFiles.Length > 0)
excludes = '"' + string.Join(";", options.ExcludedFiles) + '"';
var log = options.Verbose ? "Detail" : "Error"; var log = options.Verbose ? "Detail" : "Error";
RunProcess(options, "ncbeauty", $"--loglevel={log} --force=True {path} {options.LibFolder} {excludes}"); RunProcess(options, "ncbeauty", $"--loglevel={log} --force=True {path} {options.LibFolder} --excludes={excludes}");
// Remove the beauty file since it's just a marker // Remove the beauty file since it's just a marker
var beautyFile = new FileInfo(Path.Combine(path, "NetCoreBeauty")); var beautyFile = new FileInfo(Path.Combine(path, "NetCoreBeauty"));

View file

@ -1 +1 @@
"../GameBundle/bin/Debug/netcoreapp3.1/GameBundle.exe" -wlm -s Test.csproj -o bin/Bundled "../GameBundle/bin/Debug/netcoreapp3.1/GameBundle.exe" -wlm -s Test.csproj -o bin/Bundled -v