Resolve the RemoveProjectFromSolutionStep "file not found" error in the abp CLI new command.

common.props

@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>10.1.0-preview</Version>
-    <LeptonXVersion>5.1.0-preview</LeptonXVersion>
+    <Version>10.2.0-preview</Version>
+    <LeptonXVersion>5.2.0-preview</LeptonXVersion>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io/</PackageProjectUrl>

docs/en/Community-Articles/2025-09-02-training-campaign/post.md

@@ -1,6 +1,6 @@
 # IMPROVE YOUR ABP SKILLS WITH 33% OFF LIVE TRAININGS!
 
-We have exciting news to share\! As you know, we offer live training packages to help you improve your skills and knowledge of ABP. From September 8th to 19th, we are giving you 33% OFF our live trainings, so you can learn more about the product at a discounted price\!
+We have exciting news to share\! As you know, we offer live training packages to help you improve your skills and knowledge of ABP. For a limited time, we are giving you 33% OFF our live trainings, so you can learn more about the product at a discounted price\!
 
 #### Why Join ABP.IO Training?
 

docs/en/modules/audit-logging-pro.md

@@ -143,7 +143,7 @@ Configure<ExpiredAuditLogDeleterOptions>(options =>
     // The Hangfire Cron expression is different from the Quartz Cron expression, Please refer to the following links:
     // https://www.quartz-scheduler.net/documentation/quartz-3.x/tutorial/crontriggers.html#cron-expressions
     // https://docs.hangfire.io/en/latest/background-methods/performing-recurrent-tasks.html
-    options.ExcelFileCleanupOptions.CronExpression = "0 23 * * *"; // Quartz Cron expression is "0 23 * * * ?"
+    options.ExcelFileCleanupOptions.CronExpression = "0 23 * * *"; // Quartz Cron expression is "0 0 23 * * ?"
 });
 ```
 
@@ -164,7 +164,7 @@ Configure<AuditLogExcelFileOptions>(options =>
     // The Hangfire Cron expression is different from the Quartz Cron expression, Please refer to the following links:
     // https://www.quartz-scheduler.net/documentation/quartz-3.x/tutorial/crontriggers.html#cron-expressions
     // https://docs.hangfire.io/en/latest/background-methods/performing-recurrent-tasks.html
-    options.ExcelFileCleanupOptions.CronExpression = "0 23 * * *"; // Quartz Cron expression is "0 23 * * * ?"
+    options.ExcelFileCleanupOptions.CronExpression = "0 23 * * *"; // Quartz Cron expression is "0 0 23 * * ?"
 });
 ```
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Frozen;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -23,7 +24,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form.DatePicker;
 public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelperService<TTagHelper>
     where TTagHelper : AbpDatePickerBaseTagHelper<TTagHelper>
 {
-    protected readonly Dictionary<Type, Func<object, string>> SupportedInputTypes;
+    protected readonly FrozenDictionary<Type, Func<object, string>> SupportedInputTypes;
 
     protected readonly IJsonSerializer JsonSerializer;
     protected readonly IHtmlGenerator Generator;
@@ -103,7 +104,7 @@ protected AbpDatePickerBaseTagHelperService(IJsonSerializer jsonSerializer, IHtm
                     return string.Empty;
                 }
             }
-        };
+        }.ToFrozenDictionary();
     }
 
     protected virtual T? GetAttribute<T>() where T : Attribute
