-
-
- @if (Model.Post.Writer.Name != null && Model.Post.Writer.Surname != null)
- {
-
@if (Model.LatestPosts.Count > 1)
@@ -185,23 +190,24 @@
-
- @if (Model.Post.Writer.Name != null && Model.Post.Writer.Surname != null)
- {
- @Model.Post.Writer.Name @Model.Post.Writer.Surname
- }
- else
+ @if (Model.Post.Writer != null)
+ {
+
+
+
+ @if (Model.Post.Writer.Name != null && Model.Post.Writer.Surname != null)
+ {
+ @Model.Post.Writer.Name @Model.Post.Writer.Surname
+ }
+ else
+ {
+ @Model.Post.Writer.UserName
+ }
+
+
+
+ @if (Model.Post.Writer.JobTitle != null)
{
- @Model.Post.Writer.UserName
+ @Model.Post.Writer.JobTitle
}
-
-
-
- @if (Model.Post.Writer.JobTitle != null)
- {
- @Model.Post.Writer.JobTitle
- }
-
- @if (CurrentUser.UserName == Model.Post.Writer.UserName)
+
+ }
+
+ @if (CurrentUser.Id.HasValue && CurrentUser.Id.Value == Model.Post.Writer?.Id)
{
- @L["EditProfile"]
+ @L["EditProfile"]
}
@Model.Post.Writer.Name @Model.Post.Writer.Surname
+ } + else + { +@Model.Post.Writer.UserName
+ } + +@Model.Post.Writer.UserName
+@Model.Post.Writer.JobTitle
} - - -
- @if (Model.Post.Writer.JobTitle != null)
- {
-
- @if (CurrentUser.UserName == Model.Post.Writer.UserName)
+ @Model.Post.Writer.JobTitle
- } -
-
-
- @if (post.Writer != null)
- {
+ @if (post.Writer != null)
+ {
+
-
+ }
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs
index 54d1a4e71d..114bdbb641 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs
@@ -86,7 +86,11 @@ namespace Volo.Blogging.Pages.Blog.Posts
{
Blog = await _blogAppService.GetByShortNameAsync(BlogShortName);
Post = await _postAppService.GetForReadingAsync(new GetPostInput { BlogId = Blog.Id, Url = PostUrl });
- PostsList = await _postAppService.GetListByUserIdAsync(Post.Writer.Id);
+
+ PostsList = Post.Writer != null
+ ? await _postAppService.GetListByUserIdAsync(Post.Writer.Id)
+ : new List();
+
LatestPosts = await _postAppService.GetLatestBlogPostsAsync(Blog.Id, 5);
CommentsWithReplies = await _commentAppService.GetHierarchicalListOfPostAsync(Post.Id);
CountComments();
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureDefinitionRecord.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureDefinitionRecord.cs
index 0c181ab632..20ba414b08 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureDefinitionRecord.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureDefinitionRecord.cs
@@ -7,13 +7,6 @@ namespace Volo.Abp.FeatureManagement;
public class FeatureDefinitionRecord : BasicAggregateRoot, IHasExtraProperties
{
- /* Ignoring Id because it is different whenever we create an instance of
- * this class, and we are using Json Serialize, than Hash to understand
- * if feature definitions have changed (in StaticFeatureSaver.CalculateHash()).
- */
- [JsonIgnore] //TODO: TODO: Use JSON modifier to ignore this property
- public override Guid Id { get; protected set; }
-
public string GroupName { get; set; }
public string Name { get; set; }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureGroupDefinitionRecord.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureGroupDefinitionRecord.cs
index 677f055f3e..61c7e60473 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureGroupDefinitionRecord.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureGroupDefinitionRecord.cs
@@ -1,5 +1,4 @@
using System;
-using System.Text.Json.Serialization;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;
@@ -7,13 +6,6 @@ namespace Volo.Abp.FeatureManagement;
public class FeatureGroupDefinitionRecord : BasicAggregateRoot, IHasExtraProperties
{
- /* Ignoring Id because it is different whenever we create an instance of
- * this class, and we are using Json Serialize, than Hash to understand
- * if feature definitions have changed (in StaticFeatureSaver.CalculateHash()).
- */
- [JsonIgnore] //TODO: TODO: Use JSON modifier to ignore this property
- public override Guid Id { get; protected set; }
-
public string Name { get; set; }
public string DisplayName { get; set; }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/StaticFeatureSaver.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/StaticFeatureSaver.cs
index 993e3ed32e..664594952b 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/StaticFeatureSaver.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/StaticFeatureSaver.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
using System.Threading.Tasks;
using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.Options;
@@ -10,6 +11,7 @@ using Volo.Abp.Caching;
using Volo.Abp.DependencyInjection;
using Volo.Abp.DistributedLocking;
using Volo.Abp.Features;
+using Volo.Abp.Json.SystemTextJson.Modifiers;
using Volo.Abp.Threading;
using Volo.Abp.Uow;
@@ -297,13 +299,25 @@ public class StaticFeatureSaver : IStaticFeatureSaver, ITransientDependency
IEnumerable deletedFeatureGroups,
IEnumerable deletedFeatures)
{
+ var jsonSerializerOptions = new JsonSerializerOptions
+ {
+ TypeInfoResolver = new DefaultJsonTypeInfoResolver
+ {
+ Modifiers =
+ {
+ new AbpIgnorePropertiesModifiers().CreateModifyAction(x => x.Id),
+ new AbpIgnorePropertiesModifiers().CreateModifyAction(x => x.Id)
+ }
+ }
+ };
+
var stringBuilder = new StringBuilder();
stringBuilder.Append("FeatureGroupRecords:");
- stringBuilder.AppendLine(JsonSerializer.Serialize(featureGroupRecords));
+ stringBuilder.AppendLine(JsonSerializer.Serialize(featureGroupRecords, jsonSerializerOptions));
stringBuilder.Append("FeatureRecords:");
- stringBuilder.AppendLine(JsonSerializer.Serialize(featureRecords));
+ stringBuilder.AppendLine(JsonSerializer.Serialize(featureRecords, jsonSerializerOptions));
stringBuilder.Append("DeletedFeatureGroups:");
stringBuilder.AppendLine(deletedFeatureGroups.JoinAsString(","));
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/CalculateHash_Tests.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/CalculateHash_Tests.cs
new file mode 100644
index 0000000000..048d9f465e
--- /dev/null
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/CalculateHash_Tests.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+using Shouldly;
+using Volo.Abp.Json.SystemTextJson.Modifiers;
+using Xunit;
+
+namespace Volo.Abp.FeatureManagement;
+
+public class CalculateHash_Tests : FeatureManagementDomainTestBase
+{
+ [Fact]
+ public void Test()
+ {
+ var jsonSerializerOptions = new JsonSerializerOptions
+ {
+ TypeInfoResolver = new DefaultJsonTypeInfoResolver
+ {
+ Modifiers =
+ {
+ new AbpIgnorePropertiesModifiers().CreateModifyAction(x => x.Id),
+ new AbpIgnorePropertiesModifiers().CreateModifyAction(x => x.Id)
+ }
+ }
+ };
+
+ var id = Guid.NewGuid();
+ var json = JsonSerializer.Serialize(new List()
+ {
+ new FeatureGroupDefinitionRecord(id, "Test", "Test")
+ },
+ jsonSerializerOptions);
+
+ json.ShouldNotContain("\"Id\"");
+ json.ShouldNotContain(id.ToString("D"));
+
+ json = JsonSerializer.Serialize(new List()
+ {
+ new FeatureDefinitionRecord(id, "Test", "Test", "Test", "Test", "Test", "Test", true, true,"Test", "Test")
+ },
+ jsonSerializerOptions);
+
+ json.ShouldNotContain("\"Id\"");
+ json.ShouldNotContain(id.ToString("D"));
+ }
+}
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/AuthorizeController.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/AuthorizeController.cs
index 961252aae7..f4d7008ef5 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/AuthorizeController.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/AuthorizeController.cs
@@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Primitives;
using OpenIddict.Abstractions;
using OpenIddict.Server.AspNetCore;
+using Volo.Abp.AspNetCore.Security;
using Volo.Abp.OpenIddict.ViewModels.Authorization;
namespace Volo.Abp.OpenIddict.Controllers;
@@ -20,6 +21,7 @@ public class AuthorizeController : AbpOpenIdDictControllerBase
{
[HttpGet, HttpPost]
[IgnoreAntiforgeryToken]
+ [IgnoreAbpSecurityHeader]
public virtual async Task HandleAsync()
{
var request = await GetOpenIddictServerRequestAsync(HttpContext);
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDefinitionRecord.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDefinitionRecord.cs
index 2ba9ffa26a..7473eb2589 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDefinitionRecord.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDefinitionRecord.cs
@@ -1,5 +1,4 @@
using System;
-using System.Text.Json.Serialization;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;
using Volo.Abp.MultiTenancy;
@@ -8,25 +7,18 @@ namespace Volo.Abp.PermissionManagement;
public class PermissionDefinitionRecord : BasicAggregateRoot, IHasExtraProperties
{
- /* Ignoring Id because it is different whenever we create an instance of
- * this class, and we are using Json Serialize, than Hash to understand
- * if permission definitions have changed (in StaticPermissionSaver.CalculateHash()).
- */
- [JsonIgnore]
- public override Guid Id { get; protected set; }
-
public string GroupName { get; set; }
-
+
public string Name { get; set; }
-
+
public string ParentName { get; set; }
-
+
public string DisplayName { get; set; }
public bool IsEnabled { get; set; }
-
+
public MultiTenancySides MultiTenancySide { get; set; }
-
+
///
/// Comma separated list of provider names.
///
@@ -36,7 +28,7 @@ public class PermissionDefinitionRecord : BasicAggregateRoot, IHasExtraPro
/// Serialized string to store info about the state checkers.
///
public string StateCheckers { get; set; }
-
+
public ExtraPropertyDictionary ExtraProperties { get; protected set; }
public PermissionDefinitionRecord()
@@ -44,7 +36,7 @@ public class PermissionDefinitionRecord : BasicAggregateRoot, IHasExtraPro
ExtraProperties = new ExtraPropertyDictionary();
this.SetDefaultsForExtraProperties();
}
-
+
public PermissionDefinitionRecord(
Guid id,
string groupName,
@@ -76,37 +68,37 @@ public class PermissionDefinitionRecord : BasicAggregateRoot, IHasExtraPro
{
return false;
}
-
+
if (GroupName != otherRecord.GroupName)
{
return false;
}
-
+
if (ParentName != otherRecord.ParentName)
{
return false;
}
-
+
if (DisplayName != otherRecord.DisplayName)
{
return false;
}
-
+
if (IsEnabled != otherRecord.IsEnabled)
{
return false;
}
-
+
if (MultiTenancySide != otherRecord.MultiTenancySide)
{
return false;
}
-
+
if (Providers != otherRecord.Providers)
{
return false;
}
-
+
if (StateCheckers != otherRecord.StateCheckers)
{
return false;
@@ -126,37 +118,37 @@ public class PermissionDefinitionRecord : BasicAggregateRoot, IHasExtraPro
{
Name = otherRecord.Name;
}
-
+
if (GroupName != otherRecord.GroupName)
{
GroupName = otherRecord.GroupName;
}
-
+
if (ParentName != otherRecord.ParentName)
{
ParentName = otherRecord.ParentName;
}
-
+
if (DisplayName != otherRecord.DisplayName)
{
DisplayName = otherRecord.DisplayName;
}
-
+
if (IsEnabled != otherRecord.IsEnabled)
{
IsEnabled = otherRecord.IsEnabled;
}
-
+
if (MultiTenancySide != otherRecord.MultiTenancySide)
{
MultiTenancySide = otherRecord.MultiTenancySide;
}
-
+
if (Providers != otherRecord.Providers)
{
Providers = otherRecord.Providers;
}
-
+
if (StateCheckers != otherRecord.StateCheckers)
{
StateCheckers = otherRecord.StateCheckers;
@@ -165,11 +157,11 @@ public class PermissionDefinitionRecord : BasicAggregateRoot, IHasExtraPro
if (!this.HasSameExtraProperties(otherRecord))
{
this.ExtraProperties.Clear();
-
+
foreach (var property in otherRecord.ExtraProperties)
{
this.ExtraProperties.Add(property.Key, property.Value);
}
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionGroupDefinitionRecord.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionGroupDefinitionRecord.cs
index f93bf57e21..4cd9c90894 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionGroupDefinitionRecord.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionGroupDefinitionRecord.cs
@@ -1,5 +1,4 @@
using System;
-using System.Text.Json.Serialization;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;
@@ -7,17 +6,10 @@ namespace Volo.Abp.PermissionManagement;
public class PermissionGroupDefinitionRecord : BasicAggregateRoot, IHasExtraProperties
{
- /* Ignoring Id because it is different whenever we create an instance of
- * this class, and we are using Json Serialize, than Hash to understand
- * if permission definitions have changed (in StaticPermissionSaver.CalculateHash()).
- */
- [JsonIgnore]
- public override Guid Id { get; protected set; }
-
public string Name { get; set; }
-
+
public string DisplayName { get; set; }
-
+
public ExtraPropertyDictionary ExtraProperties { get; protected set; }
public PermissionGroupDefinitionRecord()
@@ -25,7 +17,7 @@ public class PermissionGroupDefinitionRecord : BasicAggregateRoot, IHasExt
ExtraProperties = new ExtraPropertyDictionary();
this.SetDefaultsForExtraProperties();
}
-
+
public PermissionGroupDefinitionRecord(
Guid id,
string name,
@@ -45,7 +37,7 @@ public class PermissionGroupDefinitionRecord : BasicAggregateRoot, IHasExt
{
return false;
}
-
+
if (DisplayName != otherRecord.DisplayName)
{
return false;
@@ -70,15 +62,15 @@ public class PermissionGroupDefinitionRecord : BasicAggregateRoot, IHasExt
{
DisplayName = otherRecord.DisplayName;
}
-
+
if (!this.HasSameExtraProperties(otherRecord))
{
this.ExtraProperties.Clear();
-
+
foreach (var property in otherRecord.ExtraProperties)
{
this.ExtraProperties.Add(property.Key, property.Value);
}
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/StaticPermissionSaver.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/StaticPermissionSaver.cs
index 0bde8ebb0a..1ef851dac3 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/StaticPermissionSaver.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/StaticPermissionSaver.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
using System.Threading.Tasks;
using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.Options;
@@ -10,6 +11,7 @@ using Volo.Abp.Authorization.Permissions;
using Volo.Abp.Caching;
using Volo.Abp.DependencyInjection;
using Volo.Abp.DistributedLocking;
+using Volo.Abp.Json.SystemTextJson.Modifiers;
using Volo.Abp.Threading;
using Volo.Abp.Uow;
@@ -298,13 +300,25 @@ public class StaticPermissionSaver : IStaticPermissionSaver, ITransientDependenc
IEnumerable deletedPermissionGroups,
IEnumerable deletedPermissions)
{
+ var jsonSerializerOptions = new JsonSerializerOptions
+ {
+ TypeInfoResolver = new DefaultJsonTypeInfoResolver
+ {
+ Modifiers =
+ {
+ new AbpIgnorePropertiesModifiers().CreateModifyAction(x => x.Id),
+ new AbpIgnorePropertiesModifiers().CreateModifyAction(x => x.Id)
+ }
+ }
+ };
+
var stringBuilder = new StringBuilder();
stringBuilder.Append("PermissionGroupRecords:");
- stringBuilder.AppendLine(JsonSerializer.Serialize(permissionGroupRecords));
+ stringBuilder.AppendLine(JsonSerializer.Serialize(permissionGroupRecords, jsonSerializerOptions));
stringBuilder.Append("PermissionRecords:");
- stringBuilder.AppendLine(JsonSerializer.Serialize(permissionRecords));
+ stringBuilder.AppendLine(JsonSerializer.Serialize(permissionRecords, jsonSerializerOptions));
stringBuilder.Append("DeletedPermissionGroups:");
stringBuilder.AppendLine(deletedPermissionGroups.JoinAsString(","));
diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/CalculateHash_Tests.cs b/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/CalculateHash_Tests.cs
new file mode 100644
index 0000000000..2e862c8f85
--- /dev/null
+++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/CalculateHash_Tests.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+using Shouldly;
+using Volo.Abp.Json.SystemTextJson.Modifiers;
+using Xunit;
+
+namespace Volo.Abp.PermissionManagement;
+
+public class CalculateHash_Tests: PermissionTestBase
+{
+ [Fact]
+ public void Test()
+ {
+ var jsonSerializerOptions = new JsonSerializerOptions
+ {
+ TypeInfoResolver = new DefaultJsonTypeInfoResolver
+ {
+ Modifiers =
+ {
+ new AbpIgnorePropertiesModifiers().CreateModifyAction(x => x.Id),
+ new AbpIgnorePropertiesModifiers().CreateModifyAction(x => x.Id)
+ }
+ }
+ };
+ var id = Guid.NewGuid();
+ var json = JsonSerializer.Serialize(new List()
+ {
+ new PermissionGroupDefinitionRecord(id, "Test", "Test")
+ },
+ jsonSerializerOptions);
+ json.ShouldNotContain("\"Id\"");
+ json.ShouldNotContain(id.ToString("D"));
+ json = JsonSerializer.Serialize(new List()
+ {
+ new PermissionDefinitionRecord(id, "Test", "Test", "Test", "Test")
+ },
+ jsonSerializerOptions);
+ json.ShouldNotContain("\"Id\"");
+ json.ShouldNotContain(id.ToString("D"));
+ }
+}
diff --git a/npm/lerna.json b/npm/lerna.json
index 4f6f9433d4..faa4964cfb 100644
--- a/npm/lerna.json
+++ b/npm/lerna.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"packages": [
"packs/*"
],
diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json
index 0b20e27525..edac2bebb9 100644
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@@ -41,24 +41,23 @@
"migrate-nx": "yarn nx migrate --run-migrations",
"copy-to:app": "cd scripts && yarn && yarn copy-to-templates -t app",
"update-version": "nx generate @abp/nx.generators:update-version"
-
},
"private": true,
"devDependencies": {
- "@abp/ng.account": "~7.2.1",
- "@abp/ng.account.core": "~7.2.1",
- "@abp/ng.core": "~7.2.1",
- "@abp/ng.feature-management": "~7.2.1",
- "@abp/ng.identity": "~7.2.1",
- "@abp/ng.oauth": "~7.2.1",
- "@abp/ng.permission-management": "~7.2.1",
- "@abp/ng.schematics": "~7.2.1",
- "@abp/ng.setting-management": "~7.2.1",
- "@abp/ng.tenant-management": "~7.2.1",
- "@abp/ng.theme.basic": "~7.2.1",
+ "@abp/ng.account": "~7.3.0-rc.1",
+ "@abp/ng.account.core": "~7.3.0-rc.1",
+ "@abp/ng.core": "~7.3.0-rc.1",
+ "@abp/ng.feature-management": "~7.3.0-rc.1",
+ "@abp/ng.identity": "~7.3.0-rc.1",
+ "@abp/ng.oauth": "~7.3.0-rc.1",
+ "@abp/ng.permission-management": "~7.3.0-rc.1",
+ "@abp/ng.schematics": "~7.3.0-rc.1",
+ "@abp/ng.setting-management": "~7.3.0-rc.1",
+ "@abp/ng.tenant-management": "~7.3.0-rc.1",
+ "@abp/ng.theme.basic": "~7.3.0-rc.1",
"@abp/ng.theme.lepton-x": "^2.2.0",
- "@abp/ng.theme.shared": "~7.2.1",
- "@abp/utils": "~7.2.1",
+ "@abp/ng.theme.shared": "~7.3.0-rc.1",
+ "@abp/utils": "~7.3.0-rc.1",
"@angular-devkit/build-angular": "16.0.1",
"@angular-devkit/core": "16.0.1",
"@angular-devkit/schematics": "16.0.1",
@@ -120,7 +119,7 @@
"lerna": "^4.0.0",
"lint-staged": "^13.0.3",
"ng-packagr": "16.0.1",
- "ng-zorro-antd": "^15.0.0",
+ "ng-zorro-antd": "^16.0.0",
"nx": "16.2.2",
"perfect-scrollbar": "^1.5.5",
"postcss": "^8.3.9",
@@ -149,4 +148,3 @@
},
"dependencies": {}
}
-
diff --git a/npm/ng-packs/packages/account-core/package.json b/npm/ng-packs/packages/account-core/package.json
index 52f8f685d9..6a8bd364f4 100644
--- a/npm/ng-packs/packages/account-core/package.json
+++ b/npm/ng-packs/packages/account-core/package.json
@@ -1,14 +1,14 @@
{
"name": "@abp/ng.account.core",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"homepage": "https://abp.io",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git"
},
"peerDependencies": {
- "@abp/ng.core": "~7.2.2",
- "@abp/ng.theme.shared": "~7.2.2",
+ "@abp/ng.core": "~7.3.0-rc.1",
+ "@abp/ng.theme.shared": "~7.3.0-rc.1",
"@angular/common": ">=12.0.0",
"@angular/core": ">=12.0.0"
},
diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json
index 53c5e40a6a..6c6a22c961 100644
--- a/npm/ng-packs/packages/account/package.json
+++ b/npm/ng-packs/packages/account/package.json
@@ -1,14 +1,14 @@
{
"name": "@abp/ng.account",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"homepage": "https://abp.io",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git"
},
"dependencies": {
- "@abp/ng.account.core": "~7.2.2",
- "@abp/ng.theme.shared": "~7.2.2",
+ "@abp/ng.account.core": "~7.3.0-rc.1",
+ "@abp/ng.theme.shared": "~7.3.0-rc.1",
"tslib": "^2.0.0"
},
"publishConfig": {
diff --git a/npm/ng-packs/packages/account/src/lib/account-routing.module.ts b/npm/ng-packs/packages/account/src/lib/account-routing.module.ts
index e4b18a717b..0b188f3751 100644
--- a/npm/ng-packs/packages/account/src/lib/account-routing.module.ts
+++ b/npm/ng-packs/packages/account/src/lib/account-routing.module.ts
@@ -1,20 +1,22 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes, mapToCanActivate } from '@angular/router';
+
import {
AuthGuard,
ReplaceableComponents,
ReplaceableRouteContainerComponent,
RouterOutletComponent,
} from '@abp/ng.core';
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+
import { ForgotPasswordComponent } from './components/forgot-password/forgot-password.component';
import { LoginComponent } from './components/login/login.component';
import { ManageProfileComponent } from './components/manage-profile/manage-profile.component';
import { RegisterComponent } from './components/register/register.component';
import { ResetPasswordComponent } from './components/reset-password/reset-password.component';
import { eAccountComponents } from './enums/components';
-import { AuthenticationFlowGuard } from './guards/authentication-flow.guard';
-import { AccountExtensionsGuard } from './guards';
+import { AccountExtensionsGuard, AuthenticationFlowGuard } from './guards';
+const canActivate = mapToCanActivate([AuthenticationFlowGuard]);
const routes: Routes = [
{ path: '', pathMatch: 'full', redirectTo: 'login' },
@@ -25,7 +27,7 @@ const routes: Routes = [
{
path: 'login',
component: ReplaceableRouteContainerComponent,
- canActivate: [AuthenticationFlowGuard],
+ canActivate,
data: {
replaceableComponent: {
key: eAccountComponents.Login,
@@ -36,7 +38,7 @@ const routes: Routes = [
{
path: 'register',
component: ReplaceableRouteContainerComponent,
- canActivate: [AuthenticationFlowGuard],
+ canActivate,
data: {
replaceableComponent: {
key: eAccountComponents.Register,
@@ -47,7 +49,8 @@ const routes: Routes = [
{
path: 'forgot-password',
component: ReplaceableRouteContainerComponent,
- canActivate: [AuthenticationFlowGuard],
+ canActivate,
+
data: {
replaceableComponent: {
key: eAccountComponents.ForgotPassword,
@@ -70,7 +73,7 @@ const routes: Routes = [
{
path: 'manage',
component: ReplaceableRouteContainerComponent,
- canActivate: [AuthGuard, AccountExtensionsGuard],
+ canActivate: mapToCanActivate([AuthGuard, AccountExtensionsGuard]),
data: {
replaceableComponent: {
key: eAccountComponents.ManageProfile,
diff --git a/npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts b/npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts
index c669e32a97..c00cee3156 100644
--- a/npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts
+++ b/npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts
@@ -1,10 +1,9 @@
-import { AuthService } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-
+import { AuthService, IAbpGuard } from '@abp/ng.core';
+import { Injectable, inject } from '@angular/core';
@Injectable()
-export class AuthenticationFlowGuard {
- constructor(private authService: AuthService) {}
+export class AuthenticationFlowGuard implements IAbpGuard {
+ protected readonly authService = inject(AuthService);
canActivate() {
if (this.authService.isInternalAuth) return true;
diff --git a/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts b/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts
index be000782c2..8df8aede51 100644
--- a/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts
+++ b/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts
@@ -1,46 +1,46 @@
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
+import { tap, map } from 'rxjs/operators';
+
+import { ConfigStateService, IAbpGuard } from '@abp/ng.core';
import {
ExtensionsService,
getObjectExtensionEntitiesFromStore,
mapEntitiesToContributors,
mergeWithDefaultProps,
} from '@abp/ng.theme.shared/extensions';
-import { ConfigStateService } from '@abp/ng.core';
-import { tap, map, mapTo } from 'rxjs/operators';
+
import {
ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS,
DEFAULT_ACCOUNT_FORM_PROPS,
} from '../tokens/extensions.token';
-import { AccountEditFormPropContributors } from '../models/config-options';
import { eAccountComponents } from '../enums/components';
@Injectable()
-export class AccountExtensionsGuard {
- constructor(private injector: Injector) {}
+export class AccountExtensionsGuard implements IAbpGuard {
+ protected readonly configState = inject(ConfigStateService);
+ protected readonly extensions = inject(ExtensionsService);
canActivate(): Observable {
- const extensions: ExtensionsService = this.injector.get(ExtensionsService);
+ const config = { optional: true };
- const editFormContributors: AccountEditFormPropContributors =
- this.injector.get(ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS, null) || {};
+ const editFormContributors = inject(ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS, config) || {};
- const configState = this.injector.get(ConfigStateService);
- return getObjectExtensionEntitiesFromStore(configState, 'Identity').pipe(
+ return getObjectExtensionEntitiesFromStore(this.configState, 'Identity').pipe(
map(entities => ({
[eAccountComponents.PersonalSettings]: entities.User,
})),
- mapEntitiesToContributors(configState, 'AbpIdentity'),
+ mapEntitiesToContributors(this.configState, 'AbpIdentity'),
tap(objectExtensionContributors => {
mergeWithDefaultProps(
- extensions.editFormProps,
+ this.extensions.editFormProps,
DEFAULT_ACCOUNT_FORM_PROPS,
objectExtensionContributors.editForm,
editFormContributors,
);
}),
- mapTo(true),
+ map(() => true),
);
}
}
diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json
index 40ecccd6ff..ef8b8f49bc 100644
--- a/npm/ng-packs/packages/components/package.json
+++ b/npm/ng-packs/packages/components/package.json
@@ -1,18 +1,18 @@
{
"name": "@abp/ng.components",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"homepage": "https://abp.io",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git"
},
"peerDependencies": {
- "@abp/ng.core": ">=7.0.3",
- "@abp/ng.theme.shared": ">=7.0.3"
+ "@abp/ng.core": ">=7.3.0-rc.1",
+ "@abp/ng.theme.shared": ">=7.3.0-rc.1"
},
"dependencies": {
"chart.js": "^3.5.1",
- "ng-zorro-antd": "^15.0.0",
+ "ng-zorro-antd": "^16.0.0",
"tslib": "^2.0.0"
},
"publishConfig": {
diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json
index 8c58e06202..5d455f4597 100644
--- a/npm/ng-packs/packages/core/package.json
+++ b/npm/ng-packs/packages/core/package.json
@@ -1,13 +1,13 @@
{
"name": "@abp/ng.core",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"homepage": "https://abp.io",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git"
},
"dependencies": {
- "@abp/utils": "~7.2.2",
+ "@abp/utils": "~7.3.0-rc.1",
"angular-oauth2-oidc": "^15.0.1",
"just-clone": "^6.1.1",
"just-compare": "^2.3.0",
diff --git a/npm/ng-packs/packages/core/src/lib/abstracts/abstract-guard.ts b/npm/ng-packs/packages/core/src/lib/abstracts/abstract-guard.ts
new file mode 100644
index 0000000000..7593326903
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/abstracts/abstract-guard.ts
@@ -0,0 +1,9 @@
+import { ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { Observable } from 'rxjs';
+
+export interface IAbpGuard {
+ canActivate(
+ route: ActivatedRouteSnapshot,
+ state: RouterStateSnapshot,
+ ): Observable | Promise | boolean | UrlTree;
+}
diff --git a/npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts b/npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts
index 8e380a46e3..8fb4f4dc25 100644
--- a/npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts
+++ b/npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts
@@ -1,13 +1,14 @@
+import { Injectable } from '@angular/core';
import { UrlTree } from '@angular/router';
import { Observable } from 'rxjs';
-import { Injectable } from '@angular/core';
+import { IAbpGuard } from './abstract-guard';
+
@Injectable({
providedIn: 'root',
})
-export class AuthGuard implements IAuthGuard {
+export class AuthGuard implements IAbpGuard {
canActivate(): Observable | boolean | UrlTree {
console.error('You should add @abp/ng-oauth packages or create your own auth packages.');
return false;
}
}
-export interface IAuthGuard {}
diff --git a/npm/ng-packs/packages/core/src/lib/abstracts/index.ts b/npm/ng-packs/packages/core/src/lib/abstracts/index.ts
index e1ff2f106b..f9b4794de0 100644
--- a/npm/ng-packs/packages/core/src/lib/abstracts/index.ts
+++ b/npm/ng-packs/packages/core/src/lib/abstracts/index.ts
@@ -1,3 +1,4 @@
+export * from './abstract-guard';
export * from './ng-model.component';
export * from './auth.guard';
export * from './auth.service';
diff --git a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
index 01df2d4556..ae3fdb6e37 100644
--- a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
+++ b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
@@ -1,23 +1,25 @@
-import { HttpErrorResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { HttpErrorResponse } from '@angular/common/http';
+
import { Observable, of } from 'rxjs';
import { tap } from 'rxjs/operators';
-import { HttpErrorReporterService } from '../services/http-error-reporter.service';
-import { PermissionService } from '../services/permission.service';
-import { RoutesService } from '../services/routes.service';
+
+import { OAuthService } from 'angular-oauth2-oidc';
+
+import { IAbpGuard } from '../abstracts';
import { findRoute, getRoutePath } from '../utils/route-utils';
+import { RoutesService, PermissionService, HttpErrorReporterService } from '../services';
@Injectable({
providedIn: 'root',
})
-export class PermissionGuard {
- constructor(
- private router: Router,
- private routesService: RoutesService,
- private permissionService: PermissionService,
- private httpErrorReporter: HttpErrorReporterService,
- ) {}
+export class PermissionGuard implements IAbpGuard {
+ protected readonly router = inject(Router);
+ protected readonly routesService = inject(RoutesService);
+ protected readonly oAuthService = inject(OAuthService);
+ protected readonly permissionService = inject(PermissionService);
+ protected readonly httpErrorReporter = inject(HttpErrorReporterService);
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable {
let { requiredPolicy } = route.data || {};
@@ -31,7 +33,7 @@ export class PermissionGuard {
return this.permissionService.getGrantedPolicy$(requiredPolicy).pipe(
tap(access => {
- if (!access) {
+ if (!access && this.oAuthService.hasValidAccessToken()) {
this.httpErrorReporter.reportError({ status: 403 } as HttpErrorResponse);
}
}),
diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json
index 5596b11fab..254b5ed018 100644
--- a/npm/ng-packs/packages/feature-management/package.json
+++ b/npm/ng-packs/packages/feature-management/package.json
@@ -1,13 +1,13 @@
{
"name": "@abp/ng.feature-management",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"homepage": "https://abp.io",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git"
},
"dependencies": {
- "@abp/ng.theme.shared": "~7.2.2",
+ "@abp/ng.theme.shared": "~7.3.0-rc.1",
"tslib": "^2.0.0"
},
"publishConfig": {
diff --git a/npm/ng-packs/packages/generators/package.json b/npm/ng-packs/packages/generators/package.json
index d198c449cc..5ff0956087 100644
--- a/npm/ng-packs/packages/generators/package.json
+++ b/npm/ng-packs/packages/generators/package.json
@@ -1,6 +1,14 @@
{
"name": "@abp/nx.generators",
- "version": "7.3.0-preview20230530",
+ "version": "7.3.0-rc.1",
+ "homepage": "https://abp.io",
+ "generators": "./generators.json",
"type": "commonjs",
- "generators": "./generators.json"
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/abpframework/abp.git"
+ },
+ "publishConfig": {
+ "access": "public"
+ }
}
diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json
index f7ee25a8ee..0ec6a4d721 100644
--- a/npm/ng-packs/packages/identity/package.json
+++ b/npm/ng-packs/packages/identity/package.json
@@ -1,15 +1,15 @@
{
"name": "@abp/ng.identity",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"homepage": "https://abp.io",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git"
},
"dependencies": {
- "@abp/ng.components": "~7.2.2",
- "@abp/ng.permission-management": "~7.2.2",
- "@abp/ng.theme.shared": "~7.2.2",
+ "@abp/ng.components": "~7.3.0-rc.1",
+ "@abp/ng.permission-management": "~7.3.0-rc.1",
+ "@abp/ng.theme.shared": "~7.3.0-rc.1",
"tslib": "^2.0.0"
},
"publishConfig": {
diff --git a/npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts b/npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts
index 5fc747c6fb..172b599f91 100644
--- a/npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts
+++ b/npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts
@@ -1,4 +1,9 @@
-import { ConfigStateService } from '@abp/ng.core';
+import { Injectable, inject } from '@angular/core';
+
+import { Observable } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
+
+import { ConfigStateService, IAbpGuard } from '@abp/ng.core';
import {
ExtensionsService,
getObjectExtensionEntitiesFromStore,
@@ -6,18 +11,8 @@ import {
mergeWithDefaultActions,
mergeWithDefaultProps,
} from '@abp/ng.theme.shared/extensions';
-import { Injectable, Injector } from '@angular/core';
-import { Observable } from 'rxjs';
-import { map, mapTo, tap } from 'rxjs/operators';
import { eIdentityComponents } from '../enums/components';
-import {
- IdentityCreateFormPropContributors,
- IdentityEditFormPropContributors,
- IdentityEntityActionContributors,
- IdentityEntityPropContributors,
- IdentityToolbarActionContributors,
-} from '../models/config-options';
import {
DEFAULT_IDENTITY_CREATE_FORM_PROPS,
DEFAULT_IDENTITY_EDIT_FORM_PROPS,
@@ -32,60 +27,56 @@ import {
} from '../tokens/extensions.token';
@Injectable()
-export class IdentityExtensionsGuard {
- constructor(private injector: Injector) {}
+export class IdentityExtensionsGuard implements IAbpGuard {
+ protected readonly configState = inject(ConfigStateService);
+ protected readonly extensions = inject(ExtensionsService);
canActivate(): Observable {
- const extensions: ExtensionsService = this.injector.get(ExtensionsService);
- const actionContributors: IdentityEntityActionContributors =
- this.injector.get(IDENTITY_ENTITY_ACTION_CONTRIBUTORS, null) || {};
- const toolbarContributors: IdentityToolbarActionContributors =
- this.injector.get(IDENTITY_TOOLBAR_ACTION_CONTRIBUTORS, null) || {};
- const propContributors: IdentityEntityPropContributors =
- this.injector.get(IDENTITY_ENTITY_PROP_CONTRIBUTORS, null) || {};
- const createFormContributors: IdentityCreateFormPropContributors =
- this.injector.get(IDENTITY_CREATE_FORM_PROP_CONTRIBUTORS, null) || {};
- const editFormContributors: IdentityEditFormPropContributors =
- this.injector.get(IDENTITY_EDIT_FORM_PROP_CONTRIBUTORS, null) || {};
+ const config = { optional: true };
+
+ const actionContributors = inject(IDENTITY_ENTITY_ACTION_CONTRIBUTORS, config) || {};
+ const toolbarContributors = inject(IDENTITY_TOOLBAR_ACTION_CONTRIBUTORS, config) || {};
+ const propContributors = inject(IDENTITY_ENTITY_PROP_CONTRIBUTORS, config) || {};
+ const createFormContributors = inject(IDENTITY_CREATE_FORM_PROP_CONTRIBUTORS, config) || {};
+ const editFormContributors = inject(IDENTITY_EDIT_FORM_PROP_CONTRIBUTORS, config) || {};
- const configState = this.injector.get(ConfigStateService);
- return getObjectExtensionEntitiesFromStore(configState, 'Identity').pipe(
+ return getObjectExtensionEntitiesFromStore(this.configState, 'Identity').pipe(
map(entities => ({
[eIdentityComponents.Roles]: entities.Role,
[eIdentityComponents.Users]: entities.User,
})),
- mapEntitiesToContributors(configState, 'AbpIdentity'),
+ mapEntitiesToContributors(this.configState, 'AbpIdentity'),
tap(objectExtensionContributors => {
mergeWithDefaultActions(
- extensions.entityActions,
+ this.extensions.entityActions,
DEFAULT_IDENTITY_ENTITY_ACTIONS,
actionContributors,
);
mergeWithDefaultActions(
- extensions.toolbarActions,
+ this.extensions.toolbarActions,
DEFAULT_IDENTITY_TOOLBAR_ACTIONS,
toolbarContributors,
);
mergeWithDefaultProps(
- extensions.entityProps,
+ this.extensions.entityProps,
DEFAULT_IDENTITY_ENTITY_PROPS,
objectExtensionContributors.prop,
propContributors,
);
mergeWithDefaultProps(
- extensions.createFormProps,
+ this.extensions.createFormProps,
DEFAULT_IDENTITY_CREATE_FORM_PROPS,
objectExtensionContributors.createForm,
createFormContributors,
);
mergeWithDefaultProps(
- extensions.editFormProps,
+ this.extensions.editFormProps,
DEFAULT_IDENTITY_EDIT_FORM_PROPS,
objectExtensionContributors.editForm,
editFormContributors,
);
}),
- mapTo(true),
+ map(() => true),
);
}
}
diff --git a/npm/ng-packs/packages/identity/src/lib/identity-routing.module.ts b/npm/ng-packs/packages/identity/src/lib/identity-routing.module.ts
index 790d5fe688..33c8f53d5a 100644
--- a/npm/ng-packs/packages/identity/src/lib/identity-routing.module.ts
+++ b/npm/ng-packs/packages/identity/src/lib/identity-routing.module.ts
@@ -1,21 +1,25 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes, mapToCanActivate } from '@angular/router';
+
import {
- AuthGuard, PermissionGuard,
+ AuthGuard,
+ PermissionGuard,
ReplaceableComponents,
- ReplaceableRouteContainerComponent, RouterOutletComponent
+ ReplaceableRouteContainerComponent,
+ RouterOutletComponent,
} from '@abp/ng.core';
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+
import { RolesComponent } from './components/roles/roles.component';
import { UsersComponent } from './components/users/users.component';
import { eIdentityComponents } from './enums/components';
-import { IdentityExtensionsGuard } from './guards/extensions.guard';
+import { IdentityExtensionsGuard } from './guards';
const routes: Routes = [
{ path: '', redirectTo: 'roles', pathMatch: 'full' },
{
path: '',
component: RouterOutletComponent,
- canActivate: [AuthGuard, PermissionGuard, IdentityExtensionsGuard],
+ canActivate: mapToCanActivate([AuthGuard, PermissionGuard, IdentityExtensionsGuard]),
children: [
{
path: 'roles',
diff --git a/npm/ng-packs/packages/oauth/package.json b/npm/ng-packs/packages/oauth/package.json
index 418e0365b0..22efe41008 100644
--- a/npm/ng-packs/packages/oauth/package.json
+++ b/npm/ng-packs/packages/oauth/package.json
@@ -1,17 +1,17 @@
{
"name": "@abp/ng.oauth",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"homepage": "https://abp.io",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git"
},
"dependencies": {
- "@abp/ng.core": "~7.2.2",
- "@abp/utils": "~7.2.2",
+ "@abp/ng.core": "~7.3.0-rc.1",
+ "@abp/utils": "~7.3.0-rc.1",
"angular-oauth2-oidc": "^15.0.1",
"just-clone": "^6.1.1",
- "just-compare": "^1.4.0",
+ "just-compare": "^2.3.0",
"tslib": "^2.0.0"
},
"publishConfig": {
diff --git a/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts b/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts
index fb7e4a3506..85a39b5bf8 100644
--- a/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts
+++ b/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts
@@ -1,26 +1,36 @@
-import { Injectable } from '@angular/core';
-import { CanActivate, UrlTree, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Injectable, inject } from '@angular/core';
+import { UrlTree, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { HttpErrorResponse } from '@angular/common/http';
+
+import { Observable, delay, of, tap } from 'rxjs';
import { OAuthService } from 'angular-oauth2-oidc';
-import { Observable } from 'rxjs';
-import { AuthService, IAuthGuard } from '@abp/ng.core';
+
+import { AuthService, HttpErrorReporterService, IAbpGuard } from '@abp/ng.core';
@Injectable({
providedIn: 'root',
})
-export class AbpOAuthGuard implements IAuthGuard {
- constructor(private oauthService: OAuthService, private authService: AuthService) {}
+export class AbpOAuthGuard implements IAbpGuard {
+ protected readonly oAuthService = inject(OAuthService);
+ protected readonly authService = inject(AuthService);
+ protected readonly httpErrorReporter = inject(HttpErrorReporterService);
canActivate(
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot,
): Observable | boolean | UrlTree {
- const hasValidAccessToken = this.oauthService.hasValidAccessToken();
+ const hasValidAccessToken = this.oAuthService.hasValidAccessToken();
if (hasValidAccessToken) {
return true;
}
- const params = { returnUrl: state.url };
- this.authService.navigateToLogin(params);
- return false;
+ return of(false).pipe(
+ tap(() => this.httpErrorReporter.reportError({ status: 401 } as HttpErrorResponse)),
+ delay(1500),
+ tap(() => {
+ const params = { returnUrl: state.url };
+ this.authService.navigateToLogin(params);
+ }),
+ );
}
}
diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json
index b78f179215..c915f47607 100644
--- a/npm/ng-packs/packages/permission-management/package.json
+++ b/npm/ng-packs/packages/permission-management/package.json
@@ -1,13 +1,13 @@
{
"name": "@abp/ng.permission-management",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"homepage": "https://abp.io",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git"
},
"dependencies": {
- "@abp/ng.theme.shared": "~7.2.2",
+ "@abp/ng.theme.shared": "~7.3.0-rc.1",
"tslib": "^2.0.0"
},
"publishConfig": {
diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json
index 023769ca70..299fba25be 100644
--- a/npm/ng-packs/packages/schematics/package.json
+++ b/npm/ng-packs/packages/schematics/package.json
@@ -1,6 +1,6 @@
{
"name": "@abp/ng.schematics",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"description": "Schematics that works with ABP Backend",
"keywords": [
"schematics"
diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json
index 5f613eab48..61209ab76d 100644
--- a/npm/ng-packs/packages/setting-management/package.json
+++ b/npm/ng-packs/packages/setting-management/package.json
@@ -1,14 +1,14 @@
{
"name": "@abp/ng.setting-management",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"homepage": "https://abp.io",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git"
},
"dependencies": {
- "@abp/ng.components": "~7.2.2",
- "@abp/ng.theme.shared": "~7.2.2",
+ "@abp/ng.components": "~7.3.0-rc.1",
+ "@abp/ng.theme.shared": "~7.3.0-rc.1",
"tslib": "^2.0.0"
},
"publishConfig": {
diff --git a/npm/ng-packs/packages/setting-management/src/lib/setting-management-routing.module.ts b/npm/ng-packs/packages/setting-management/src/lib/setting-management-routing.module.ts
index ea16e33286..1fc5fd7c7b 100644
--- a/npm/ng-packs/packages/setting-management/src/lib/setting-management-routing.module.ts
+++ b/npm/ng-packs/packages/setting-management/src/lib/setting-management-routing.module.ts
@@ -1,11 +1,11 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes, mapToCanActivate } from '@angular/router';
import {
AuthGuard,
ReplaceableComponents,
ReplaceableRouteContainerComponent,
RouterOutletComponent,
} from '@abp/ng.core';
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
import { SettingManagementComponent } from './components/setting-management.component';
import { eSettingManagementComponents } from './enums/components';
@@ -13,7 +13,7 @@ const routes: Routes = [
{
path: '',
component: RouterOutletComponent,
- canActivate: [AuthGuard],
+ canActivate: mapToCanActivate([AuthGuard]),
children: [
{
path: '',
diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json
index ef790d2e7d..b4caa832ef 100644
--- a/npm/ng-packs/packages/tenant-management/package.json
+++ b/npm/ng-packs/packages/tenant-management/package.json
@@ -1,14 +1,14 @@
{
"name": "@abp/ng.tenant-management",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"homepage": "https://abp.io",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git"
},
"dependencies": {
- "@abp/ng.feature-management": "~7.2.2",
- "@abp/ng.theme.shared": "~7.2.2",
+ "@abp/ng.feature-management": "~7.3.0-rc.1",
+ "@abp/ng.theme.shared": "~7.3.0-rc.1",
"tslib": "^2.0.0"
},
"publishConfig": {
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts b/npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts
index cbe63210da..bdadb7e78a 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts
+++ b/npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts
@@ -1,4 +1,9 @@
-import { ConfigStateService } from '@abp/ng.core';
+import { Injectable, inject } from '@angular/core';
+
+import { Observable } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
+
+import { ConfigStateService, IAbpGuard } from '@abp/ng.core';
import {
ExtensionsService,
getObjectExtensionEntitiesFromStore,
@@ -6,18 +11,8 @@ import {
mergeWithDefaultActions,
mergeWithDefaultProps,
} from '@abp/ng.theme.shared/extensions';
-import { Injectable, Injector } from '@angular/core';
-import { Observable } from 'rxjs';
-import { map, mapTo, tap } from 'rxjs/operators';
import { eTenantManagementComponents } from '../enums/components';
-import {
- TenantManagementCreateFormPropContributors,
- TenantManagementEditFormPropContributors,
- TenantManagementEntityActionContributors,
- TenantManagementEntityPropContributors,
- TenantManagementToolbarActionContributors,
-} from '../models/config-options';
import {
DEFAULT_TENANT_MANAGEMENT_CREATE_FORM_PROPS,
DEFAULT_TENANT_MANAGEMENT_EDIT_FORM_PROPS,
@@ -32,59 +27,57 @@ import {
} from '../tokens/extensions.token';
@Injectable()
-export class TenantManagementExtensionsGuard {
- constructor(private injector: Injector) {}
+export class TenantManagementExtensionsGuard implements IAbpGuard {
+ protected readonly configState = inject(ConfigStateService);
+ protected readonly extensions = inject(ExtensionsService);
canActivate(): Observable {
- const extensions: ExtensionsService = this.injector.get(ExtensionsService);
- const actionContributors: TenantManagementEntityActionContributors =
- this.injector.get(TENANT_MANAGEMENT_ENTITY_ACTION_CONTRIBUTORS, null) || {};
- const toolbarContributors: TenantManagementToolbarActionContributors =
- this.injector.get(TENANT_MANAGEMENT_TOOLBAR_ACTION_CONTRIBUTORS, null) || {};
- const propContributors: TenantManagementEntityPropContributors =
- this.injector.get(TENANT_MANAGEMENT_ENTITY_PROP_CONTRIBUTORS, null) || {};
- const createFormContributors: TenantManagementCreateFormPropContributors =
- this.injector.get(TENANT_MANAGEMENT_CREATE_FORM_PROP_CONTRIBUTORS, null) || {};
- const editFormContributors: TenantManagementEditFormPropContributors =
- this.injector.get(TENANT_MANAGEMENT_EDIT_FORM_PROP_CONTRIBUTORS, null) || {};
+ const config = { optional: true };
+
+ const actionContributors = inject(TENANT_MANAGEMENT_ENTITY_ACTION_CONTRIBUTORS, config) || {};
+ const toolbarContributors = inject(TENANT_MANAGEMENT_TOOLBAR_ACTION_CONTRIBUTORS, config) || {};
+ const propContributors = inject(TENANT_MANAGEMENT_ENTITY_PROP_CONTRIBUTORS, config) || {};
+ const createFormContributors =
+ inject(TENANT_MANAGEMENT_CREATE_FORM_PROP_CONTRIBUTORS, config) || {};
+ const editFormContributors =
+ inject(TENANT_MANAGEMENT_EDIT_FORM_PROP_CONTRIBUTORS, config) || {};
- const configState = this.injector.get(ConfigStateService);
- return getObjectExtensionEntitiesFromStore(configState, 'TenantManagement').pipe(
+ return getObjectExtensionEntitiesFromStore(this.configState, 'TenantManagement').pipe(
map(entities => ({
[eTenantManagementComponents.Tenants]: entities.Tenant,
})),
- mapEntitiesToContributors(configState, 'TenantManagement'),
+ mapEntitiesToContributors(this.configState, 'TenantManagement'),
tap(objectExtensionContributors => {
mergeWithDefaultActions(
- extensions.entityActions,
+ this.extensions.entityActions,
DEFAULT_TENANT_MANAGEMENT_ENTITY_ACTIONS,
actionContributors,
);
mergeWithDefaultActions(
- extensions.toolbarActions,
+ this.extensions.toolbarActions,
DEFAULT_TENANT_MANAGEMENT_TOOLBAR_ACTIONS,
toolbarContributors,
);
mergeWithDefaultProps(
- extensions.entityProps,
+ this.extensions.entityProps,
DEFAULT_TENANT_MANAGEMENT_ENTITY_PROPS,
objectExtensionContributors.prop,
propContributors,
);
mergeWithDefaultProps(
- extensions.createFormProps,
+ this.extensions.createFormProps,
DEFAULT_TENANT_MANAGEMENT_CREATE_FORM_PROPS,
objectExtensionContributors.createForm,
createFormContributors,
);
mergeWithDefaultProps(
- extensions.editFormProps,
+ this.extensions.editFormProps,
DEFAULT_TENANT_MANAGEMENT_EDIT_FORM_PROPS,
objectExtensionContributors.editForm,
editFormContributors,
);
}),
- mapTo(true),
+ map(() => true),
);
}
}
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management-routing.module.ts b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management-routing.module.ts
index f2b7180c1e..06e2f0369e 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management-routing.module.ts
+++ b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management-routing.module.ts
@@ -1,3 +1,6 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes, mapToCanActivate } from '@angular/router';
+
import {
AuthGuard,
PermissionGuard,
@@ -5,8 +8,7 @@ import {
ReplaceableRouteContainerComponent,
RouterOutletComponent,
} from '@abp/ng.core';
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+
import { TenantsComponent } from './components/tenants/tenants.component';
import { eTenantManagementComponents } from './enums/components';
import { TenantManagementExtensionsGuard } from './guards';
@@ -16,7 +18,7 @@ const routes: Routes = [
{
path: '',
component: RouterOutletComponent,
- canActivate: [AuthGuard, PermissionGuard, TenantManagementExtensionsGuard],
+ canActivate: mapToCanActivate([AuthGuard, PermissionGuard, TenantManagementExtensionsGuard]),
children: [
{
path: 'tenants',
diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json
index 3bc89cbc60..a4e2c39553 100644
--- a/npm/ng-packs/packages/theme-basic/package.json
+++ b/npm/ng-packs/packages/theme-basic/package.json
@@ -1,14 +1,14 @@
{
"name": "@abp/ng.theme.basic",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"homepage": "https://abp.io",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git"
},
"dependencies": {
- "@abp/ng.account.core": "~7.2.2",
- "@abp/ng.theme.shared": "~7.2.2",
+ "@abp/ng.account.core": "~7.3.0-rc.1",
+ "@abp/ng.theme.shared": "~7.3.0-rc.1",
"tslib": "^2.0.0"
},
"publishConfig": {
diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json
index e77dd25e32..ef7dfb6ea6 100644
--- a/npm/ng-packs/packages/theme-shared/package.json
+++ b/npm/ng-packs/packages/theme-shared/package.json
@@ -1,13 +1,13 @@
{
"name": "@abp/ng.theme.shared",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"homepage": "https://abp.io",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git"
},
"dependencies": {
- "@abp/ng.core": "~7.2.2",
+ "@abp/ng.core": "~7.3.0-rc.1",
"@fortawesome/fontawesome-free": "^5.15.4",
"@ng-bootstrap/ng-bootstrap": "^15.0.0",
"@ngx-validate/core": "^0.2.0",
diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json
index 1d12472bf7..d432da61a2 100644
--- a/npm/packs/anchor-js/package.json
+++ b/npm/packs/anchor-js/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/anchor-js",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"anchor-js": "^4.3.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/aspnetcore.components.server.basictheme/package.json b/npm/packs/aspnetcore.components.server.basictheme/package.json
index 1509987f25..cbeab72faa 100644
--- a/npm/packs/aspnetcore.components.server.basictheme/package.json
+++ b/npm/packs/aspnetcore.components.server.basictheme/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/aspnetcore.components.server.basictheme",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/aspnetcore.components.server.theming": "~7.2.2"
+ "@abp/aspnetcore.components.server.theming": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json
index f540cbe96d..d8a3d4ea68 100644
--- a/npm/packs/aspnetcore.components.server.theming/package.json
+++ b/npm/packs/aspnetcore.components.server.theming/package.json
@@ -1,12 +1,12 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/aspnetcore.components.server.theming",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/bootstrap": "~7.2.2",
- "@abp/font-awesome": "~7.2.2"
+ "@abp/bootstrap": "~7.3.0-rc.1",
+ "@abp/font-awesome": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json
index 1b86e2cd10..828a39b93f 100644
--- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json
+++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/aspnetcore.mvc.ui.theme.basic",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/aspnetcore.mvc.ui.theme.shared": "~7.2.2"
+ "@abp/aspnetcore.mvc.ui.theme.shared": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json
index 809556226f..cdde7f9270 100644
--- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json
+++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/aspnetcore.mvc.ui.theme.shared",
"repository": {
"type": "git",
@@ -10,22 +10,22 @@
"access": "public"
},
"dependencies": {
- "@abp/aspnetcore.mvc.ui": "~7.2.2",
- "@abp/bootstrap": "~7.2.2",
- "@abp/bootstrap-datepicker": "~7.2.2",
- "@abp/bootstrap-daterangepicker": "~7.2.2",
- "@abp/datatables.net-bs5": "~7.2.2",
- "@abp/font-awesome": "~7.2.2",
- "@abp/jquery-form": "~7.2.2",
- "@abp/jquery-validation-unobtrusive": "~7.2.2",
- "@abp/lodash": "~7.2.2",
- "@abp/luxon": "~7.2.2",
- "@abp/malihu-custom-scrollbar-plugin": "~7.2.2",
- "@abp/moment": "~7.2.2",
- "@abp/select2": "~7.2.2",
- "@abp/sweetalert2": "~7.2.2",
- "@abp/timeago": "~7.2.2",
- "@abp/toastr": "~7.2.2"
+ "@abp/aspnetcore.mvc.ui": "~7.3.0-rc.1",
+ "@abp/bootstrap": "~7.3.0-rc.1",
+ "@abp/bootstrap-datepicker": "~7.3.0-rc.1",
+ "@abp/bootstrap-daterangepicker": "~7.3.0-rc.1",
+ "@abp/datatables.net-bs5": "~7.3.0-rc.1",
+ "@abp/font-awesome": "~7.3.0-rc.1",
+ "@abp/jquery-form": "~7.3.0-rc.1",
+ "@abp/jquery-validation-unobtrusive": "~7.3.0-rc.1",
+ "@abp/lodash": "~7.3.0-rc.1",
+ "@abp/luxon": "~7.3.0-rc.1",
+ "@abp/malihu-custom-scrollbar-plugin": "~7.3.0-rc.1",
+ "@abp/moment": "~7.3.0-rc.1",
+ "@abp/select2": "~7.3.0-rc.1",
+ "@abp/sweetalert2": "~7.3.0-rc.1",
+ "@abp/timeago": "~7.3.0-rc.1",
+ "@abp/toastr": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/aspnetcore.mvc.ui/package-lock.json b/npm/packs/aspnetcore.mvc.ui/package-lock.json
index 14cced9bc8..41abe27dc5 100644
--- a/npm/packs/aspnetcore.mvc.ui/package-lock.json
+++ b/npm/packs/aspnetcore.mvc.ui/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "@abp/aspnetcore.mvc.ui",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json
index 537e5a27b6..3807e92bc3 100644
--- a/npm/packs/aspnetcore.mvc.ui/package.json
+++ b/npm/packs/aspnetcore.mvc.ui/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/aspnetcore.mvc.ui",
"repository": {
"type": "git",
diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json
index 29a5b80f11..40ae9dfb64 100644
--- a/npm/packs/blogging/package.json
+++ b/npm/packs/blogging/package.json
@@ -1,14 +1,14 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/blogging",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/aspnetcore.mvc.ui.theme.shared": "~7.2.2",
- "@abp/owl.carousel": "~7.2.2",
- "@abp/prismjs": "~7.2.2",
- "@abp/tui-editor": "~7.2.2"
+ "@abp/aspnetcore.mvc.ui.theme.shared": "~7.3.0-rc.1",
+ "@abp/owl.carousel": "~7.3.0-rc.1",
+ "@abp/prismjs": "~7.3.0-rc.1",
+ "@abp/tui-editor": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json
index 0e7328890b..8a1a37e21f 100644
--- a/npm/packs/bootstrap-datepicker/package.json
+++ b/npm/packs/bootstrap-datepicker/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/bootstrap-datepicker",
"repository": {
"type": "git",
diff --git a/npm/packs/bootstrap-daterangepicker/package.json b/npm/packs/bootstrap-daterangepicker/package.json
index 1804a79787..15a52d69bc 100644
--- a/npm/packs/bootstrap-daterangepicker/package.json
+++ b/npm/packs/bootstrap-daterangepicker/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/bootstrap-daterangepicker",
"repository": {
"type": "git",
diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json
index fed3b1193d..8bd1be2f85 100644
--- a/npm/packs/bootstrap/package.json
+++ b/npm/packs/bootstrap/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/bootstrap",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"bootstrap": "^5.1.3"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json
index 88f73d1b1d..0838f0accd 100644
--- a/npm/packs/chart.js/package.json
+++ b/npm/packs/chart.js/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/chart.js",
"publishConfig": {
"access": "public"
diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json
index 335be096c1..6439732ac1 100644
--- a/npm/packs/clipboard/package.json
+++ b/npm/packs/clipboard/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/clipboard",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"clipboard": "^2.0.8"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/cms-kit.admin/package.json b/npm/packs/cms-kit.admin/package.json
index 03037cbe50..e266a982e6 100644
--- a/npm/packs/cms-kit.admin/package.json
+++ b/npm/packs/cms-kit.admin/package.json
@@ -1,15 +1,15 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/cms-kit.admin",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/codemirror": "~7.2.2",
- "@abp/jstree": "~7.2.2",
- "@abp/slugify": "~7.2.2",
- "@abp/tui-editor": "~7.2.2",
- "@abp/uppy": "~7.2.2"
+ "@abp/codemirror": "~7.3.0-rc.1",
+ "@abp/jstree": "~7.3.0-rc.1",
+ "@abp/slugify": "~7.3.0-rc.1",
+ "@abp/tui-editor": "~7.3.0-rc.1",
+ "@abp/uppy": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json
index c0baf6bd6a..ca1020ae05 100644
--- a/npm/packs/cms-kit.public/package.json
+++ b/npm/packs/cms-kit.public/package.json
@@ -1,12 +1,12 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/cms-kit.public",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/highlight.js": "~7.2.2",
- "@abp/star-rating-svg": "~7.2.2"
+ "@abp/highlight.js": "~7.3.0-rc.1",
+ "@abp/star-rating-svg": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json
index 34b1f8bd60..836bd53c93 100644
--- a/npm/packs/cms-kit/package.json
+++ b/npm/packs/cms-kit/package.json
@@ -1,12 +1,12 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/cms-kit",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/cms-kit.admin": "~7.2.2",
- "@abp/cms-kit.public": "~7.2.2"
+ "@abp/cms-kit.admin": "~7.3.0-rc.1",
+ "@abp/cms-kit.public": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json
index 7dd505cc3e..fbbf4885bf 100644
--- a/npm/packs/codemirror/package.json
+++ b/npm/packs/codemirror/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/codemirror",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"codemirror": "^5.65.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json
index 1a536d1cf2..521a334789 100644
--- a/npm/packs/core/package.json
+++ b/npm/packs/core/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/core",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/utils": "~7.2.2"
+ "@abp/utils": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json
index 8402d9b5a2..cf8c62b9cc 100644
--- a/npm/packs/cropperjs/package.json
+++ b/npm/packs/cropperjs/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/cropperjs",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"cropperjs": "^1.5.12"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json
index 995d386149..0624bf3dfe 100644
--- a/npm/packs/datatables.net-bs4/package.json
+++ b/npm/packs/datatables.net-bs4/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/datatables.net-bs4",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/datatables.net": "~7.2.2",
+ "@abp/datatables.net": "~7.3.0-rc.1",
"datatables.net-bs4": "^1.11.4"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json
index 0c4230d710..fde4dd595d 100644
--- a/npm/packs/datatables.net-bs5/package.json
+++ b/npm/packs/datatables.net-bs5/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/datatables.net-bs5",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/datatables.net": "~7.2.2",
+ "@abp/datatables.net": "~7.3.0-rc.1",
"datatables.net-bs5": "^1.11.4"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json
index 9574dc507b..41c5622561 100644
--- a/npm/packs/datatables.net/package.json
+++ b/npm/packs/datatables.net/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/datatables.net",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/jquery": "~7.2.2",
+ "@abp/jquery": "~7.3.0-rc.1",
"datatables.net": "^1.11.4"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json
index b3201d8d85..2fe488200d 100644
--- a/npm/packs/docs/package.json
+++ b/npm/packs/docs/package.json
@@ -1,15 +1,15 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/docs",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/anchor-js": "~7.2.2",
- "@abp/clipboard": "~7.2.2",
- "@abp/malihu-custom-scrollbar-plugin": "~7.2.2",
- "@abp/popper.js": "~7.2.2",
- "@abp/prismjs": "~7.2.2"
+ "@abp/anchor-js": "~7.3.0-rc.1",
+ "@abp/clipboard": "~7.3.0-rc.1",
+ "@abp/malihu-custom-scrollbar-plugin": "~7.3.0-rc.1",
+ "@abp/popper.js": "~7.3.0-rc.1",
+ "@abp/prismjs": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json
index ee26dd1605..456e98171f 100644
--- a/npm/packs/flag-icon-css/package.json
+++ b/npm/packs/flag-icon-css/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/flag-icon-css",
"publishConfig": {
"access": "public"
diff --git a/npm/packs/flag-icons/package.json b/npm/packs/flag-icons/package.json
index 3cdadb38e5..9ef9531436 100644
--- a/npm/packs/flag-icons/package.json
+++ b/npm/packs/flag-icons/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/flag-icons",
"publishConfig": {
"access": "public"
diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json
index 7287a461d7..41bf96d564 100644
--- a/npm/packs/font-awesome/package.json
+++ b/npm/packs/font-awesome/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/font-awesome",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"@fortawesome/fontawesome-free": "^5.15.4"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json
index d78ee56480..9077f2021a 100644
--- a/npm/packs/highlight.js/package.json
+++ b/npm/packs/highlight.js/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/highlight.js",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"@highlightjs/cdn-assets": "~11.4.0"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json
index 5e15e56095..3a969f88c5 100644
--- a/npm/packs/jquery-form/package.json
+++ b/npm/packs/jquery-form/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/jquery-form",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/jquery": "~7.2.2",
+ "@abp/jquery": "~7.3.0-rc.1",
"jquery-form": "^4.3.0"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json
index 399c7330ef..f4bb4507ba 100644
--- a/npm/packs/jquery-validation-unobtrusive/package.json
+++ b/npm/packs/jquery-validation-unobtrusive/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/jquery-validation-unobtrusive",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/jquery-validation": "~7.2.2",
+ "@abp/jquery-validation": "~7.3.0-rc.1",
"jquery-validation-unobtrusive": "^3.2.12"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json
index 2f703e3d0d..52916faa82 100644
--- a/npm/packs/jquery-validation/package.json
+++ b/npm/packs/jquery-validation/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/jquery-validation",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/jquery": "~7.2.2",
+ "@abp/jquery": "~7.3.0-rc.1",
"jquery-validation": "^1.19.3"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json
index 2d5909ec09..04bf77ef28 100644
--- a/npm/packs/jquery/package.json
+++ b/npm/packs/jquery/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/jquery",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"jquery": "~3.6.0"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json
index cf304811c4..17ab6e54e6 100644
--- a/npm/packs/jstree/package.json
+++ b/npm/packs/jstree/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/jstree",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/jquery": "~7.2.2",
+ "@abp/jquery": "~7.3.0-rc.1",
"jstree": "^3.3.12"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json
index 78723ce9f9..d1eb64e8be 100644
--- a/npm/packs/lodash/package.json
+++ b/npm/packs/lodash/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/lodash",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"lodash": "^4.17.21"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json
index d2da5bd57f..7406f57499 100644
--- a/npm/packs/luxon/package.json
+++ b/npm/packs/luxon/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/luxon",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"luxon": "^2.3.0"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json
index 4960f25126..770bfea6c6 100644
--- a/npm/packs/malihu-custom-scrollbar-plugin/package.json
+++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/malihu-custom-scrollbar-plugin",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"malihu-custom-scrollbar-plugin": "^3.1.5"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json
index 341c056f2d..f2c2b18fde 100644
--- a/npm/packs/markdown-it/package.json
+++ b/npm/packs/markdown-it/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/markdown-it",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"markdown-it": "^12.3.2"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/moment/package.json b/npm/packs/moment/package.json
index 886e40c8bf..5d3861d4fd 100644
--- a/npm/packs/moment/package.json
+++ b/npm/packs/moment/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/moment",
"repository": {
"type": "git",
diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json
index 22bb3c0d95..662cbd3c08 100644
--- a/npm/packs/owl.carousel/package.json
+++ b/npm/packs/owl.carousel/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/owl.carousel",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"owl.carousel": "^2.3.4"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json
index 3c72ecc2ce..c3b68f4486 100644
--- a/npm/packs/popper.js/package.json
+++ b/npm/packs/popper.js/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/popper.js",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"@popperjs/core": "^2.11.2"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json
index cb03d49d52..f637d6605e 100644
--- a/npm/packs/prismjs/package.json
+++ b/npm/packs/prismjs/package.json
@@ -1,12 +1,12 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/prismjs",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/clipboard": "~7.2.2",
- "@abp/core": "~7.2.2",
+ "@abp/clipboard": "~7.3.0-rc.1",
+ "@abp/core": "~7.3.0-rc.1",
"prismjs": "^1.26.0"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/qrcode/package.json b/npm/packs/qrcode/package.json
index 0c28932653..ba1f1cbbeb 100644
--- a/npm/packs/qrcode/package.json
+++ b/npm/packs/qrcode/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/qrcode",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2"
+ "@abp/core": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json
index 4c28d7b922..3691019aab 100644
--- a/npm/packs/select2/package.json
+++ b/npm/packs/select2/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/select2",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"select2": "^4.0.13"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json
index 9ed6d9573c..bd1eec98e2 100644
--- a/npm/packs/signalr/package.json
+++ b/npm/packs/signalr/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/signalr",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"@microsoft/signalr": "~6.0.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/slugify/package.json b/npm/packs/slugify/package.json
index b5dfaa9d22..b21e8e2392 100644
--- a/npm/packs/slugify/package.json
+++ b/npm/packs/slugify/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/slugify",
"publishConfig": {
"access": "public"
diff --git a/npm/packs/star-rating-svg/package.json b/npm/packs/star-rating-svg/package.json
index c28703316a..b58ea8aeb4 100644
--- a/npm/packs/star-rating-svg/package.json
+++ b/npm/packs/star-rating-svg/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/star-rating-svg",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/jquery": "~7.2.2",
+ "@abp/jquery": "~7.3.0-rc.1",
"star-rating-svg": "^3.5.0"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json
index 74213f583d..fb750a6d8c 100644
--- a/npm/packs/sweetalert2/package.json
+++ b/npm/packs/sweetalert2/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/sweetalert2",
"publishConfig": {
"access": "public"
@@ -10,7 +10,7 @@
"directory": "npm/packs/sweetalert2"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"sweetalert2": "^11.3.6"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json
index b8b835b0d0..4821ec0672 100644
--- a/npm/packs/timeago/package.json
+++ b/npm/packs/timeago/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/timeago",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/jquery": "~7.2.2",
+ "@abp/jquery": "~7.3.0-rc.1",
"timeago": "^1.6.7"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json
index 62b7922716..2c45f06c9a 100644
--- a/npm/packs/toastr/package.json
+++ b/npm/packs/toastr/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/toastr",
"repository": {
"type": "git",
@@ -10,7 +10,7 @@
"access": "public"
},
"dependencies": {
- "@abp/jquery": "~7.2.2",
+ "@abp/jquery": "~7.3.0-rc.1",
"toastr": "^2.1.4"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json
index 8cb8743eab..2dc43e3c2e 100644
--- a/npm/packs/tui-editor/package.json
+++ b/npm/packs/tui-editor/package.json
@@ -1,12 +1,12 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/tui-editor",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/jquery": "~7.2.2",
- "@abp/prismjs": "~7.2.2"
+ "@abp/jquery": "~7.3.0-rc.1",
+ "@abp/prismjs": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json
index f6b969a052..b5b0663f57 100644
--- a/npm/packs/uppy/package.json
+++ b/npm/packs/uppy/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/uppy",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/core": "~7.2.2",
+ "@abp/core": "~7.3.0-rc.1",
"uppy": "^1.16.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json
index 0b1c8df0fa..33a1f7166c 100644
--- a/npm/packs/utils/package.json
+++ b/npm/packs/utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@abp/utils",
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"scripts": {
"prepublishOnly": "yarn install --ignore-scripts && node prepublish.js",
"ng": "ng",
@@ -55,7 +55,7 @@
"zone.js": "~0.10.2"
},
"dependencies": {
- "just-compare": "^1.3.0"
+ "just-compare": "^2.3.0"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/vee-validate/package.json b/npm/packs/vee-validate/package.json
index c0243f55b7..cad72cd4b3 100644
--- a/npm/packs/vee-validate/package.json
+++ b/npm/packs/vee-validate/package.json
@@ -1,11 +1,11 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/vee-validate",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/vue": "~7.2.2",
+ "@abp/vue": "~7.3.0-rc.1",
"vee-validate": "~3.4.4"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json
index aba3328ccb..a934ebddeb 100644
--- a/npm/packs/virtual-file-explorer/package.json
+++ b/npm/packs/virtual-file-explorer/package.json
@@ -1,12 +1,12 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/virtual-file-explorer",
"publishConfig": {
"access": "public"
},
"dependencies": {
- "@abp/clipboard": "~7.2.2",
- "@abp/prismjs": "~7.2.2"
+ "@abp/clipboard": "~7.3.0-rc.1",
+ "@abp/prismjs": "~7.3.0-rc.1"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}
diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json
index f0b6d848e5..8787dffbb6 100644
--- a/npm/packs/vue/package.json
+++ b/npm/packs/vue/package.json
@@ -1,5 +1,5 @@
{
- "version": "7.2.2",
+ "version": "7.3.0-rc.1",
"name": "@abp/vue",
"publishConfig": {
"access": "public"
diff --git a/npm/publish-mvc.ps1 b/npm/publish-mvc.ps1
index c09140d8c4..ee12fc67c3 100644
--- a/npm/publish-mvc.ps1
+++ b/npm/publish-mvc.ps1
@@ -13,7 +13,7 @@ if (-Not $Version) {
}
if (-Not $Registry) {
- $Registry = "http://0.0.0.0:4873/";
+ $Registry = "https://registry.npmjs.org";
}
$PacksPublishCommand = "npm run lerna -- exec 'npm publish --registry $Registry'"
diff --git a/nupkg/0 b/nupkg/0
index cf175e3b0b..ca9053508c 100644
Binary files a/nupkg/0 and b/nupkg/0 differ
diff --git a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip
index 03c43ed265..c02f604ab7 100644
Binary files a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip and b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip
index 6e52e6ef88..e96c9f84a9 100644
Binary files a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip and b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip
index 2844e58537..5fb2db3113 100644
Binary files a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip and b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip b/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip
index 016e07806d..6d23fe7814 100644
Binary files a/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip and b/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip
index 0ed353e191..d81a686cdf 100644
Binary files a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip and b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip
index cae7e6e4b9..a82385e7da 100644
Binary files a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip and b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip
index e79c61bc8e..48b76c8691 100644
Binary files a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip and b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip
index ea4724d94b..12b6fbe0fe 100644
Binary files a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip and b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip
index 1b8a393b85..134a5f493c 100644
Binary files a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip and b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip
index b615247051..0176b7f33b 100644
Binary files a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip and b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip
index e58ac8705f..e9b74048b8 100644
Binary files a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip and b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip
index c487a66edb..97a834dea9 100644
Binary files a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip and b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip
index caeb953bb4..7cdbcec6f6 100644
Binary files a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip and b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip differ
diff --git a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip
index cb64f8acd2..fa5910d005 100644
Binary files a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip and b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip differ
diff --git a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip
index 285d39c453..ebb5f0aac9 100644
Binary files a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip and b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip differ
diff --git a/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip b/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip
index 60784999d5..942436f732 100644
Binary files a/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip and b/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip differ
diff --git a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip
index 68c13e97e2..db69a5931b 100644
Binary files a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip and b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip differ
diff --git a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip
index 3c43744762..e2d80cd78c 100644
Binary files a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip and b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
index ba6c025b2a..06e7905bc9 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
@@ -22,8 +22,8 @@
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
index dec1bdf89b..5ddc04cc03 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
@@ -22,8 +22,8 @@
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj
index e94c6263b3..b41c4c33f1 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj
@@ -21,7 +21,7 @@
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj
index e617e54628..b35c2f4409 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj
@@ -74,7 +74,7 @@
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj
index bec5f3b035..23b7888885 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj
@@ -75,7 +75,7 @@
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
index e46bd981b0..e0fcdbe948 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
@@ -70,7 +70,7 @@
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
index 8b58b3fd8c..e129b4c456 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
@@ -71,7 +71,7 @@
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
index 3750fe7c48..8de870097d 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
@@ -18,7 +18,7 @@
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
index 52cb621034..836102dfc1 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
@@ -18,7 +18,7 @@
diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json
index 93ee97b436..e39fadb930 100644
--- a/templates/app/angular/package.json
+++ b/templates/app/angular/package.json
@@ -20,7 +20,7 @@
"@abp/ng.setting-management": "7.3.0-rc.1",
"@abp/ng.tenant-management": "7.3.0-rc.1",
"@abp/ng.theme.shared": "7.3.0-rc.1",
- "@abp/ng.theme.lepton-x": "~2.3.6",
+ "@abp/ng.theme.lepton-x": "~2.3.0-rc.1",
"@angular/animations": "^16.0.2",
"@angular/common": "^16.0.2",
"@angular/compiler": "^16.0.2",
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj
index 64a0a16c5a..d55f24752d 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj
@@ -44,7 +44,7 @@
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
index 31806b5774..c72bbb8212 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
@@ -30,8 +30,8 @@
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
index 624702c260..e97bb32a25 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
@@ -28,8 +28,8 @@
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
index 7673cd5e2a..76c1174aa2 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
@@ -24,7 +24,7 @@
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj
index 6144f06c1a..6e9cfdf11b 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj
@@ -26,7 +26,7 @@
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
index 68684e41de..ee1ba88c1b 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
@@ -28,7 +28,7 @@
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
index e553ed940c..989e9e585c 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
@@ -42,7 +42,7 @@