add prerelease option for 'cm pack' command (#47)

* add prerelease option for 'cm pack' command

* set error level on 'cm pack' error

Author: trurl123

Commands/PackCommand.cs

@@ -1,3 +1,4 @@
+using System;
 using Common;
 using Common.YamlParsers;
 using System.IO;
@@ -10,6 +11,7 @@ public class PackCommand : Command
         private string project;
         private string configuration;
         private BuildSettings buildSettings;
+        private bool preRelease = false;
 
         public PackCommand() : base(new CommandSettings
         {
@@ -35,7 +37,7 @@ protected override int Execute()
             var csproj = new ProjectFile(projectPath);
             var deps = new DepsParser(modulePath).Get(configuration);
             ConsoleWriter.WriteInfo("patching csproj");
-            var patchedDocument = csproj.CreateCsProjWithNugetReferences(deps.Deps, modulePath);
+            var patchedDocument = csproj.CreateCsProjWithNugetReferences(deps.Deps, preRelease);
             var backupFileName = Path.Combine(Path.GetDirectoryName(projectPath) ?? "", "backup." + Path.GetFileName(projectPath));
             if (File.Exists(backupFileName))
                 File.Delete(backupFileName);
@@ -46,7 +48,8 @@ protected override int Execute()
                 var moduleBuilder = new ModuleBuilder(Log, buildSettings);
                 moduleBuilder.Init();
                 ConsoleWriter.WriteInfo("start pack");
-                moduleBuilder.DotnetPack(modulePath, projectPath, buildData?.Configuration ?? "Release");
+                if (!moduleBuilder.DotnetPack(modulePath, projectPath, buildData?.Configuration ?? "Release"))
+                    return -1;
             }
             finally 
             {
@@ -64,6 +67,8 @@ protected override void ParseArgs(string[] args)
             //dep = new Dep((string)parsedArgs["module"]);
             if (parsedArgs["configuration"] != null)
                 configuration = (string)parsedArgs["configuration"];
+            preRelease = (bool)parsedArgs["prerelease"];
+            
             buildSettings = new BuildSettings
             {
                 ShowAllWarnings = (bool)parsedArgs["warnings"],

Common/ArgumentParser.cs

@@ -99,6 +99,7 @@ public static Dictionary<string, object> ParsePack(string[] args)
                 {"obsolete", false},
                 {"verbose", false},
                 {"progress", false},
+                {"prerelease", false}
             };
             var parser = new OptionSet
             {
@@ -107,6 +108,7 @@ public static Dictionary<string, object> ParsePack(string[] args)
                 {"W", f => parsedArguments["obsolete"] = true},
                 {"v|verbose", v => parsedArguments["verbose"] = true},
                 {"p|progress", p => parsedArguments["progress"] = true},
+                {"prerelease", p => parsedArguments["prerelease"] = true},
             };
             args = parser.Parse(args).ToArray();
 

Common/ModuleBuilder.cs

@@ -25,15 +25,15 @@ public void Init()
             VsDevHelper.ReplaceVariablesToVs();
         }
 
-        public void DotnetPack(string directory, string projectFileName, string buildConfiguration)
+        public bool DotnetPack(string directory, string projectFileName, string buildConfiguration)
         {
             var runner = PrepareShellRunner();
             var exitCode = runner.RunInDirectory(directory, $"dotnet pack \\\"{projectFileName}\\\" -c {buildConfiguration}");
             ConsoleWriter.Write(runner.Output);
-            if (exitCode != 0)
-            {
-                log.Warn($"Failed to build nuget package {projectFileName}. \nOutput: \n{runner.Output} \nError: \n{runner.Errors} \nExit code: {exitCode}");
-            }
+            if (exitCode == 0)
+                return true;
+            log.Warn($"Failed to build nuget package {projectFileName}. \nOutput: \n{runner.Output} \nError: \n{runner.Errors} \nExit code: {exitCode}");
+            return false;
         }
 
         public void NugetRestore(Dep dep, string nugetRunCommand)

Common/NuGetHelper.cs

@@ -8,12 +8,12 @@ public static class NuGetHelper
     {
         private static readonly ILog Log = LogManager.GetLogger(typeof(NuGetHelper));
 
-        public static string GetNugetPackageVersion(string packageName, string nugetRunCommand)
+        public static string GetNugetPackageVersion(string packageName, string nugetRunCommand, bool preRelease)
         {
             var shellRunner = new ShellRunner();
             ConsoleWriter.WriteProgressWithoutSave("Get package verion for " + packageName);
 
-            shellRunner.Run($"{nugetRunCommand} list {packageName} -NonInteractive");
+            shellRunner.Run($"{nugetRunCommand} list {packageName} -NonInteractive" + (preRelease ? " -PreRelease" : ""));
             foreach (var line in shellRunner.Output.Split(new[] { "\n" }, StringSplitOptions.RemoveEmptyEntries))
             {
                 var lineTokens = line.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);

Common/ProjectFile.cs

@@ -161,7 +161,7 @@ public void ReplaceRef(string refName, string refPath)
             }
         }
 
-        public XmlDocument CreateCsProjWithNugetReferences(List<Dep> deps, string moduleDirectory)
+        public XmlDocument CreateCsProjWithNugetReferences(List<Dep> deps, bool preRelease)
         {
             if (!newFormat)
                 throw new Exception("Only new csproj format supported");
@@ -192,7 +192,7 @@ public XmlDocument CreateCsProjWithNugetReferences(List<Dep> deps, string module
                 var includeAttr = patchedProjDoc.CreateAttribute("Include");
                 includeAttr.Value = dep.Name;
                 refElement.Attributes.Append(includeAttr);
-                var packageVersion = NuGetHelper.GetNugetPackageVersion(dep.Name, nugetRunCommand);
+                var packageVersion = NuGetHelper.GetNugetPackageVersion(dep.Name, nugetRunCommand, preRelease);
                 if (!string.IsNullOrEmpty(packageVersion))
                 {
                     var versionAttr = patchedProjDoc.CreateAttribute("Version");

README-commands.md

@@ -334,6 +334,7 @@
 
         -p/--progress           - show msbuild output in one line
 
+        -prerelease             - load prerelease versions of packages
 
 ### cm status
 

Tests/ParsersTests/TestProjectFile.cs

@@ -290,7 +290,7 @@ public void TestMakeCsProjWithNugetReferences()
             ";
 
             var proj = CreateProjectFile(content);
-            var xmlDocument = proj.CreateCsProjWithNugetReferences(new List<Dep> { new Dep("vostok.core") }, ".");
+            var xmlDocument = proj.CreateCsProjWithNugetReferences(new List<Dep> { new Dep("vostok.core") }, true);
 
             Assert.Null(xmlDocument.SelectSingleNode("//Reference[@Include='Vostok.Core']"));
             Assert.NotNull(xmlDocument.SelectSingleNode("//PackageReference[@Include='vostok.core']"));