Browse Source

Refactored CLI command running.

pull/1120/head
Halil ibrahim Kalkan 7 years ago
parent
commit
5fea28a1aa
  1. 14
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs
  2. 5
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs
  3. 19
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs
  4. 2
      framework/src/Volo.Abp.Core/Volo/Abp/Check.cs

14
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs

@ -1,8 +1,8 @@
using System.Diagnostics;
using System.IO;
using System.IO;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Volo.Abp.Cli.Utils;
using Volo.Abp.DependencyInjection;
using Volo.Abp.IO;
@ -29,13 +29,11 @@ namespace Volo.Abp.Cli.ProjectModification
using (DirectoryHelper.ChangeCurrentDirectory(directory))
{
Logger.LogInformation("yarn add " + npmPackage.Name + "... " + Directory.GetCurrentDirectory());
var procStartInfo = new ProcessStartInfo("cmd.exe", "/C yarn add " + npmPackage.Name);
Process.Start(procStartInfo).WaitForExit();
Logger.LogInformation("yarn add " + npmPackage.Name);
CmdHelper.RunCmd("yarn add " + npmPackage.Name);
Logger.LogInformation("gulp... " + Directory.GetCurrentDirectory());
procStartInfo = new ProcessStartInfo("cmd.exe", "/C gulp");
Process.Start(procStartInfo).WaitForExit();
Logger.LogInformation("gulp");
CmdHelper.RunCmd("gulp");
}
return Task.CompletedTask;

5
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net;
@ -8,6 +7,7 @@ using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Volo.Abp.Cli.Utils;
using Volo.Abp.DependencyInjection;
using Volo.Abp.IO;
using Volo.Abp.Json;
@ -50,8 +50,7 @@ namespace Volo.Abp.Cli.ProjectModification
{
Logger.LogInformation($"Installing '{package.Name}' package to the project '{Path.GetFileNameWithoutExtension(projectFile)}'...");
var procStartInfo = new ProcessStartInfo("dotnet", "add package " + package.Name);
Process.Start(procStartInfo).WaitForExit();
CmdHelper.Run("dotnet", "add package " + package.Name);
var moduleFiles = ModuleClassFinder.Find(projectFile);
if (moduleFiles.Count == 0)

19
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs

@ -0,0 +1,19 @@
using System.Diagnostics;
namespace Volo.Abp.Cli.Utils
{
public static class CmdHelper
{
public static void Run(string file, string arguments)
{
var procStartInfo = new ProcessStartInfo(file, arguments);
Process.Start(procStartInfo).WaitForExit();
}
public static void RunCmd(string command)
{
var procStartInfo = new ProcessStartInfo("cmd.exe", "/C " + command);
Process.Start(procStartInfo).WaitForExit();
}
}
}

2
framework/src/Volo.Abp.Core/Volo/Abp/Check.cs

@ -122,7 +122,7 @@ namespace Volo.Abp
}
public static string Length(
string value,
[CanBeNull] string value,
[InvokerParameterName] [NotNull] string parameterName,
int maxLength,
int minLength = 0)

Loading…
Cancel
Save