Merge pull request #11163 from abpframework/auto-merge/rel-5-0/758

Merge branch dev with rel-5.0
pull/11169/head^2
maliming 4 years ago committed by GitHub
commit ccd6991b13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -88,7 +88,7 @@ public class NpmPackagesUpdater : ITransientDependency
RunYarn(fileDirectory); RunYarn(fileDirectory);
} }
if (!IsAngularProject(fileDirectory)) if (!IsAngularProject(fileDirectory) && GulpFileExistAsync(fileDirectory))
{ {
Thread.Sleep(1000); Thread.Sleep(1000);
RunGulp(fileDirectory); RunGulp(fileDirectory);
@ -108,6 +108,11 @@ public class NpmPackagesUpdater : ITransientDependency
return await Task.FromResult(File.Exists(Path.Combine(directoryName, ".npmrc"))); return await Task.FromResult(File.Exists(Path.Combine(directoryName, ".npmrc")));
} }
private static bool GulpFileExistAsync(string directoryName)
{
return File.Exists(Path.Combine(directoryName, "gulpfile.js"));
}
private async Task CreateNpmrcFileAsync(string directoryName) private async Task CreateNpmrcFileAsync(string directoryName)
{ {
var fileName = Path.Combine(directoryName, ".npmrc"); var fileName = Path.Combine(directoryName, ".npmrc");

Loading…
Cancel
Save