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

Merge branch dev with rel-8.2
abpframework · May 21, 2024 · 3e47f9c · 3e47f9c
2 parents c2285bd + bc0f08d
commit 3e47f9c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs
@@ -158,7 +158,14 @@ public async Task<TemplateFile> GetAsync(
             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");