Merge pull request #20063 from abpframework/auto-merge/rel-8-1/2780

Merge branch rel-8.2 with rel-8.1

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs

@@ -84,7 +84,7 @@ public class UpdateCommand : IConsoleCommand, ITransientDependency
             return;
         }
 
-        var project = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.csproj").FirstOrDefault();
+        var project = Directory.GetFiles(directory, "*.csproj").FirstOrDefault();
 
         if (project != null)
         {

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs

@@ -627,11 +627,16 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
 
     private static void ChangeThemeToBasicForMvcProjects(ProjectBuildContext context, string defaultThemeName)
     {
-        var projectNames = new[]
+        var projectNames = new List<string>
         {
-            ".Web", ".HttpApi.Host", ".AuthServer", ".Web.Public", ".Web.Public.Host",
+            ".Web", ".AuthServer", ".Web.Public", ".Web.Public.Host",
             "" //for app-nolayers-mvc
         };
+        
+        if(!context.Symbols.Contains("tiered"))
+        {
+            projectNames.Add(".HttpApi.Host");
+        }
 
         foreach (var projectName in projectNames)
         {

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Version/PackageVersionCheckerService.cs

@@ -62,7 +62,7 @@ public class PackageVersionCheckerService : ITransientDependency
 
     public async Task<LatestVersionInfo> GetLatestVersionOrNullAsync(string packageId, bool includeNightly = false, bool includeReleaseCandidates = false)
     {
-        if (!includeNightly && !includeReleaseCandidates && !packageId.Contains("LeptonX"))
+        if (!includeNightly && !includeReleaseCandidates && !packageId.Contains("LeptonX") && !packageId.StartsWith("Volo.Abp.Studio."))
         {
             return await GetLatestStableVersionFromGithubAsync();
         }