Merge branch 'dev'

common.props

@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
- <Version>8.2.0</Version>
+ <Version>8.3.0</Version>
  <NoWarn>$(NoWarn);CS1591</NoWarn>
  <PackageIcon>abp_nupkg.png</PackageIcon>
  <PackageIconUrl>http://www.aspnetboilerplate.com/images/abp_nupkg.png</PackageIconUrl>

doc/WebSite/Notification-System.md

@@ -56,7 +56,10 @@ persistence.
 ### Subscribe to Notifications
 
 The **INotificationSubscriptionManager** provides an API to **subscribe** to
-notifications. Examples:
+notifications. A User can subscribe to a specific notification, to a notification related to a specific entity. 
+A user can also select specific notifiers when subscribing to a notification. In this way, user will not be notified by other notifiers. Full type name of the notifier must be provided when selecting a target Notifier. It can be set using `new EmailRealTimeNotifier().GetType().FullName` and accepts comma separated multiple values. 
+
+Examples:
 
  public class MyService : ITransientDependency
  {

global.json

@@ -1,5 +1,6 @@
 {
  "sdk": {
- "version": "7.0.100"
+ "version": "7.0.100",
+ "rollForward": "latestFeature"
  }
 }

src/Abp.AspNetCore/Abp.AspNetCore.csproj

@@ -34,7 +34,7 @@
 
  <ItemGroup>
  <PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
- <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.4.0" />
+ <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="4.0.0" />
  <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
  <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.5" />
  <PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />

src/Abp.HtmlSanitizer/HtmlSanitizer/HtmlSanitizerHelper.cs

@@ -103,6 +103,11 @@ public void SanitizeContext(ActionExecutingContext context)
 
  private void SanitizeObject(object item)
  {
+ if (item is null)
+ {
+ return;
+ }
+
  var classType = item.GetType();
 
  if (classType.GetTypeInfo().IsDefined(typeof(DisableHtmlSanitizerAttribute), true))
@@ -130,12 +135,10 @@ private void SanitizeObject(object item)
 
  break;
  }
-
  case DateTime _:
  {
  break;
  }
-
  default:
  {
  var properties = classType.GetProperties();

src/Abp.Web/Abp.Web.csproj

@@ -29,7 +29,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Castle.Facilities.AspNet.SystemWeb" Version="5.1.2" />
+ <PackageReference Include="Castle.Facilities.AspNet.SystemWeb" Version="6.0.0" />
  <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
  <PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
  </ItemGroup>

src/Abp.Zero.Common/Localization/MultiTenantLocalizationSource.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using Abp.Collections.Extensions;
 using Abp.Configuration.Startup;
 using Abp.Dependency;
 using Abp.Extensions;
 using Abp.Localization.Dictionaries;
-using Castle.Core.Internal;
 using Castle.Core.Logging;
 
 namespace Abp.Localization