diff --git a/Tools/build-native-libraries.cmd b/Tools/build-native-libraries.cmd
index 3651d8aaf..66de3b56e 100755
--- a/Tools/build-native-libraries.cmd
+++ b/Tools/build-native-libraries.cmd
@@ -3,14 +3,27 @@
 GOTO :CMDSCRIPT
 
 ::SHELLSCRIPT
-dotnet build -c Release Projects/Argon2/Argon2.csproj
+if [[ -z $2 ]]
+then
+  c="-c Release"
+else
+  c=-c $2
+fi
+
+dotnet build ${c} Projects/Argon2/Argon2.csproj
 dotnet pack -o packages Projects/Argon2/Argon2.csproj
-dotnet build -c Release Projects/ZLib/ZLib.csproj
+dotnet build ${c} Projects/ZLib/ZLib.csproj
 dotnet pack -o packages Projects/ZLib/ZLib.csproj
 exit $?
 
 :CMDSCRIPT
-ECHO dotnet build -c Release Projects\Argon2\Argon2.csproj
+IF "%~1" == "" (
+  SET c=-c Release
+) ELSE (
+  SET c=-c %~1
+)
+
+ECHO dotnet build %c% Projects\Argon2\Argon2.csproj
 ECHO dotnet pack -o packages Projects\Argon2\Argon2.csproj
-ECHO dotnet build -c Release Projects\ZLib\ZLib.csproj
+ECHO dotnet build %c% Projects\ZLib\ZLib.csproj
 ECHO dotnet pack -o packages Projects\ZLib\ZLib.csproj
diff --git a/Tools/publish.cmd b/Tools/publish.cmd
index 6be1b99d9..80b84c24a 100755
--- a/Tools/publish.cmd
+++ b/Tools/publish.cmd
@@ -1,10 +1,8 @@
-dotnet clean
 :<<"::SHELLSCRIPT"
 @ECHO OFF
 GOTO :CMDSCRIPT
-::SHELLSCRIPT
-Tools/build-native-libraries.cmd
 
+::SHELLSCRIPT
 if [[ -z $2 ]]
 then
   c="-c Release"
@@ -12,6 +10,8 @@ else
   c=-c $2
 fi
 
+Tools/build-native-libraries.cmd $2
+
 if [[ $1 ]]
 then
   r="-r $1-x64"
@@ -24,24 +24,25 @@ else
   fi
 fi
 
-dotnet publish Projects/Server/Server.csproj ${c} ${r} --self-contained=false -o Distribution
-dotnet publish Projects/Scripts/Scripts.csproj ${c} ${r} --self-contained=false -o Distribution/Assemblies
+dotnet publish ${c} ${r} --self-contained=false -o Distribution Projects/Server/Server.csproj
+dotnet publish ${c} ${r} --self-contained=false -o Distribution/Assemblies Projects/Scripts/Scripts.csproj
 exit $?
 
 :CMDSCRIPT
-CALL Tools\build-native-libraries.cmd
-
 IF "%~2" == "" (
-  SET c =-c Release
+  SET c=-c Release
 ) ELSE (
-  SET c =-c %~2
+  SET c=-c %~2
 )
 
-IF NOT "%~1" == "" (
-  SET r =-r %~1-x64
+CALL Tools\build-native-libraries.cmd %~2
+
+IF "%~1" == "" (
+  SET r=-r win-x64
 ) ELSE (
-  SET r =-r win-x64
+  SET r=-r %~1-x64
 )
 
-dotnet publish Projects\Server\Server.csproj %c% %r% --self-contained=false -o Distribution
-dotnet publish Projects\Scripts\Scripts.csproj %c% %r% --self-contained=false -o Distribution\Assemblies
+echo dotnet publish %c% %r% --self-contained=false -o Distribution Projects\Server\Server.csproj
+dotnet publish %c% %r% --self-contained=false -o Distribution Projects\Server\Server.csproj
+dotnet publish %c% %r% --self-contained=false -o Distribution\Assemblies Projects\Scripts\Scripts.csproj