Browse Source

Merge pull request #19885 from abpframework/auto-merge/rel-8-2/2737

Merge branch dev with rel-8.2
pull/19910/head
maliming 2 years ago
committed by GitHub
parent
commit
3e47f9ced4
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 9
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs

9
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs

@ -158,7 +158,14 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency
throw new Exception("There is no version found with given version: " + version);
}
var nugetVersion = version;
var nugetVersion = await GetTemplateNugetVersionAsync(name, type, version) ?? version;
if (!string.IsNullOrWhiteSpace(templateSource) && !IsNetworkSource(templateSource))
{
Logger.LogInformation("Using local " + type + ": " + name + ", version: " + version);
return new TemplateFile(File.ReadAllBytes(Path.Combine(templateSource, name + "-" + version + ".zip")),
version, latestVersion, nugetVersion);
}
var localCacheFile = Path.Combine(CliPaths.TemplateCache, name.Replace("/", ".") + "-" + version + ".zip");

Loading…
Cancel
Save