Merge pull request #10760 from abpframework/auto-merge/rel-5-0/656

Merge branch dev with rel-5.0

docs/en/Entity-Framework-Core-Oracle-Devart.md

@@ -4,6 +4,8 @@ This document explains how to switch to the **Oracle** database provider for **[
 
 > This document uses a paid library of [Devart](https://www.devart.com/dotconnect/oracle/) company, See [this document](Entity-Framework-Core-Oracle.md) for other options.
 
+> Before switching your provider, please ensure your Oracle version is **v12.2+**. In the earlier versions of Oracle, there were long identifier limitations that prevents creating a database table, column or index longer than 30 bytes. With [v12.2](https://docs.oracle.com/en/database/oracle/oracle-database/12.2/newft/new-features.html#GUID-64283AD6-0939-47B0-856E-5E9255D7246B) "The maximum length of identifiers is increased to 128 bytes". **v12.2** and later versions, you can use the database tables, columns and indexes provided by ABP without any problems. 
+
 ## Replace the Volo.Abp.EntityFrameworkCore.SqlServer Package
 
 `.EntityFrameworkCore` project in the solution depends on the [Volo.Abp.EntityFrameworkCore.SqlServer](https://www.nuget.org/packages/Volo.Abp.EntityFrameworkCore.SqlServer) NuGet package. Remove this package and add the same version of the [Volo.Abp.EntityFrameworkCore.Oracle.Devart](https://www.nuget.org/packages/Volo.Abp.EntityFrameworkCore.Oracle.Devart) package.

docs/en/Entity-Framework-Core-Oracle-Official.md

@@ -2,6 +2,8 @@
 
 This document explains how to switch to the **Oracle** database provider for **[the application startup template](Startup-Templates/Application.md)** which comes with SQL Server provider pre-configured.
 
+> Before switching your provider, please ensure your Oracle version is **v12.2+**. In the earlier versions of Oracle, there were long identifier limitations that prevents creating a database table, column or index longer than 30 bytes. With [v12.2](https://docs.oracle.com/en/database/oracle/oracle-database/12.2/newft/new-features.html#GUID-64283AD6-0939-47B0-856E-5E9255D7246B) "The maximum length of identifiers is increased to 128 bytes". **v12.2** and later versions, you can use the database tables, columns and indexes provided by ABP without any problems. 
+
 ## Replace the Volo.Abp.EntityFrameworkCore.SqlServer Package
 
 `.EntityFrameworkCore` project in the solution depends on the [Volo.Abp.EntityFrameworkCore.SqlServer](https://www.nuget.org/packages/Volo.Abp.EntityFrameworkCore.SqlServer) NuGet package. Remove this package and add the same version of the [Volo.Abp.EntityFrameworkCore.Oracle](https://www.nuget.org/packages/Volo.Abp.EntityFrameworkCore.Oracle) package.

docs/en/Samples/eShopOnAbp/Index.md

@@ -0,0 +1,3 @@
+# eShopOnAbp
+
+This document is in progress. Please see the source code for now: https://github.com/abpframework/eShopOnAbp

framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpHasExtraPropertiesJsonConverter.cs

@@ -27,12 +27,13 @@ public class AbpHasExtraPropertiesJsonConverter<T> : JsonConverter<T>
         var rootElement = JsonDocument.ParseValue(ref reader).RootElement;
         if (rootElement.ValueKind == JsonValueKind.Object)
         {
-            var extensibleObject = JsonSerializer.Deserialize<T>(rootElement.GetRawText(), newOptions);
+            var extensibleObject = rootElement.Deserialize<T>(newOptions);
 
             var extraPropertiesJsonProperty = rootElement.EnumerateObject().FirstOrDefault(x => x.Name.Equals(nameof(IHasExtraProperties.ExtraProperties), StringComparison.OrdinalIgnoreCase));
+            
             if (extraPropertiesJsonProperty.Value.ValueKind == JsonValueKind.Object)
             {
-                var extraPropertyDictionary = JsonSerializer.Deserialize(extraPropertiesJsonProperty.Value.GetRawText(), typeof(ExtraPropertyDictionary), newOptions);
+                var extraPropertyDictionary = extraPropertiesJsonProperty.Value.Deserialize(typeof(ExtraPropertyDictionary), newOptions);
                 ObjectHelper.TrySetProperty(extensibleObject, x => x.ExtraProperties, () => extraPropertyDictionary);
             }
 

framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/JsonConverters/EntityJsonConverter.cs

@@ -13,12 +13,12 @@ public class EntityJsonConverter<TEntity, TKey> : JsonConverter<TEntity>
         var jsonDocument = JsonDocument.ParseValue(ref reader);
         if (jsonDocument.RootElement.ValueKind == JsonValueKind.Object)
         {
-            var entity = (TEntity)JsonSerializer.Deserialize(jsonDocument.RootElement.GetRawText(), typeToConvert);
+            var entity = (TEntity)jsonDocument.RootElement.Deserialize(typeToConvert);
 
             var idJsonElement = jsonDocument.RootElement.GetProperty(nameof(Entity<object>.Id));
             if (idJsonElement.ValueKind != JsonValueKind.Undefined)
             {
-                var id = JsonSerializer.Deserialize<TKey>(idJsonElement.GetRawText());
+                var id = idJsonElement.Deserialize<TKey>();
                 if (id != null)
                 {
                     EntityHelper.TrySetId(entity, () => id);

modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css

@@ -286,7 +286,7 @@ div.vs-blog {
       padding: 30px;
       border-bottom: 1px solid #f1f1f1; }
       div.vs-blog .comment-area > .media .media {
-        padding: 20px 0px 0px; }
+        padding: 20px 0px 0px 20px; }
     div.vs-blog .comment-area .comment-buttons {
       padding: 4px 0;
       font-size: .96em; }

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/JsonConverters/SelectionStringValueItemSourceJsonConverter.cs

@@ -19,7 +19,7 @@ public class SelectionStringValueItemSourceJsonConverter : JsonConverter<ISelect
             var newOptions = JsonSerializerOptionsHelper.Create(options, this);
 
             var selectionStringValueItem =
-                JsonSerializer.Deserialize<LocalizableSelectionStringValueItem[]>(itemsJsonProperty.Value.GetRawText(), newOptions) ??
+                itemsJsonProperty.Value.Deserialize<LocalizableSelectionStringValueItem[]>(newOptions) ??
                 Array.Empty<LocalizableSelectionStringValueItem>();
 
             return new StaticSelectionStringValueItemSource(selectionStringValueItem.As<ISelectionStringValueItem[]>());
@@ -28,6 +28,7 @@ public class SelectionStringValueItemSourceJsonConverter : JsonConverter<ISelect
         throw new JsonException($"Can't to get the {nameof(ISelectionStringValueItemSource.Items)} property of {nameof(ISelectionStringValueItemSource)}!");
     }
 
+
     public override void Write(Utf8JsonWriter writer, ISelectionStringValueItemSource value, JsonSerializerOptions options)
     {
         var newOptions = JsonSerializerOptionsHelper.Create(options, this);

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/JsonConverters/StringValueTypeJsonConverter.cs

@@ -22,9 +22,9 @@ public class StringValueTypeJsonConverter : JsonConverter<IStringValueType>
 
             return name switch
             {
-                "SelectionStringValueType" => JsonSerializer.Deserialize<SelectionStringValueType>(rootElement.GetRawText(), newOptions),
-                "FreeTextStringValueType" => JsonSerializer.Deserialize<FreeTextStringValueType>(rootElement.GetRawText(), newOptions),
-                "ToggleStringValueType" => JsonSerializer.Deserialize<ToggleStringValueType>(rootElement.GetRawText(), newOptions),
+                "SelectionStringValueType" =>  rootElement.Deserialize<SelectionStringValueType>(newOptions),
+                "FreeTextStringValueType" => rootElement.Deserialize<FreeTextStringValueType>(newOptions),
+                "ToggleStringValueType" => rootElement.Deserialize<ToggleStringValueType>(newOptions),
                 _ => throw new ArgumentException($"{nameof(IStringValueType)} named {name} was not found!")
             };
         }

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/JsonConverters/ValueValidatorJsonConverter.cs

@@ -23,7 +23,7 @@ public class ValueValidatorJsonConverter : JsonConverter<IValueValidator>
             if (propertiesJsonProperty.Value.ValueKind == JsonValueKind.Object)
             {
                 var newOptions = JsonSerializerOptionsHelper.Create(options, this, new ObjectToInferredTypesConverter());
-                var properties = JsonSerializer.Deserialize<IDictionary<string, object>>(propertiesJsonProperty.Value.GetRawText(), newOptions);
+                var properties = propertiesJsonProperty.Value.Deserialize<IDictionary<string, object>>(newOptions);
                 if (properties != null && properties.Any())
                 {
                     foreach (var property in properties)