@@ -136,7 +137,7 @@ public async override Task ProcessAsync(TagHelperContext context, TagHelperOutpu
             ? await ProcessButtonAndGetContentAsync(context, output, "calendar", "open")
             : "";
         var clearButtonContent = TagHelper.ClearButton == true || (!TagHelper.ClearButton.HasValue && TagHelper.AutoUpdateInput != true)
-            ? await ProcessButtonAndGetContentAsync(context, output, "times", "clear", visible:!TagHelper.SingleOpenAndClearButton)
+            ? await ProcessButtonAndGetContentAsync(context, output, "times", "clear", visible: !TagHelper.SingleOpenAndClearButton)
             : "";
 
         var labelContent = await GetLabelAsHtmlAsync(context, output, TagHelperOutput);
@@ -269,7 +270,7 @@ protected TagHelperAttributeList ConvertDatePickerOptionsToAttributeList(IAbpDat
     {
         var attrList = new TagHelperAttributeList();
 
-        if(options == null)
+        if (options == null)
         {
             return attrList;
         }
@@ -401,29 +402,29 @@ protected TagHelperAttributeList ConvertDatePickerOptionsToAttributeList(IAbpDat
             attrList.Add("data-visible-date-format", options.VisibleDateFormat);
         }
 
-        if(!options.InputDateFormat.IsNullOrEmpty())
+        if (!options.InputDateFormat.IsNullOrEmpty())
         {
             attrList.Add("data-input-date-format", options.InputDateFormat);
         }
 
-        if(options.Ranges != null && options.Ranges.Any())
+        if (options.Ranges != null && options.Ranges.Any())
         {
             var ranges = options.Ranges.ToDictionary(r => r.Label, r => r.Dates);
 
             attrList.Add("data-ranges", JsonSerializer.Serialize(ranges));
         }
 
-        if(options.AlwaysShowCalendars != null)
+        if (options.AlwaysShowCalendars != null)
         {
             attrList.Add("data-always-show-calendars", options.AlwaysShowCalendars.ToString()!.ToLowerInvariant());
         }
 
-        if(options.ShowCustomRangeLabel == false)
+        if (options.ShowCustomRangeLabel == false)
         {
             attrList.Add("data-show-custom-range-label", options.ShowCustomRangeLabel.ToString()!.ToLowerInvariant());
         }
 
-        if(options.Options != null)
+        if (options.Options != null)
         {
             attrList.Add("data-options", JsonSerializer.Serialize(options.Options));
         }
@@ -443,7 +444,7 @@ protected TagHelperAttributeList ConvertDatePickerOptionsToAttributeList(IAbpDat
             attrList.Add("id", options.PickerId);
         }
 
-        if(!options.SingleOpenAndClearButton)
+        if (!options.SingleOpenAndClearButton)
         {
             attrList.Add("data-single-open-and-clear-button", options.SingleOpenAndClearButton.ToString().ToLowerInvariant());
         }
@@ -614,7 +615,8 @@ protected virtual async Task<string> GetLabelAsHtmlUsingTagHelperAsync(TagHelper
         {
             return string.Empty;
         }
-        var labelTagHelper = new LabelTagHelper(Generator) {
+        var labelTagHelper = new LabelTagHelper(Generator)
+        {
             ViewContext = TagHelper.ViewContext,
             For = modelExpression
         };
@@ -764,7 +766,8 @@ protected virtual string GetSize(TagHelperContext context, TagHelperOutput outpu
             TagHelper.Size = attribute.Size;
         }
 
-        return TagHelper.Size switch {
+        return TagHelper.Size switch
+        {
             AbpFormControlSize.Small => "form-control-sm",
             AbpFormControlSize.Medium => "form-control-md",
             AbpFormControlSize.Large => "form-control-lg",
@@ -785,14 +788,14 @@ protected virtual Task<string> GetValidationAsHtmlAsync(TagHelperContext context
 
     protected virtual async Task<string> GetValidationAsHtmlByInputAsync(TagHelperContext context,
         TagHelperOutput output,
-        [NotNull]ModelExpression @for)
+        [NotNull] ModelExpression @for)
     {
         var validationMessageTagHelper =
             new ValidationMessageTagHelper(Generator) { For = @for, ViewContext = TagHelper.ViewContext };
 
         var attributeList = new TagHelperAttributeList { { "class", "text-danger" } };
 
-        if(!output.Attributes.TryGetAttribute("name", out var nameAttribute) || nameAttribute == null || nameAttribute.Value == null)
+        if (!output.Attributes.TryGetAttribute("name", out var nameAttribute) || nameAttribute == null || nameAttribute.Value == null)
         {
             if (nameAttribute != null)
             {

framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/ObjectExtending/MvcUiObjectExtensionPropertyInfoExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Frozen;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc;
@@ -8,7 +9,8 @@ namespace Volo.Abp.ObjectExtending;
 
 public static class MvcUiObjectExtensionPropertyInfoExtensions
 {
-    private static readonly HashSet<Type> NumberTypes = new HashSet<Type> {
+    private static readonly FrozenSet<Type> NumberTypes = new HashSet<Type>
+        {
             typeof(int),
             typeof(long),
             typeof(byte),
@@ -33,7 +35,7 @@ public static class MvcUiObjectExtensionPropertyInfoExtensions
             typeof(float?),
             typeof(double?),
             typeof(decimal?)
-        };
+        }.ToFrozenSet();
 
     public static string? GetInputFormatOrNull(this IBasicObjectExtensionPropertyInfo property)
     {

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinder.cs

@@ -2,27 +2,57 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.Extensions.Logging;
 using Volo.Abp.Timing;
 
 namespace Volo.Abp.AspNetCore.Mvc.ModelBinding;
 
 public class AbpDateTimeModelBinder : IModelBinder
 {
+    private readonly ILogger<AbpDateTimeModelBinder> _logger;
     private readonly DateTimeModelBinder _dateTimeModelBinder;
     private readonly IClock _clock;
+    private readonly ICurrentTimezoneProvider _currentTimezoneProvider;
+    private readonly ITimezoneProvider _timezoneProvider;
 
-    public AbpDateTimeModelBinder(IClock clock, DateTimeModelBinder dateTimeModelBinder)
+    public AbpDateTimeModelBinder(
+        ILogger<AbpDateTimeModelBinder> logger,
+        DateTimeModelBinder dateTimeModelBinder,
+        IClock clock,
+        ICurrentTimezoneProvider currentTimezoneProvider,
+        ITimezoneProvider timezoneProvider)
     {
-        _clock = clock;
+        _logger = logger;
         _dateTimeModelBinder = dateTimeModelBinder;
+        _clock = clock;
+        _currentTimezoneProvider = currentTimezoneProvider;
+        _timezoneProvider = timezoneProvider;
     }
 
     public async Task BindModelAsync(ModelBindingContext bindingContext)
     {
         await _dateTimeModelBinder.BindModelAsync(bindingContext);
-        if (bindingContext.Result.IsModelSet && bindingContext.Result.Model is DateTime dateTime)
+
+        if (!bindingContext.Result.IsModelSet || bindingContext.Result.Model is not DateTime dateTime)
         {
-            bindingContext.Result = ModelBindingResult.Success(_clock.Normalize(dateTime));
+            return;
         }
+
+        if (dateTime.Kind == DateTimeKind.Unspecified &&
+            _clock.SupportsMultipleTimezone &&
+            !_currentTimezoneProvider.TimeZone.IsNullOrWhiteSpace())
+        {
+            try
+            {
+                var timezoneInfo = _timezoneProvider.GetTimeZoneInfo(_currentTimezoneProvider.TimeZone);
+                dateTime = new DateTimeOffset(dateTime, timezoneInfo.GetUtcOffset(dateTime)).UtcDateTime;
+            }
+            catch
+            {
+                _logger.LogWarning("Could not convert DateTime with unspecified Kind using timezone '{TimeZone}'.", _currentTimezoneProvider.TimeZone);
+            }
+        }
+
+        bindingContext.Result = ModelBindingResult.Success(_clock.Normalize(dateTime));
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinderProvider.cs

@@ -50,6 +50,6 @@ protected virtual AbpDateTimeModelBinder CreateAbpDateTimeModelBinder(ModelBinde
     {
         const DateTimeStyles supportedStyles = DateTimeStyles.AllowWhiteSpaces | DateTimeStyles.AdjustToUniversal;
         var dateTimeModelBinder = new DateTimeModelBinder(supportedStyles, context.Services.GetRequiredService<ILoggerFactory>());
-        return new AbpDateTimeModelBinder(context.Services.GetRequiredService<IClock>(), dateTimeModelBinder);
+        return ActivatorUtilities.CreateInstance<AbpDateTimeModelBinder>(context.Services, dateTimeModelBinder);
     }
 }

framework/src/Volo.Abp.BackgroundWorkers.TickerQ/Volo/Abp/BackgroundWorkers/TickerQ/AbpBackgroundWorkersTickerQOptions.cs

@@ -5,11 +5,11 @@ namespace Volo.Abp.BackgroundWorkers.TickerQ;
 
 public class AbpBackgroundWorkersTickerQOptions
 {
-    private readonly Dictionary<Type, AbpBackgroundWorkersCronTickerConfiguration> _onfigurations;
+    private readonly Dictionary<Type, AbpBackgroundWorkersCronTickerConfiguration> _configurations;
 
     public AbpBackgroundWorkersTickerQOptions()
     {
-        _onfigurations = new Dictionary<Type, AbpBackgroundWorkersCronTickerConfiguration>();
+        _configurations = new Dictionary<Type, AbpBackgroundWorkersCronTickerConfiguration>();
     }
 
     public void AddConfiguration<TWorker>(AbpBackgroundWorkersCronTickerConfiguration configuration)
@@ -19,7 +19,7 @@ public void AddConfiguration<TWorker>(AbpBackgroundWorkersCronTickerConfiguratio
 
     public void AddConfiguration(Type workerType, AbpBackgroundWorkersCronTickerConfiguration configuration)
     {
-        _onfigurations[workerType] = configuration;
+        _configurations[workerType] = configuration;
     }
 
     public AbpBackgroundWorkersCronTickerConfiguration? GetConfigurationOrNull<TJob>()
@@ -29,6 +29,6 @@ public void AddConfiguration(Type workerType, AbpBackgroundWorkersCronTickerConf
 
     public AbpBackgroundWorkersCronTickerConfiguration? GetConfigurationOrNull(Type workerType)
     {
-        return _onfigurations.GetValueOrDefault(workerType);
+        return _configurations.GetValueOrDefault(workerType);
     }
 }

framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs

@@ -1,5 +1,6 @@
 using Blazorise;
 using System;
+using System.Collections.Frozen;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -11,7 +12,8 @@ namespace Volo.Abp.BlazoriseUI;
 
 public static class BlazoriseUiObjectExtensionPropertyInfoExtensions
 {
-    private static readonly HashSet<Type> NumberTypes = new HashSet<Type> {
+    private static readonly FrozenSet<Type> NumberTypes = new HashSet<Type>
+        {
             typeof(int),
             typeof(long),
             typeof(byte),
@@ -36,13 +38,14 @@ public static class BlazoriseUiObjectExtensionPropertyInfoExtensions
             typeof(float?),
             typeof(double?),
             typeof(decimal?)
-        };
+        }.ToFrozenSet();
 
-    private static readonly HashSet<Type> TextEditSupportedAttributeTypes = new HashSet<Type> {
+    private static readonly FrozenSet<Type> TextEditSupportedAttributeTypes = new HashSet<Type>
+        {
             typeof(EmailAddressAttribute),
             typeof(UrlAttribute),
             typeof(PhoneAttribute)
-        };
+        }.ToFrozenSet();
 
     public static string? GetDateEditInputFormatOrNull(this IBasicObjectExtensionPropertyInfo property)
     {

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

@@ -29,8 +29,7 @@ public RemoveProjectFromSolutionStep(
         {
             _solutionFilePathWithoutFileExtension = solutionFilePathWithoutFileExtension.RemovePostFix(".sln");
         }
-
-        if (solutionFilePathWithoutFileExtension != null && solutionFilePathWithoutFileExtension.EndsWith(".slnx"))
+        else if (solutionFilePathWithoutFileExtension != null && solutionFilePathWithoutFileExtension.EndsWith(".slnx"))
         {
             _solutionFilePathWithoutFileExtension = solutionFilePathWithoutFileExtension.RemovePostFix(".slnx");
         }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs

@@ -3,14 +3,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NuGet.Versioning;
-using Volo.Abp.Cli.Http;
 using Volo.Abp.Cli.LIbs;
 using Volo.Abp.Cli.Utils;
 using Volo.Abp.DependencyInjection;
@@ -28,14 +26,12 @@ public class NpmPackagesUpdater : ITransientDependency
 
     private readonly PackageJsonFileFinder _packageJsonFileFinder;
     private readonly NpmGlobalPackagesChecker _npmGlobalPackagesChecker;
-    private readonly Dictionary<string, string> _fileVersionStorage = new Dictionary<string, string>();
-    private readonly CliHttpClientFactory _cliHttpClientFactory;
+    private readonly Dictionary<string, string> _fileVersionStorage = [];
 
     public NpmPackagesUpdater(
         PackageJsonFileFinder packageJsonFileFinder,
         NpmGlobalPackagesChecker npmGlobalPackagesChecker,
         ICancellationTokenProvider cancellationTokenProvider,
-        CliHttpClientFactory cliHttpClientFactory,
         IInstallLibsService installLibsService,
         ICmdHelper cmdHelper)
     {
@@ -44,7 +40,6 @@ public NpmPackagesUpdater(
         CancellationTokenProvider = cancellationTokenProvider;
         InstallLibsService = installLibsService;
         CmdHelper = cmdHelper;
-        _cliHttpClientFactory = cliHttpClientFactory;
         Logger = NullLogger<NpmPackagesUpdater>.Instance;
     }
 

framework/src/Volo.Abp.Core/Volo/Abp/Logging/DefaultInitLoggerFactory.cs

@@ -5,10 +5,10 @@ namespace Volo.Abp.Logging;
 
 public class DefaultInitLoggerFactory : IInitLoggerFactory
 {
-    private readonly Dictionary<Type, object> _cache = new Dictionary<Type, object>();
+    private readonly Dictionary<Type, object> _cache = [];
 
     public virtual IInitLogger<T> Create<T>()
     {
-        return (IInitLogger<T>)_cache.GetOrAdd(typeof(T), () => new DefaultInitLogger<T>()); ;
+        return (IInitLogger<T>)_cache.GetOrAdd(typeof(T), () => new DefaultInitLogger<T>());
     }
 }