diff --git a/Content.Packaging/ClientPackaging.cs b/Content.Packaging/ClientPackaging.cs
index a989ebd968ed6a..a66d4ec5b91403 100644
--- a/Content.Packaging/ClientPackaging.cs
+++ b/Content.Packaging/ClientPackaging.cs
@@ -13,7 +13,7 @@ public static class ClientPackaging
///
/// Be advised this can be called from server packaging during a HybridACZ build.
///
- public static async Task PackageClient(bool skipBuild, IPackageLogger logger)
+ public static async Task PackageClient(bool skipBuild, string configuration, IPackageLogger logger)
{
logger.Info("Building client...");
@@ -26,7 +26,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
{
"build",
Path.Combine("Content.Client", "Content.Client.csproj"),
- "-c", "Release",
+ "-c", configuration,
"--nologo",
"/v:m",
"/t:Rebuild",
diff --git a/Content.Packaging/CommandLineArgs.cs b/Content.Packaging/CommandLineArgs.cs
index 1df0d05c28bf1c..23f661921e0258 100644
--- a/Content.Packaging/CommandLineArgs.cs
+++ b/Content.Packaging/CommandLineArgs.cs
@@ -32,7 +32,7 @@ public sealed class CommandLineArgs
public bool HybridAcz { get; set; }
///
- /// Configuration used for when packaging. (Release, Debug)
+ /// Configuration used for when packaging the server. (Release, Debug, Tools)
///
public string Configuration { get; set; }
@@ -136,7 +136,7 @@ private static void PrintHelp()
--no-wipe-release Don't wipe the release folder before creating files.
--hybrid-acz Use HybridACZ for server builds.
--platform Platform for server builds. Default will output several x64 targets.
- --configuration Configuration to use for building. Default is Release.
+ --configuration Configuration to use for building the server (Release, Debug, Tools). Default is Release.
");
}
diff --git a/Content.Packaging/Program.cs b/Content.Packaging/Program.cs
index d4a709ec8c355f..65c0e0131a4f55 100644
--- a/Content.Packaging/Program.cs
+++ b/Content.Packaging/Program.cs
@@ -17,7 +17,7 @@
if (parsed.Client)
{
- await ClientPackaging.PackageClient(parsed.SkipBuild, logger);
+ await ClientPackaging.PackageClient(parsed.SkipBuild, parsed.Configuration, logger);
}
else
{
diff --git a/Content.Packaging/ServerPackaging.cs b/Content.Packaging/ServerPackaging.cs
index 6b475bb37c2236..d9ca57c4d11f4d 100644
--- a/Content.Packaging/ServerPackaging.cs
+++ b/Content.Packaging/ServerPackaging.cs
@@ -82,7 +82,7 @@ public static async Task PackageServer(bool skipBuild, bool hybridAcz, IPackageL
// Rather than hosting the client ZIP on the watchdog or on a separate server,
// Hybrid ACZ uses the ACZ hosting functionality to host it as part of the status host,
// which means that features such as automatic UPnP forwarding still work properly.
- await ClientPackaging.PackageClient(skipBuild, logger);
+ await ClientPackaging.PackageClient(skipBuild, configuration, logger);
}
// Good variable naming right here.
@@ -97,7 +97,7 @@ public static async Task PackageServer(bool skipBuild, bool hybridAcz, IPackageL
private static async Task BuildPlatform(PlatformReg platform, bool skipBuild, bool hybridAcz, string configuration, IPackageLogger logger)
{
- logger.Info($"Building project for {platform}...");
+ logger.Info($"Building project for {platform.TargetOs}...");
if (!skipBuild)
{
@@ -108,7 +108,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
{
"build",
Path.Combine("Content.Server", "Content.Server.csproj"),
- "-c", $"{configuration}",
+ "-c", configuration,
"--nologo",
"/v:m",
$"/p:TargetOs={platform.TargetOs}",
@@ -118,7 +118,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
}
});
- await PublishClientServer(platform.Rid, platform.TargetOs);
+ await PublishClientServer(platform.Rid, platform.TargetOs, configuration);
}
logger.Info($"Packaging {platform.Rid} server...");
@@ -137,7 +137,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
logger.Info($"Finished packaging server in {sw.Elapsed}");
}
- private static async Task PublishClientServer(string runtime, string targetOs)
+ private static async Task PublishClientServer(string runtime, string targetOs, string configuration)
{
await ProcessHelpers.RunCheck(new ProcessStartInfo
{
@@ -147,7 +147,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
"publish",
"--runtime", runtime,
"--no-self-contained",
- "-c", "Release",
+ "-c", configuration,
$"/p:TargetOs={targetOs}",
"/p:FullRelease=True",
"/m",