diff --git a/.gitignore b/.gitignore index 3f8d0ff6cb..ccb98f81a0 100644 --- a/.gitignore +++ b/.gitignore @@ -323,3 +323,7 @@ deploy/npm-auth-token.txt deploy/ssh-password.txt deploy/github-api-key.txt deploy/_run_all_log.txt + + +# No commit yarn.lock files in the subfolders of templates directory +templates/**/yarn.lock \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json index bb2e4077cc..b363aa0c64 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json @@ -316,14 +316,12 @@ "TrialLicenseStatusFilter": "地位", "TrialLicenseStartDateFilter": "开始日期", "TrialLicenseEndDateFilter": "结束日期", - "FirsName": "名", + "FirstName": "名字", "LastName": "姓", "StartDate": "开始日期", "EndDate": "结束日期", "PurchasedDate": "购买日期", "OrganizationDetail": "组织详情", - "SendActivationMail": "发送激活邮件", - "ActivationMailSentSuccessfully": "激活邮件发送成功！", "TrialLicenseStatus": "试用许可证状态", "TrialLicenseDetail": "试用许可证详情", "AcceptsMarketingCommunications": "营销传播", @@ -337,17 +335,68 @@ "Expired": "已到期", "TrialLicenseDeletionWarningMessage": "您确定要删除试用许可证吗？试用许可证、组织、支持帐户将被删除！", "LicenseCategoryFilter": "执照类别", - "Volo.AbpIo.Commercial:030000": "您已经使用了试用期。", - "Volo.AbpIo.Commercial:030001": "此组织名称已存在。", - "Volo.AbpIo.Commercial:030002": "一旦激活，试用许可证不能设置为请求！", - "Volo.AbpIo.Commercial:030003": "没有这种状态！", - "Volo.AbpIo.Commercial:030004": "由于意外错误，无法更改状态！", - "Volo.AbpIo.Commercial:030005": "当试用许可证处于 -activated- 状态时，可以更新开始和结束日期！", - "Volo.AbpIo.Commercial:030006": "结束日期必须始终大于开始日期！", - "Volo.AbpIo.Commercial:030007": "此试用许可证已激活一次！", - "Volo.AbpIo.Commercial:030008": "购买日期只能在状态为已购买时设置！", - "Volo.AbpIo.Commercial:030009": "未找到用户！", - "Volo.AbpIo.Commercial:030010": "要购买试用许可证，首先您需要激活您的试用许可证！", - "Volo.AbpIo.Commercial:030011": "购买后，您无法删除试用许可证！" + "Permission:SendWelcomeEmail": "发送欢迎邮件", + "SendWelcomeEmail": "发送欢迎邮件", + "SendWelcomeEmailWarningMessage": "你确定要发送欢迎邮件给组织成员吗？", + "SendWelcomeEmailSuccessMessage": "欢迎邮件发送成功！", + "Activate": "激活", + "ActivateTrialLicenseWarningMessage": "激活试用版权限后，将发送欢迎邮件给用户。你确定要激活吗？", + "ActivateTrialLicenseSuccessMessage": "激活成功，欢迎邮件已发送给组织成员。", + "PaymentRequestId": "付款请求编号", + "AdditionalDeveloperCount": "额外开发者数量", + "LicensePrice": "版权价格", + "PurchaseDate": "购买日期", + "IsAbpBookDownloaded": "ABP书籍已下载", + "IsMasteringAbpBookDownloadEnabled": "ABP书籍下载已启用", + "Permission:Accounting:CustomPaymentLinkGenerator": "自定义付款链接", + "CustomPaymentLink": "自定义付款链接", + "Menu:CustomPaymentLink": "自定义付款链接", + "Amount": "金额", + "GenerateCustomPaymentLink": "生成自定义付款链接", + "GeneratedPaymentLink": "生成的付款链接", + "CopyText": "复制文本", + "Permission:CommunityEvents": "活动", + "Menu:Events": "活动", + "Events": "活动", + "EventType": "活动类型", + "Number": "数量", + "RegistrationURL": "报名网址", + "URL": "网址", + "EventDeletionConfirmationMessage": "你确定要删除这个活动吗？", + "Enum:EventType:0": "社区讲话", + "CreateAnEvent": "创建一个活动", + "Permission:CommunitySpeakers": "演讲者", + "CreateASpeaker": "创建一个演讲者", + "Speakers": "演讲者", + "Image": "图片", + "GithubURL": "Github网址", + "SpeakerDeletionConfirmationMessage": "你确定要删除这个演讲者吗？", + "Menu:Speakers": "演讲者", + "ChooseSpeakerImage": "选择一个演讲者图片...", + "SpeakerImage": "演讲者图片", + "AddSpeaker": "添加演讲者", + "ShowPurchaseItemsOfOrganizations": "购买项目", + "Enum:OrganizationPurchaseState:0": "未送达", + "Enum:OrganizationPurchaseState:1": "已送达", + "PurchaseItems": "购买项目", + "SuccessfullyUpdated": "成功更新", + "SuccessfullyAdded": "成功添加", + "PurchaseState": "购买状态", + "ShowBetweenDayCount": "显示之间的天数", + "PurchaseOrder": "购买订单", + "ShowCreateInvoiceOfOrganization": "创建发票", + "ShowCreateQuotationOfOrganization": "创建报价单", + "BookDiscounts": "书籍折扣", + "Permission:BookDiscount": "书籍折扣", + "Menu:BookDiscounts": "书籍折扣", + "BookType": "书籍类型", + "PurchasePlatform": "购买平台", + "StartTime": "开始时间", + "EndTime": "结束时间", + "CreateABookDiscount": "创建一个书籍折扣", + "BookDiscountDeletionConfirmationMessage": "你确定要删除这个书籍折扣吗？", + "CustomPaymentFlexSwitchDescription": "授权", + "AllowFeatureUpgradeOnLicenseExpire": "允许在授权过期时进行功能升级", + "Deleted{0}": "[已删除 {0}]" } } \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json index 2ea126df0f..989a63bb80 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json @@ -161,6 +161,9 @@ "Error_Page_500_Title": "好像出了什么问题！", "Error_Page_500_Description_1": "我们会自动跟踪这些错误，但如果问题仍然存在，请随时
联系我们。 与此同时，尝试刷新。", "Error_Page_500_Description_2": "通过 info@abp.io 与我们联系。", - "Books": "书籍" + "Books": "书籍", + "ABPDiscordServer": "ABP Discord 服务器", + "ABPCommunityTalks": "ABP社区讲话", + "ABPCommunityPosts": "ABP社区文章" } } \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json index 924306634e..bd1794cd36 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json @@ -137,7 +137,6 @@ "Success": "成功", "WeWillReplyYou": "你的消息已经发送! 我们会在短时间内给你答复.", "GoHome": "回到主页面", - "Home": "主页", "CreateLiveDemo": "创建在线演示", "RegisterToTheNewsletter": "注册到时事简报以获取有关ABP.IO的消息,比如新发布的内容.", "EnterYourEmailOrLogin": "输入你的e-mail地址来创建你的演示或者使用你的已有账号登录.", @@ -184,6 +183,7 @@ "ChangingLicenseType": "将来更改我的许可类型吗?", "ChangingLicenseTypeExplanation": "你始终可以在同一许可中添加新的开发人员. 参阅 \"有多少开发者可以参与ABP商业版工作?\". 你还可以通过支付计算出的价格差来升级到更高的许可. 当你升级到更高的许可计划时,可以享受新计划的好处,但是许可升级不会更改许可的到期日期.", "LicenseExtendUpgradeDiff": "许可扩展和升级有什么区别?", + "LicenseExtendUpgradeDiffExplanation": "延长： 你通过延长/续费你的许可证，你将继续获得高级支持和主要或次要更新模块和主题。除此之外，你还将继续创建新的项目。并且你仍然可以使用ABP Suite，这将加快你的开发。当你延长你的许可证时，1年将添加到你的许可证到期日。
升级： 你通过升级你的许可证，你将晋升到更高的许可证方案，这将允许你获得额外的奖励。查看许可证比较表来查看许可证方案之间的差异。但是，当你升级时，你的许可证到期日不会更改！要延长你的许可证结束日期，你需要延长你的许可证。", "LicenseRenewalCost": "一年后的许可续期费用是多少?", "LicenseRenewalCostExplanation": "标准 Team 许可证的续订（扩展）价格为 ${0}，标准 Business License 为 ${1}，标准 Enterprise License 为 ${2}。 如果您已经是客户，请登录您的帐户查看可用的续订价格。", "HowDoIRenewMyLicense": "如何续费我的许可证?", @@ -195,10 +195,19 @@ "IsSourceCodeIncludedExplanation4": "

将模块的源代码包含到解决方案中,可以最大程度地自定义该模块. 但是当新版本发布时,将无法自动升级模块.

这些许可均不包含ABP Suite源代码,该源代码是一个外部工具,可以为你生成代码并帮助你进行开发

有关许可类型之间的其它差异查看定价页面.

", "ChangingDevelopers": "我将来可以更改我组织的注册开发人员吗?", "ChangingDevelopersExplanation": "除了将新的开发人员添加到你的许可中之外,你还可以更改现有的开发人员(可以删除一个开发人员并将新的开发人员添加到同一位置),而无需任何额外费用.", + "WhatHappensWhenLicenseEnds": "我的许可证期间结束时，会发生什么？", + "WhatHappensWhenLicenseEndsExplanation1": "你的ABP商业许可证是一个永久许可证。你的许可证到期后，你可以继续开发你的项目。并且你不需要续费你的许可证。你的许可证是一年更新和支持方案默认的。为了继续获得新的功能，性能改进，修复，支持和继续使用ABP Suite，你需要续费你的许可证。你的许可证到期后，你将失去以下功能：", + "WhatHappensWhenLicenseEndsExplanation2": "你不能使用ABP商业创建新的解决方案，但是你可以继续开发你现有的应用程序。", + "WhatHappensWhenLicenseEndsExplanation3": "你将能够获得模块和主题的更新（除了RC或预览版本）。例如，如果你使用模块的v3.2.0版本，你仍然可以获得v3.2.x版本的更新（v3.2.1，v3.2.5...等等）。但是，你不能获得下一个主要或次要版本的更新（例如v3.3.0，v3.3.3，4.x.x...等等）。例如，你的许可证到期后，最新的发行是v4.4.3，之后，它发布了4.4.4版本和4.5.0版本，你将能够访问v4.4.X，但你不能访问v4.5.X。", + "WhatHappensWhenLicenseEndsExplanation4": "你不能在你的许可证到期后安装ABP商业平台上添加的新模块和主题。", + "WhatHappensWhenLicenseEndsExplanation5": "你不能使用ABP Suite。", + "WhatHappensWhenLicenseEndsExplanation6": "你不能再获得高级支持。", + "WhatHappensWhenLicenseEndsExplanation7": "如果你想继续获得这些奖励，你可以继续续费你的许可证。如果你在许可证到期后1个月内续费，将会应用以下折扣：团队许可证{0}%折扣，商业许可证{1}%折扣，企业许可证{2}%折扣。", "WhatHappensWhenLicenseEndsExplanation8": "您生成的 ABP 项目未存储在我们的服务器上。 因此，您有责任保留下载的源代码。 当您的许可证到期时，将无法获取您生成的 ABP 项目源代码。", "WhenShouldIRenewMyLicense": "我什么时候应该续订我的许可?", "WhenShouldIRenewMyLicenseExplanation": "如果您在许可证到期后 1 个月内续订许可证，将享受以下折扣：团队许可证 {0}% 折扣、商业许可证 {1}% 折扣、企业许可证 {2}% 折扣 . 如果您在许可证到期后 1 个月续订许可证，续订价格将与许可证购买价格相同，并且续订不会有折扣。", "TrialPlan": "你们有试用计划吗?", + "TrialPlanExplanation": "ABP商业团队许可证有14天的试用期。若要了解更多信息，请访问这里。此外，我们为团队许可证提供30天的金额返还保证。你只需要在30天内请求退款。商业和企业许可证将提供60%的金额返还保证。这是因为商业和企业许可证包含了所有模块和主题的全部源代码。", "DoYouAcceptBankWireTransfer": "你们接受银行电汇吗?", "DoYouAcceptBankWireTransferExplanation": "是的，我们接受银行电汇。
在通过银行转账发送许可费后，将您的收据和所需的许可类型通过电子邮件发送至accounting@abp.io。 我们的国际银行账户信息：", "HowToUpgrade": "可用新版本时如何升级现有应用程序?", @@ -365,7 +374,9 @@ "CompanySize": "公司规模", "Next": "下一个", "StartTrial": "开始我的免费试用", + "ContactUsQuestions": "如果你有任何问题，请联系我们", "TrialActivatedWarning": "亲爱的{0}，用户只能享受 1 个免费试用期。您已经使用了试用期。", + "ActivationRequirement": "你已经距离开始你的试用还有最后一步。
检查你的信息后，我们将激活你的许可证。一旦你的许可证激活，我们将向{0}发送电子邮件。请不要担心，这个过程不会太久！", "SaveAndDownload": "保存和下载", "CompanyNameValidationMessage": "公司名称太长！", "AddressValidationMessage": "地址太长！", @@ -389,6 +400,7 @@ "UserDeveloperDescription": "“开发人员”可以在 ABP 商业版项目中编写代码，下载 ABP 示例项目，并在支持的网站上进行提问。 然而另一方面，“开发者”无法管理这个组织。", "RemoveCurrentUserFromOrganizationWarningMessage": "您正在将自己从自己的组织中移除。 您将无法再管理此组织，您确定吗？", "RenewExistingOrganizationOrCreateNewOneMessage": "您可以通过单击下面的 \"立即延长\"按钮来更新您组织的许可证，因此您可以将许可证到期日期延长 1 年。 如果您继续结帐，您将拥有一个新的组织。 您想继续开始新的组织许可吗？", + "PurchaseTrialOrganizationOrCreateNewOneMessage": "你有试用许可证。如果你想购买试用许可证，请点击“立即购买”按钮。如果你继续支付，你将会有一个新的组织。你想继续使用一个新的组织吗？", "ExtendNow": "立即延长", "CreateNewOrganization": "建立新的组织", "RenewLicenseEarly": "如果我提前更新我的许可证，我会得到一整年吗？", @@ -524,6 +536,7 @@ "Pricing_Page_Testimonial_2": "我们看到了使用 ABP Commercial 能减少定制开发项目开销的价值。 并且团队能够在不同的项目流中统一代码模式。 我们在框架中看到了能比以前更快地构建新功能的更多潜力。 我们相信我们将会持续地看到使用 ABP Commercial 的价值。", "Pricing_Page_Testimonial_3": "我们大爱 ABP。 我们不必从头开始编写所有内容。 我们从\"开箱即用\"的功能开始，只需关注我们真正需要编写的内容。 此外，ABP 架构良好，代码质量高，错误少。 如果我们需要自己来编写所需的一切，我们可能需要花费数年时间。 另一点让我们喜欢的是新版本、问题修复或改进每隔一周很快地就会出现。 我们不会等太久。", "Pricing_Page_Testimonial_4": "ABP 商业版 是一款很值得推荐的出色产品。 是在一个可配置的平台上为我们的客户推向市场的商业产品。 其框架和工具为任何团队提供的快速启动值得每一分钱。 ABP 商业版 最适合我们的需求。", + "Pricing_Page_Testimonial_5": "ABP Framework 不仅是一个框架，它还是项目开发/管理的指南，因为它提供了 DDD、GenericRepository、DI、微服务和模块化培训。 即使你不打算使用框架本身，你也可以通过 docs.abp.io 进行自己的开发，该文档已经做好了专业的准备（OpenIddict、Redis、Quartz 等）。 因为很多东西都是预先构建的，它大大缩短了项目开发时间（例如登录页面、异常处理、数据过滤、种子、审计日志、本地化、自动 API 控制器等）。 作为我们应用程序的一个示例，我使用本地事件总线进行库存控制。 因此我可以通过编写库存处理程序来管理订单移动。 不为 CreationTime，CreatorId 浪费时间真是太好了。 它们正在自动填充。", "AbpBookDownloadArea_ClaimYourEBook": "领取您的掌握ABP框架电子书", "AddMemberModal_Warning_1": "如果您尝试添加的用户名在系统中不存在，请让您的团队成员在 {0} 并与您分享他/她帐户的用户名。", "MyOrganizations_Detail_WelcomeMessage": "欢迎加入您的组织，{0}", @@ -591,6 +604,9 @@ "TrainingDetailsHeaderInfo_TrainingHour": "{0} 小时", "Trainings_Content": "培训内容", "Trial_Page_StartYourFreeTrial": "开始您的免费试用", + "TrialLicenseFeatures": "你将能够享受所有 ABP 商业特性", + "TrialPeriodDays": "你将有 {0} 天的团队许可证", + "TrialForumSupportIncident": "你将有 {0} 个论坛支持事件", "Contact_Page_Title": "联系 ABP 开发团队", "Contact_Page_Description": "如果您需要任何帮助或分享您的想法和意见，请与 ABP 开发团队联系！ ABP 支持团队随时准备提供帮助。", "Demo_Page_Title": "创建演示", @@ -712,6 +728,13 @@ "Landing_Page_PaymentModuleDescription_1": "为不同的支付网关提供集成。", "Landing_Page_PaymentModuleDescription_2": "该模块提供支付网关的集成，因此您可以轻松地从客户那里获得付款。", "Landing_Page_PaymentModuleDescription_3": "该模块支持以下支付网关", - "Welcome_Page_UseSameCredentialForCommercialWebsites": "commercial.abp.io 和 support.abp.io使用相同的凭据。" + "Welcome_Page_UseSameCredentialForCommercialWebsites": "commercial.abp.io 和 support.abp.io使用相同的凭据。", + "WatchCrudPagesVideo": "观看“创建 CRUD 页面的 ABP Suite”视频！", + "WatchGeneratingFromDatabaseVideo": "观看”ABP Suite：从现有数据库表生成 CRUD 页面”视频！", + "WatchTakeCloserLookVideo": "观看“详细了解ABP Suite 的代码生成”视频！", + "ConfirmedEmailAddressRequiredToStartTrial": "你应该有一个确认的电子邮件地址，以便开始试用许可证。", + "EmailVerificationMailNotSent": "电子邮件验证邮件不能发送。", + "GetConfirmationEmail": "点击这里获取确认邮件 如果你还没有收到。", + "WhichLicenseTypeYouAreInterestedIn": "你感兴趣的许可证类型是什么？" } -} +} \ No newline at end of file diff --git a/build/common.ps1 b/build/common.ps1 index 01a7565fba..61d9cf03d2 100644 --- a/build/common.ps1 +++ b/build/common.ps1 @@ -20,8 +20,7 @@ $solutionPaths = @( "../modules/background-jobs", "../modules/account", "../modules/cms-kit", - "../modules/blob-storing-database", - "../studio" + "../modules/blob-storing-database" ) if ($full -eq "-f") diff --git a/common.props b/common.props index b68580bb2a..e6c9c40c28 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 6.0.0-rc.3 + 6.0.0 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ diff --git a/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md b/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md index 3d99e1e3cf..251a84510b 100644 --- a/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md +++ b/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md @@ -86,7 +86,7 @@ Defining multiple connections is allowed. In this case, you can specify the conn This allows you to use multiple RabbitMQ server in your application, but select one of them for the event bus. -You can use any of the [ConnectionFactry](http://rabbitmq.github.io/rabbitmq-dotnet-client/api/RabbitMQ.Client.ConnectionFactory.html#properties) properties as the connection properties. +You can use any of the [ConnectionFactory](http://rabbitmq.github.io/rabbitmq-dotnet-client/api/RabbitMQ.Client.ConnectionFactory.html#properties) properties as the connection properties. **Example: Specify the connection port** @@ -151,4 +151,4 @@ Configure(options => }); ```` -Using these options classes can be combined with the `appsettings.json` way. Configuring an option property in the code overrides the value in the configuration file. \ No newline at end of file +Using these options classes can be combined with the `appsettings.json` way. Configuring an option property in the code overrides the value in the configuration file. diff --git a/docs/en/Migration-Guides/Abp-6_0.md b/docs/en/Migration-Guides/Abp-6_0.md index 1436990e56..f589bca2cd 100644 --- a/docs/en/Migration-Guides/Abp-6_0.md +++ b/docs/en/Migration-Guides/Abp-6_0.md @@ -2,13 +2,13 @@ This document is a guide for upgrading ABP v5.3 solutions to ABP v6.0. There is a change in this version that may affect your applications, please read it carefully and apply the necessary changes to your application. -## Added IsActive property +## The IsActive property is Added -`IsActive` property is added to `IUserData`. This property is set to **true** by default. **Cmskit** and **Blog** modules are affected by this change. You need to add new migration to your existing application if you are using any of these modules. Please see [#11417](https://github.com/abpframework/abp/pull/11417) for more info. +`IsActive` property is added to `IUserData`. This property is set to **true** by default. **Cmskit** and **Blog** modules are affected by this change. You need to add a new migration to your existing application if you are using any of these modules. Please see [#11417](https://github.com/abpframework/abp/pull/11417) for more info. ## Default behavior change in MultiTenancyMiddlewareErrorPageBuilder -If you have customized the `MultiTenancyMiddlewareErrorPageBuilder` of `AbpMultiTenancyOptions`, the pipeline now returns **true** to stop the pipeline as the default behavior. See [AbpMultiTenancyOptions: Handle inactive and non-existent tenants](https://github.com/abpframework/abp/blob/dev/docs/en/Multi-Tenancy.md#abpmultitenancyoptions-handle-inactive-and-non-existent-tenants) for more info. +If you have customized the `MultiTenancyMiddlewareErrorPageBuilder` of the `AbpMultiTenancyOptions`, the pipeline now returns **true** to stop the pipeline as the default behavior. See [AbpMultiTenancyOptions: Handle inactive and non-existent tenants](https://github.com/abpframework/abp/blob/dev/docs/en/Multi-Tenancy.md#abpmultitenancyoptions-handle-inactive-and-non-existent-tenants) for more info. ## Migrating to LeptonX Lite @@ -22,7 +22,7 @@ LeptonX Lite is now being introduced and you can follow the guides below to migr After the [announcement of plan to replace the IdentityServer](https://github.com/abpframework/abp/issues/11989), we have successfully implemented [Openiddict](https://github.com/openiddict/openiddict-core) as a replacement for IdentityServer4 as an OpenID-Provider. -You can follow the [IdentityServer to OpenIddict Step by Step Guide](OpenIddict-Step-by-Step.md) for migrating your existing application in detail with a sample projects. +You can follow the [IdentityServer to OpenIddict Step by Step Guide](OpenIddict-Step-by-Step.md) for migrating your existing application in detail with a sample project. ## See Also diff --git a/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md b/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md index 3567ea5c06..7a36b250c9 100644 --- a/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md +++ b/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md @@ -7,6 +7,11 @@ We are not removing Identity Server packages and we will continue to release new On the other hand, Identity Server ends support for the open-source Identity Server at the end of 2022. The Identity Server team has decided to move to Duende IDS and ABP will not be migrated to the commercial Duende IDS. You can see the Duende Identity Server announcement from [this link](https://blog.duendesoftware.com/posts/20220111_fair_trade). +## Commercial Template + +If you are using a commercial template, please check [Migrating from IdentityServer to OpenIddict for the Commercial Templates](https://docs.abp.io/en/commercial/6.0/migration-guides/openIddict-step-by-step) guide. +If you are using the microservice template, please check [Migrating the Microservice Template from IdentityServer to OpenIddict](https://docs.abp.io/en/commercial/6.0/migration-guides/openIddict-microservice) guide. + ## OpenIddict Migration Steps Use the `abp update` command to update your existing application. See [Upgrading docs](../Upgrading.md) for more info. Apply required migrations by following the [Migration Guides](Index.md) based on your application version. @@ -73,7 +78,7 @@ Use the `abp update` command to update your existing application. See [Upgrading #### OpenIddictDataSeedContributor -- Create a folder named *OpenIddict* under the Domain project and copy the [OpenIddictDataSeedContributor.cs](https://github.com/abpframework/abp-samples/blob/master/Ids2OpenId/src/Ids2OpenId.Domain/OpenIddict/OpenIddictDataSeedContributor.cs) under this folder. Rename all the `Ids2OpenId` with your project name. +- Create a folder named *OpenIddict* under the Domain project and copy the [OpenIddictDataSeedContributor.cs](https://github.com/abpframework/abp-samples/blob/master/Ids2OpenId/src/Ids2OpenId.Domain/OpenIddict/OpenIddictDataSeedContributor.cs) under this folder. **Rename** all the `Ids2OpenId` with your project name. - Delete *IdentityServer* folder that contains `IdentityServerDataSeedContributor.cs` which is no longer needed. You can also create a project with the same name and copy the `OpenIddict` folder of the new project into your project. @@ -213,6 +218,30 @@ for creating the host builder. Replace **MyApplication** with your application name. +### Test Project + +- In **MyApplicationTestBaseModule.cs** **remove** the IdentityServer related using and PreConfigurations: + + ```csharp + using Volo.Abp.IdentityServer; + ``` + + and + + ```csharp + PreConfigure(options => + { + options.AddDeveloperSigningCredential = false; + }); + + PreConfigure(identityServerBuilder => + { + identityServerBuilder.AddDeveloperSigningCredential(false, System.Guid.NewGuid().ToString()); + }); + ``` + + from `PreConfigureServices`. + ### UI Layer - [Angular UI Migration](OpenIddict-Angular.md) diff --git a/docs/en/Themes/LeptonXLite/AspNetCore.md b/docs/en/Themes/LeptonXLite/AspNetCore.md index eeaf55f545..f480141120 100644 --- a/docs/en/Themes/LeptonXLite/AspNetCore.md +++ b/docs/en/Themes/LeptonXLite/AspNetCore.md @@ -9,22 +9,22 @@ LeptonX Lite has implementation for the ABP Framework Razor Pages. It's a simpli This theme is **already installed** when you create a new solution using the startup templates. If you are using any other template, you can install this theme by following the steps below: -- Add **Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite** package to your **Web** application. +- Add the **Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite** package to your **Web** application. ```bash dotnet add package Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite --prerelease ``` -- Remove **Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic** reference from the project since it's not necessary after switching to LeptonX Lite. +- Remove the **Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic** reference from the project since it's not necessary after switching to LeptonX Lite. - Make sure the old theme is removed and LeptonX is added in your Module class. ```diff [DependsOn( - // Remove BasicTheme module from DependsOn attribute + // Remove the BasicTheme module from DependsOn attribute - typeof(AbpAspNetCoreMvcUiBasicThemeModule), - // Add LeptonX Lite module to DependsOn attribute + // Add the LeptonX Lite module to DependsOn attribute + typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), )] ``` @@ -35,9 +35,9 @@ dotnet add package Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite --prerelease Configure(options => { options.StyleBundles.Configure( - // Remove following line + // Remove the following line - BasicThemeBundles.Styles.Global, - // Add following line instead + // Add the following line instead + LeptonXLiteThemeBundles.Styles.Global bundle => { @@ -47,10 +47,24 @@ Configure(options => }); ``` ---- - ## Customization +### Layouts + +LeptonX Lite Mvc provides **layouts** for your **user interface** based [ABP Framework Theming](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Theming). You can use **layouts** to **organize your user interface**. + +The main responsibility of a theme is to **provide** the layouts. There are **three pre-defined layouts that must be implemented by all the themes:** + +* **Application:** The **default** layout which is used by the **main** application pages. + +* **Account:** Mostly used by the **account module** for **login**, **register**, **forgot password**... pages. + +* **Empty:** The **Minimal** layout that **has no layout components** at all. + +**Layout names** are **constants** defined in the `LeptonXLiteTheme` class in the **Mvc** project **root**. + +> The layout pages define under the `Themes/LeptonXLite/Layouts` folder and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + ### Toolbars LeptonX Lite includes separeted toolbars for desktop & mobile. You can manage toolbars independently. Toolbar names can be accessible in the **LeptonXLiteToolbars** class. @@ -74,3 +88,128 @@ public class MyProjectNameMainToolbarContributor : IToolbarContributor } } ``` +# LeptonX Lite Mvc Components + +Abp **helps** you make **highly customizable UI**. You can easily **customize** your themes to fit your needs. **The Virtual File System** makes it possible to **manage files** that **do not physically** exist on the **file system** (disk). It's mainly used to embed **(js, css, image..)** files into assemblies and **use them like** physical files at runtime. An application (or another module) can **override** a **virtual file of a module** just like placing a file with the **same name** and **extension** into the **same folder** of the **virtual file**. + +LeptonX Lite is built on the [Abp Framework](https://abp.io/), so you can **easily** customize your Asp.Net Core Mvc user interface by following [Abp Mvc UI Customization](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Customization-xUser-Interface). + +## Brand Component + +The **brand component** is a simple component that can be used to display your brand. It contains a **logo** and a **company name**. + +![Brand component](../../images/leptonxlite-brand-component.png) + +### How to override the Brand Component in LeptonX Lite Mvc + +* The **brand component page (.cshtml file)** is defined in the `Themes/LeptonXLite/Components/Brand/Default.cshtml` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +* The **brand component (C# file)** is defined in the `Themes/LeptonXLite/Components/Brand/MainNavbarBrandViewComponent.cs` file and you can **override it** by creating a file with the **same name** and under the **same folder**. + +## Breadcrumb Component + +On websites that have a lot of pages, **breadcrumb navigation** can greatly **enhance the way users find their way** around. In terms of **usability**, breadcrumbs reduce the number of actions a website **visitor** needs to take in order to get to a **higher-level page**, and they **improve** the **findability** of **website sections** and **pages**. + +![Breadcrumb component](../../images/leptonxlite-breadcrumb-component.png) + +### How to override the Breadcrumb Component in LeptonX Lite Mvc + +* The **breadcrumb component page (.cshtml file)** is defined in the `Themes/LeptonXLite/Components/Breadcrumbs/Default.cshtml` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +* The **breadcrumb component (C# file)** is defined in the `Themes/LeptonXLite/Components/Breadcrumbs/BreadcrumbsViewComponent.cs` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +## Sidebar Menu Component + +Sidebar menus have been used as **a directory for Related Pages** to a **Service** offering, **Navigation** items to a **specific service** or topic and even just as **Links** the user may be interested in. + +![Sidebar menu component](../../images/leptonxlite-sidebar-menu-component.png) + +### How to override the Sidebar Menu Component in LeptonX Lite Mvc + +* **Sidebar menu page (.cshtml)** is defined in the `Themes/LeptonXLite/Components/Menu/Default.cshtml` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +* If you want to **override the menu component (C#)** you can override the `Themes/LeptonXLite/Components/Menu/MainMenuViewComponent.cs` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +> The **sidebar menu** renders menu items **dynamically**. The **menu item** is a **partial view** and is defined in the `Themes/LeptonXLite/Components/Menu/_MenuItem.cshtml` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +## Page Alerts Component + +Provides contextual **feedback messages** for typical user actions with the handful of **available** and **flexible** **alert messages**. Alerts are available for any length of text, as well as an **optional dismiss button**. + +![Page alerts component](../../images/leptonxlite-page-alerts-component.png) + +### How to override the Page Alerts Component in LeptonX Lite Mvc + +* The **page alerts component page (.cshtml file)** is defined in the `Themes/LeptonXLite/Components/PageAlerts/Default.cshtml` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +* The **page alerts component (C#)** is defined in the `Themes/LeptonXLite/Components/PageAlerts/PageAlertsViewComponent.cs` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +## Toolbar Component + +Toolbar items are used to add **extra functionality to the toolbar**. The toolbar is a **horizontal bar** that **contains** a group of **toolbar items**. + +### How to override the Toolbar Component in LeptonX Lite Mvc + +* The **toolbar component page (.cshtml file)** is defined in the `Themes/LeptonXLite/Components/Toolbar/Default.cshtml` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +* The **toolbar component (C#)** is defined in the `Themes/LeptonXLite/Components/Toolbar/ToolbarViewComponent.cs` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +## Toolbar Item Component + +The toolbar item is a **single item** that **contains** a **link**, an **icon**, a **label** etc.. + +### How to override the Toolbar Item Component in LeptonX Lite Mvc + +* The **toolbar item component page (.cshtml file)** is defined in the `Themes/LeptonXLite/Components/ToolbarItems/Default.cshtml` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +* The **toolbar item component (C#)** is defined in the `Themes/LeptonXLite/Components/ToolbarItems/ToolbarItemsViewComponent.cs` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +You can find the toolbar components below: + +## Language Switch Component + +Think about a **multi-lingual** website and the first thing that could **hit your mind** is **the language switch component**. A **navigation bar** is a **great place** to **embed a language switch**. By embedding the language switch in the navigation bar of your website, you would **make it simpler** for users to **find it** and **easily** switch the **language** **without trying to locate it across the website.** + +![Language switch component](../../images/leptonxlite-language-switch-component.png) + +### How to override the Language Switch Component in LeptonX Lite Mvc + +* The **language switch component page (.cshtml file)** is defined in the `Themes/LeptonXLite/Components/LanguageSwitch/Default.cshtml` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +* The **language switch component (C#)** is defined in the `Themes/LeptonXLite/Components/LanguageSwitch/LanguageSwitchViewComponent.cs` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +## Mobile Language Switch Component + +The **mobile** **language switch component** is used to switch the language of the website **on mobile devices**. The mobile language switch component is a **dropdown menu** that **contains all the languages** of the website. + +![Mobil language switch component](../../images/leptonxlite-mobile-language-switch-component.png) + +### How to override the Mobile Language Switch Component in LeptonX Lite Mvc + +* The **mobile language switch component page (.cshtml file)** is defined in the `Themes/LeptonXLite/Components/MobileLanguageSwitch/Default.cshtml` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +* The **mobile language switch component (C#)** is defined in the `Themes/LeptonXLite/Components/MobileLanguageSwitch/MobileLanguageSwitchViewComponent.cs` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +## User Menu Component + +The **User Menu** is the **menu** that **drops down** when you **click your name** or **profile picture** in the **upper right corner** of your page (**in the toolbar**). It drops down options such as **Settings**, **Logout**, etc. + +![User menu component](../../images/leptonxlite-user-menu-component.png) + +### How to override the User Menu Component in LeptonX Lite Mvc + +* The **user menu component page (.cshtml file)** is defined in the `Themes/LeptonXLite/Components/UserMenu/Default.cshtml` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +* The **user menu component (C#)** is defined in the `Themes/LeptonXLite/Components/UserMenu/UserMenuViewComponent.cs` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +## Mobile User Menu Component + +The **mobile user menu component** is used to display the **user menu on mobile devices**. The mobile user menu component is a **dropdown menu** that contains all the **options** of the **user menu**. + +![Mobile user menu component](../../images/leptonxlite-mobile-user-menu-component.png) + +### How to override the Mobile User Menu Component in LeptonX Lite Mvc + +* The **mobile user menu component page (.cshtml file)** is defined in the `Themes/LeptonXLite/Components/MobileUserMenu/Default.cshtml` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. + +* The **mobile user menu component (C#)** is defined in the `Themes/LeptonLite/Components/MobileUserMenu/MobileUserMenuViewComponent.cs` file and you can **override it** by creating a file with the **same name** and **under** the **same folder**. diff --git a/docs/en/UI/Blazor/Overall.md b/docs/en/UI/Blazor/Overall.md index 402d61acb0..835bf4eab6 100644 --- a/docs/en/UI/Blazor/Overall.md +++ b/docs/en/UI/Blazor/Overall.md @@ -94,7 +94,7 @@ These libraries are selected as the base libraries and available to the applicat > Bootstrap's JavaScript part is not used since the Blazorise library already provides the necessary functionalities to the Bootstrap components in a native way. -> Beginning from June, 2021, the Blazorise library has dual licenses; open source & commercial. Based on your yearly revenue, you may need to buy a commercial license. See [this post](https://blazorise.com/news/announcing-2022-blazorise-plans-and-pricing-updates) to learn more. +> Beginning from June, 2021, the Blazorise library has dual licenses; open source & commercial. Based on your yearly revenue, you may need to buy a commercial license. See [this post](https://blazorise.com/news/announcing-2022-blazorise-plans-and-pricing-updates) to learn more. The Blazorise license is bundled with ABP Commercial and commercial customers doesn’t need to buy an extra Blazorise license. ### The Layout diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index b919955c6e..14c584d376 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -851,6 +851,10 @@ "text": "Page Header", "path": "UI/Blazor/Page-Header.md" }, + { + "text": "Page Layout", + "path": "UI/Blazor/Page-Layout.md" + }, { "text": "Toolbars", "path": "UI/Blazor/Toolbars.md" diff --git a/docs/en/images/leptonxlite-brand-component.png b/docs/en/images/leptonxlite-brand-component.png new file mode 100644 index 0000000000..c06a51612f Binary files /dev/null and b/docs/en/images/leptonxlite-brand-component.png differ diff --git a/docs/en/images/leptonxlite-breadcrumb-component.png b/docs/en/images/leptonxlite-breadcrumb-component.png new file mode 100644 index 0000000000..9026ca4c52 Binary files /dev/null and b/docs/en/images/leptonxlite-breadcrumb-component.png differ diff --git a/docs/en/images/leptonxlite-language-switch-component.png b/docs/en/images/leptonxlite-language-switch-component.png new file mode 100644 index 0000000000..027910c23b Binary files /dev/null and b/docs/en/images/leptonxlite-language-switch-component.png differ diff --git a/docs/en/images/leptonxlite-mobile-language-switch-component.png b/docs/en/images/leptonxlite-mobile-language-switch-component.png new file mode 100644 index 0000000000..a058820743 Binary files /dev/null and b/docs/en/images/leptonxlite-mobile-language-switch-component.png differ diff --git a/docs/en/images/leptonxlite-mobile-user-menu-component.png b/docs/en/images/leptonxlite-mobile-user-menu-component.png new file mode 100644 index 0000000000..1a51c341d7 Binary files /dev/null and b/docs/en/images/leptonxlite-mobile-user-menu-component.png differ diff --git a/docs/en/images/leptonxlite-page-alerts-component.png b/docs/en/images/leptonxlite-page-alerts-component.png new file mode 100644 index 0000000000..7976412fb2 Binary files /dev/null and b/docs/en/images/leptonxlite-page-alerts-component.png differ diff --git a/docs/en/images/leptonxlite-sidebar-menu-component.png b/docs/en/images/leptonxlite-sidebar-menu-component.png new file mode 100644 index 0000000000..6afe4029e8 Binary files /dev/null and b/docs/en/images/leptonxlite-sidebar-menu-component.png differ diff --git a/docs/en/images/leptonxlite-user-menu-component.png b/docs/en/images/leptonxlite-user-menu-component.png new file mode 100644 index 0000000000..a0039e996c Binary files /dev/null and b/docs/en/images/leptonxlite-user-menu-component.png differ diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs index 7c21b9fe09..ae5421d947 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs @@ -1,8 +1,5 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; using Volo.Abp.EventBus; using Volo.Abp.Modularity; -using Volo.Abp.Threading; namespace Volo.Abp.AspNetCore.Mvc.Client; @@ -12,13 +9,5 @@ namespace Volo.Abp.AspNetCore.Mvc.Client; )] public class AbpAspNetCoreMvcClientModule : AbpModule { - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); - } - - public async override Task OnApplicationInitializationAsync(ApplicationInitializationContext context) - { - await context.ServiceProvider.GetRequiredService().InitializeAsync(); - } + } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs index 59690b2d03..7bb2e67b49 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs @@ -30,11 +30,6 @@ public class MvcCachedApplicationConfigurationClient : ICachedApplicationConfigu Cache = cache; } - public async Task InitializeAsync() - { - await GetAsync(); - } - public async Task GetAsync() { var cacheKey = CreateCacheKey(); @@ -45,7 +40,6 @@ public class MvcCachedApplicationConfigurationClient : ICachedApplicationConfigu return configuration; } - configuration = await Cache.GetOrAddAsync( cacheKey, async () => await ApplicationConfigurationAppService.GetAsync(), diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs index 10c65d95e5..6f013272c3 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs @@ -221,7 +221,9 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency } catch (Exception ex) { - throw new Exception($"Error occured while getting the versions from {url} : {ex.Message}"); + Logger.LogWarning($"Error occured while getting the versions from {url} : {ex.Message}"); + // The remote service is currently unavailable, try to work offline. + return true; } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs index 33ecad0719..f3b0fed914 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs @@ -61,7 +61,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep ChangeNamespace( context, "/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs", - $"Volo.Abp.AspNetCore.Components.Web.{defaultThemeName}Theme.Themes.{defaultThemeName}", + $"Volo.Abp.AspNetCore.Components.Web.{defaultThemeName}Theme.Components", "Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic" ); @@ -69,7 +69,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep #region Blazor.Server Projects - ChangeThemeToBasicForBlazorServerProjects(context, defaultThemeName); + ChangeThemeToBasicForBlazorProjects(context, defaultThemeName); #endregion @@ -105,6 +105,24 @@ public class ChangeThemeStep : ProjectBuildPipelineStep "node_modules/bootstrap-icons/font/bootstrap-icons.css" ); + if(defaultThemeName == "LeptonX") + { + ReplaceMethodNames( + context, + "/angular/src/app/app.module.ts", + "HttpErrorComponent, ", + "" + ); + + ChangeModuleImportBetweenStatements( + context, + "/angular/src/app/app.module.ts", + "ThemeSharedModule.forRoot", + "AccountAdminConfigModule.forRoot", + "ThemeSharedModule.forRoot()," + ); + } + #endregion } @@ -510,6 +528,41 @@ public class ChangeThemeStep : ProjectBuildPipelineStep file.SetLines(lines.Where(x => x != null)); } + private void ChangeModuleImportBetweenStatements( + ProjectBuildContext context, + string filePath, + string firstStatement, + string lastStatement, + string newStatement) + { + var file = context.Files.FirstOrDefault(x => x.Name.Contains(filePath)); + if (file == null) + { + return; + } + + file.NormalizeLineEndings(); + + var lines = file.GetLines(); + var firstLineIndex = lines.FindIndex(line => line.Contains(firstStatement)); + var lastLineIndex = lines.FindIndex(line => line.Contains(lastStatement)); + + if(firstLineIndex == -1 || lastLineIndex == -1) + { + return; + } + + lines[firstLineIndex] = newStatement; + + for (var i = firstLineIndex + 1; i <= lastLineIndex; i++) + { + lines[i] = null; + } + + + file.SetLines(lines.Where(x => x != null)); + } + protected void ReplaceMethodNames( ProjectBuildContext context, string filePath, @@ -668,7 +721,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep } } - private void ChangeThemeToBasicForBlazorServerProjects(ProjectBuildContext context, string defaultThemeName) + private void ChangeThemeToBasicForBlazorProjects(ProjectBuildContext context, string defaultThemeName) { var projects = new Dictionary { @@ -733,7 +786,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep ChangeNamespaceAndKeyword( context, $"/MyCompanyName.MyProjectName.{project.Key}/Pages/_Host.cshtml", - $"Volo.Abp.AspNetCore.Components.Web.{defaultThemeName}Theme.Themes.{defaultThemeName}", + $"Volo.Abp.AspNetCore.Components.Web.{defaultThemeName}Theme.Components", "Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic", $"Blazor{defaultThemeName}ThemeBundles.Styles.Global", "BlazorBasicThemeBundles.Styles.Global" diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs index 3eabb6621e..bff28d703b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs @@ -17,8 +17,7 @@ public class RemoveDependencyFromPackageJsonFileStep : ProjectBuildPipelineStep public override void Execute(ProjectBuildContext context) { - var packageJsonFile = context.Files.FirstOrDefault(f => f.Name.Contains(_packageJsonFilePath)); - + var packageJsonFile = context.Files.FirstOrDefault(f => f.Name.Contains(_packageJsonFilePath) && !f.Name.Contains("node_modules")); if (packageJsonFile == null) { return; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFilesStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFilesStep.cs new file mode 100644 index 0000000000..4390e02f1d --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFilesStep.cs @@ -0,0 +1,16 @@ +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; + +public class RemoveFilesStep : ProjectBuildPipelineStep +{ + private readonly string _filePath; + + public RemoveFilesStep(string filePath) + { + _filePath = filePath; + } + + public override void Execute(ProjectBuildContext context) + { + context.Files.RemoveAll(file => file.Name.Contains(_filePath)); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs index ce61d9775f..124209d559 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs @@ -19,7 +19,7 @@ public class TemplateCodeDeleteStep : ProjectBuildPipelineStep file.Name.EndsWith(".ps1") || file.Name.EndsWith(".html") || file.Name.EndsWith(".ts") || - file.Name.EndsWith(".scss")) + file.Name.EndsWith(".css")) { file.RemoveTemplateCode(context.Symbols); file.RemoveTemplateCodeMarkers(); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index 2d7da80211..737f7a2369 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs @@ -194,19 +194,38 @@ public abstract class AppTemplateBase : TemplateInfo return; } + if (context.BuildArgs.Theme != Theme.NotSpecified) + { + context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper()); + } + if (context.BuildArgs.Theme == Theme.LeptonX) { - context.Symbols.Add("LEPTONX"); steps.Add(new ChangeThemeStyleStep()); } - + + RemoveThemeLogoFolders(context, steps); + if (IsDefaultThemeForTemplate(context.BuildArgs.Theme.Value)) { return; } steps.Add(new ChangeThemeStep()); - RemoveLeptonXThemePackagesFromPackageJsonFiles(steps, isProTemplate: IsPro()); + RemoveLeptonXThemePackagesFromPackageJsonFiles(steps, isProTemplate: IsPro(), uiFramework: context.BuildArgs.UiFramework); + } + + private void RemoveThemeLogoFolders(ProjectBuildContext context, List steps) + { + if (context.BuildArgs.Theme is not Theme.Lepton && IsPro()) + { + steps.Add(new RemoveFilesStep("/wwwroot/images/logo/lepton")); + } + + if (context.BuildArgs.Theme is not Theme.LeptonX or Theme.LeptonXLite) + { + steps.Add(new RemoveFilesStep("/wwwroot/images/logo/leptonx")); + } } private static bool IsDefaultThemeForTemplate(Theme theme) @@ -220,50 +239,55 @@ public abstract class AppTemplateBase : TemplateInfo return defaultThemesForTemplates.Any(defaultTheme => defaultTheme == theme); } - private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List steps, bool isProTemplate) + private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List steps, bool isProTemplate, UiFramework uiFramework) { + var mvcUiPackageName = isProTemplate ? "@volo/abp.aspnetcore.mvc.ui.theme.leptonx" : "@abp/aspnetcore.mvc.ui.theme.leptonxlite"; var packageJsonFilePaths = new List { "/MyCompanyName.MyProjectName.Web/package.json", "/MyCompanyName.MyProjectName.Web.Host/package.json", "/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json", + "/MyCompanyName.MyProjectName.HttpApi.Host/package.json", "/MyCompanyName.MyProjectName.AuthServer/package.json", "/MyCompanyName.MyProjectName/package.json", "/MyCompanyName.MyProjectName.Host/package.json", "/MyCompanyName.MyProjectName.Host.Mongo/package.json" }; - - var blazorServerPackageJsonFilePaths = new List - { - "/MyCompanyName.MyProjectName.Blazor.Server/package.json", - "/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json", - "/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json" - }; - - var angularPackageJsonFilePaths = new List - { - "/angular/package.json" - }; - - var mvcUiPackageName = isProTemplate ? "@volo/abp.aspnetcore.mvc.ui.theme.leptonx" : "@abp/aspnetcore.mvc.ui.theme.leptonxlite"; - var blazorServerUiPackageName = isProTemplate ? "@volo/aspnetcore.components.server.leptonxtheme" : "@abp/aspnetcore.components.server.leptonxlitetheme"; - var ngUiPackageName = isProTemplate ? "@volosoft/abp.ng.theme.lepton-x" : "@abp/ng.theme.lepton-x"; foreach (var packageJsonFilePath in packageJsonFilePaths) { steps.Add(new RemoveDependencyFromPackageJsonFileStep(packageJsonFilePath, mvcUiPackageName)); } - foreach (var blazorServerPackageJsonFilePath in blazorServerPackageJsonFilePaths) + if (uiFramework == UiFramework.BlazorServer) { - steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, mvcUiPackageName)); - steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, blazorServerUiPackageName)); + var blazorServerUiPackageName = isProTemplate ? "@volo/aspnetcore.components.server.leptonxtheme" : "@abp/aspnetcore.components.server.leptonxlitetheme"; + var blazorServerPackageJsonFilePaths = new List + { + "/MyCompanyName.MyProjectName.Blazor/package.json", + "/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json", + "/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json" + }; + + foreach (var blazorServerPackageJsonFilePath in blazorServerPackageJsonFilePaths) + { + steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, mvcUiPackageName)); + steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, blazorServerUiPackageName)); + } } - - foreach (var angularPackageJsonFilePath in angularPackageJsonFilePaths) + else if (uiFramework == UiFramework.Angular) { - steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, ngUiPackageName)); - steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, "bootstrap-icons")); + var ngUiPackageName = isProTemplate ? "@volosoft/abp.ng.theme.lepton-x" : "@abp/ng.theme.lepton-x"; + var angularPackageJsonFilePaths = new List + { + "/angular/package.json" + }; + + foreach (var angularPackageJsonFilePath in angularPackageJsonFilePaths) + { + steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, ngUiPackageName)); + steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, "bootstrap-icons")); + } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs index c6a15389ef..54d234b5c3 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs @@ -35,55 +35,63 @@ public abstract class MicroserviceTemplateBase : TemplateInfo { return; } + + if (context.BuildArgs.Theme != Theme.NotSpecified) + { + context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper()); + } if (context.BuildArgs.Theme == Theme.LeptonX) { - context.Symbols.Add("LEPTONX"); steps.Add(new ChangeThemeStyleStep()); return; } steps.Add(new ChangeThemeStep()); - RemoveLeptonXThemePackagesFromPackageJsonFiles(steps); + RemoveLeptonXThemePackagesFromPackageJsonFiles(steps, uiFramework: context.BuildArgs.UiFramework); } - private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List steps) + private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List steps, UiFramework uiFramework) { + var mvcUiPackageName = "@volo/abp.aspnetcore.mvc.ui.theme.leptonx"; var packageJsonFilePaths = new List { "/MyCompanyName.MyProjectName.AuthServer/package.json", "/MyCompanyName.MyProjectName.Web/package.json" }; - var blazorServerPackageJsonFilePaths = new List - { - "/MyCompanyName.MyProjectName.Blazor.Server/package.json" - }; - - var angularPackageJsonFilePaths = new List - { - "/angular/package.json" - }; - - var mvcUiPackageName = "@volo/abp.aspnetcore.mvc.ui.theme.leptonx"; - var blazorServerUiPackageName = "@volo/aspnetcore.components.server.leptonxtheme"; - var ngUiPackageName = "@volosoft/abp.ng.theme.lepton-x"; - foreach (var packageJsonFilePath in packageJsonFilePaths) { steps.Add(new RemoveDependencyFromPackageJsonFileStep(packageJsonFilePath, mvcUiPackageName)); } - foreach (var blazorServerPackageJsonFilePath in blazorServerPackageJsonFilePaths) + if (uiFramework == UiFramework.BlazorServer) { - steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, mvcUiPackageName)); - steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, blazorServerUiPackageName)); + var blazorServerUiPackageName = "@volo/aspnetcore.components.server.leptonxtheme"; + var blazorServerPackageJsonFilePaths = new List + { + "/MyCompanyName.MyProjectName.Blazor/package.json" + }; + + foreach (var blazorServerPackageJsonFilePath in blazorServerPackageJsonFilePaths) + { + steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, mvcUiPackageName)); + steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, blazorServerUiPackageName)); + } } - - foreach (var angularPackageJsonFilePath in angularPackageJsonFilePaths) + else if (uiFramework == UiFramework.Angular) { - steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, ngUiPackageName)); - steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, "bootstrap-icons")); + var ngUiPackageName = "@volosoft/abp.ng.theme.lepton-x"; + var angularPackageJsonFilePaths = new List + { + "/angular/package.json" + }; + + foreach (var angularPackageJsonFilePath in angularPackageJsonFilePaths) + { + steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, ngUiPackageName)); + steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, "bootstrap-icons")); + } } } diff --git a/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ConsumerPool.cs b/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ConsumerPool.cs index 7147c81271..7c73df0d51 100644 --- a/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ConsumerPool.cs +++ b/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ConsumerPool.cs @@ -37,7 +37,7 @@ public class ConsumerPool : IConsumerPool, ISingletonDependency return Consumers.GetOrAdd( connectionName, connection => new Lazy>(() => { - var config = new ConsumerConfig(Options.Connections.GetOrDefault(connection)) + var config = new ConsumerConfig(Options.Connections.GetOrDefault(connection).ToDictionary(k => k.Key, v => v.Value)) { GroupId = groupId, EnableAutoCommit = false diff --git a/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ProducerPool.cs b/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ProducerPool.cs index 691a29c1d2..ac2edf31a7 100644 --- a/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ProducerPool.cs +++ b/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ProducerPool.cs @@ -39,7 +39,7 @@ public class ProducerPool : IProducerPool, ISingletonDependency return Producers.GetOrAdd( connectionName, connection => new Lazy>(() => { - var producerConfig = new ProducerConfig(Options.Connections.GetOrDefault(connection)); + var producerConfig = new ProducerConfig(Options.Connections.GetOrDefault(connection).ToDictionary(k => k.Key, v => v.Value)); Options.ConfigureProducer?.Invoke(producerConfig); return new ProducerBuilder(producerConfig).Build(); diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hans.json b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hans.json index 0a41ce1ed5..3c1a566112 100644 --- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hans.json +++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hans.json @@ -24,6 +24,8 @@ "ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf{0}": "字段必须是最小长度为'{0}'的字符串或数组.", "ThisFieldIsNotAValidPhoneNumber.": "字段不是有效的手机号码.", "ThisFieldMustBeBetween{0}And{1}": "字段值必须在{0}和{1}范围内.", + "ThisFieldMustBeGreaterThanOrEqual{0}": "该字段必须大于或等于 {0}。", + "ThisFieldMustBeLessOrEqual{0}": "该字段必须小于或等于 {0}。", "ThisFieldMustMatchTheRegularExpression{0}": "字段必须匹配正则表达式'{0}'.", "ThisFieldIsRequired.": "字段不可为空.", "ThisFieldMustBeAStringWithAMaximumLengthOf{0}": "字段必须是长度为{0}的字符串.", @@ -31,4 +33,4 @@ "ThisFieldIsNotAValidFullyQualifiedHttpHttpsOrFtpUrl": "字段{0}不是有效的完全限定的http,https或ftp URL.", "ThisFieldIsInvalid.": "该字段无效." } -} +} \ No newline at end of file diff --git a/modules/account/Volo.Abp.Account.abpmdl.json b/modules/account/Volo.Abp.Account.abpmdl.json index 6762d81f33..dabb3f2ff9 100644 --- a/modules/account/Volo.Abp.Account.abpmdl.json +++ b/modules/account/Volo.Abp.Account.abpmdl.json @@ -38,8 +38,8 @@ "path": "src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.abppkg.json", "folder": "src" }, - "Volo.Abp.Account.Installer": { - "path": "src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.abppkg.json", + "Volo.Abp.Account.Web.OpenIddict": { + "path": "src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.abppkg.json", "folder": "src" } } diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg.analyze.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg.analyze.json index 4edb52319f..8cb409b1fc 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg.analyze.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Account.Application.Contracts", - "hash": "eda5b3412f7e1dd8dc07761a04f3a064", + "hash": "63eee204db33a361b137b2cff508e53f", "contents": [ { "namespace": "Volo.Abp.Account", diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.analyze.json b/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.analyze.json index db23b687a0..6f591b2e46 100644 --- a/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.analyze.json +++ b/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Account.Application", - "hash": "7fb9c3f35b18f2e9a0577d571fccf9df", + "hash": "9607ce81498fab564ea4a3681c15f72d", "contents": [ { "namespace": "Volo.Abp.Account", @@ -24,26 +24,6 @@ ], "contentType": "applicationService", "name": "ProfileAppService" - }, - { - "defaultValue": "true", - "displayName": "Is self-registration enabled", - "description": "Whether a user can register the account by him or herself.", - "isVisibleToClient": true, - "isInherited": true, - "isEncrypted": false, - "contentType": "setting", - "name": "Abp.Account.IsSelfRegistrationEnabled" - }, - { - "defaultValue": "true", - "displayName": "Authenticate with a local account", - "description": "Indicates if the server will allow users to authenticate with a local account.", - "isVisibleToClient": true, - "isInherited": true, - "isEncrypted": false, - "contentType": "setting", - "name": "Abp.Account.EnableLocalLogin" } ] } \ No newline at end of file diff --git a/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg.analyze.json b/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg.analyze.json index 5fec7571fa..57bf3ed42d 100644 --- a/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg.analyze.json +++ b/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Account.HttpApi.Client", - "hash": "ca67872e6cd8c25508461f7d171a8f04", + "hash": "62165afd5965b8041a9ac1f1356ad2e8", "contents": [ { "namespace": "Volo.Abp.Account", diff --git a/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg.analyze.json b/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg.analyze.json index 04d48dcab0..597cca045f 100644 --- a/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg.analyze.json +++ b/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Account.HttpApi", - "hash": "b178895fe2a7f470f36c4fd121b7c07a", + "hash": "c789b459a83b26349ca6f0fcab82a244", "contents": [ { "namespace": "Volo.Abp.Account", diff --git a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj b/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj index 73df3c03d9..8ad72ac461 100644 --- a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj +++ b/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AbpAccountInstallerModule.cs b/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AbpAccountInstallerModule.cs index 060b47ef68..01d2fa0e3f 100644 --- a/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AbpAccountInstallerModule.cs +++ b/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AbpAccountInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.Account; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpAccountInstallerModule : AbpModule diff --git a/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AccountInstallerPipelineBuilder.cs b/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AccountInstallerPipelineBuilder.cs deleted file mode 100644 index 9fb955c9a8..0000000000 --- a/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AccountInstallerPipelineBuilder.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.Account; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class AccountInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - return GetBasePipeline(context); - } -} diff --git a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.abppkg.json b/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.abppkg.json similarity index 100% rename from modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.abppkg.json rename to modules/account/src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.abppkg.json diff --git a/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg.analyze.json b/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg.analyze.json index a5848927a4..02531fd742 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg.analyze.json +++ b/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Account.Web", - "hash": "5fb2aa05261d4febe7ea7083d80fea74", + "hash": "56ee8c43448399a621216b5e54008a54", "contents": [ { "namespace": "Volo.Abp.Account.Web", diff --git a/modules/audit-logging/Volo.Abp.AuditLogging.abpmdl.json b/modules/audit-logging/Volo.Abp.AuditLogging.abpmdl.json index 9f425bc44e..5b2cc3f54b 100644 --- a/modules/audit-logging/Volo.Abp.AuditLogging.abpmdl.json +++ b/modules/audit-logging/Volo.Abp.AuditLogging.abpmdl.json @@ -37,10 +37,6 @@ "Volo.Abp.AuditLogging.MongoDB.Tests": { "path": "test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.abppkg.json", "folder": "test" - }, - "Volo.Abp.AuditLogging.Installer": { - "path": "src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj index 27ab25e369..5a04e797a5 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj @@ -4,13 +4,13 @@ - net5.0 + net6.0 true - + diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AbpAuditLoggingInstallerModule.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AbpAuditLoggingInstallerModule.cs index 52ed214a90..33601e6c40 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AbpAuditLoggingInstallerModule.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AbpAuditLoggingInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.AuditLogging; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpAuditLoggingInstallerModule : AbpModule diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AuditLoggingInstallerPipelineBuilder.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AuditLoggingInstallerPipelineBuilder.cs deleted file mode 100644 index 94ae5d81fc..0000000000 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AuditLoggingInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.AuditLogging; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class AuditLoggingInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.AuditLogging.EntityFrameworkCore", - "ConfigureAuditLogging" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl.json b/modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl.json index 92042d254e..e3bea65da3 100644 --- a/modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl.json +++ b/modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl.json @@ -58,10 +58,6 @@ "Volo.Abp.BackgroundJobs.DemoApp.Quartz": { "path": "app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.abppkg.json", "folder": "app" - }, - "Volo.Abp.BackgroundJobs.Installer": { - "path": "src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg.analyze.json b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg.analyze.json index 958aef6df3..e142ef6357 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg.analyze.json +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.BackgroundJobs.Domain.Shared", - "hash": "d48277ec610b23392edcb12ae3e29175", + "hash": "7be6cb28ee9246d901e9801978a44149", "contents": [ { "namespace": "Volo.Abp.BackgroundJobs", diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg.analyze.json b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg.analyze.json index 954692eeec..d8943cf9a5 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg.analyze.json +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.BackgroundJobs.Domain", - "hash": "1398bbe3f228b2bfd0baec6a64c03b43", + "hash": "edcb98cb920b6d3805b6ff82d280b1bd", "contents": [ { "namespace": "Volo.Abp.BackgroundJobs", @@ -19,7 +19,7 @@ { "namespace": "Volo.Abp.BackgroundJobs", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.BackgroundJobs", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg.analyze.json b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg.analyze.json index 66951427ff..48b0997dc9 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.BackgroundJobs.EntityFrameworkCore", - "hash": "f3bf7c7db2ab764d6421df0b88ea535b", + "hash": "47c087243281aea34d16f03acf5254cd", "contents": [ { "namespace": "Volo.Abp.BackgroundJobs.EntityFrameworkCore", diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj index 59bd54205d..05bd0b8f6b 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/AbpBackgroundJobsInstallerModule.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/AbpBackgroundJobsInstallerModule.cs index 1e17c8cfd9..299565ea62 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/AbpBackgroundJobsInstallerModule.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/AbpBackgroundJobsInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.BackgroundJobs; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpBackgroundJobsInstallerModule : AbpModule diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/BackgroundJobsInstallerPipelineBuilder.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/BackgroundJobsInstallerPipelineBuilder.cs deleted file mode 100644 index ebe2feac61..0000000000 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/BackgroundJobsInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.BackgroundJobs; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class BackgroundJobsInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.BackgroundJobs.EntityFrameworkCore", - "ConfigureBackgroundJobs" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg.analyze.json b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg.analyze.json index c1b355eb9a..708e849ca4 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg.analyze.json +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.BackgroundJobs.MongoDB", - "hash": "def047f007cc2f8c9a74459f1df01330", + "hash": "0a592222ebb3efef215734b1617f8548", "contents": [ { "namespace": "Volo.Abp.BackgroundJobs.MongoDB", diff --git a/modules/basic-theme/Volo.Abp.BasicTheme.abpmdl.json b/modules/basic-theme/Volo.Abp.BasicTheme.abpmdl.json index 4dc0a1ec83..23dcc2e243 100644 --- a/modules/basic-theme/Volo.Abp.BasicTheme.abpmdl.json +++ b/modules/basic-theme/Volo.Abp.BasicTheme.abpmdl.json @@ -33,10 +33,6 @@ "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests": { "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.abppkg.json", "folder": "test" - }, - "Volo.Abp.BasicTheme.Installer": { - "path": "src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.analyze.json b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.analyze.json new file mode 100644 index 0000000000..8bec0bacf0 --- /dev/null +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.analyze.json @@ -0,0 +1,11 @@ +{ + "name": "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", + "hash": "ce73ef1b1d433a5bd99fce51d9c76697", + "contents": [ + { + "namespace": "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", + "contentType": "abpModule", + "name": "AbpAspNetCoreMvcUiBasicThemeModule" + } + ] +} \ No newline at end of file diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json index 9e26dfeeb6..930c4018b3 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "role": "lib.mvc" +} \ No newline at end of file diff --git a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj index 8a4b219092..5c9e9c6305 100644 --- a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj +++ b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/AbpBasicThemeInstallerModule.cs b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/AbpBasicThemeInstallerModule.cs index 1832de02bd..39b212b00a 100644 --- a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/AbpBasicThemeInstallerModule.cs +++ b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/AbpBasicThemeInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.BasicTheme; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpBasicThemeInstallerModule : AbpModule diff --git a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/BasicThemeInstallerPipelineBuilder.cs b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/BasicThemeInstallerPipelineBuilder.cs deleted file mode 100644 index 4b80e9d364..0000000000 --- a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/BasicThemeInstallerPipelineBuilder.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.BasicTheme; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class BasicThemeInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - return GetBasePipeline(context); - } -} diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json index 33071a7428..f394ad2d19 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json @@ -3,7 +3,7 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "^6.0.0-rc.3", + "@abp/aspnetcore.mvc.ui.theme.shared": "^6.0.0-rc.4", "highlight.js": "^9.13.1" }, "devDependencies": {} diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock index cc8d424ae2..9a4ef4ddee 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock @@ -2,30 +2,30 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.shared@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.3.tgz#664ca2ee712b7d9e66103c00beb41eb9648a6075" - integrity sha512-KxCsGuoUWKaDo7Oo9aKp51pli2m0DZ2tG8m+zK+m4M9U7g96uC+DOFy3gc7MdPlszvrw32Wwm7I0AughstByNA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.3" - "@abp/bootstrap" "~6.0.0-rc.3" - "@abp/bootstrap-datepicker" "~6.0.0-rc.3" - "@abp/datatables.net-bs5" "~6.0.0-rc.3" - "@abp/font-awesome" "~6.0.0-rc.3" - "@abp/jquery-form" "~6.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.3" - "@abp/lodash" "~6.0.0-rc.3" - "@abp/luxon" "~6.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.3" - "@abp/select2" "~6.0.0-rc.3" - "@abp/sweetalert2" "~6.0.0-rc.3" - "@abp/timeago" "~6.0.0-rc.3" - "@abp/toastr" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.3.tgz#47c23b57ed3908bd78a232230e53d1f3cba2de41" - integrity sha512-7eJZy2JUGQP94Tz3JJWXRHRmDfTcPZ/lS1/VNbU8B4qvgl5ChIXklVEJLR1fwrBhKXZV8fGVmqT1XlGTGFvFJA== +"@abp/aspnetcore.mvc.ui.theme.shared@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.4.tgz#a0fd1e9f6f05d854d6f2119ed551a1cef485c929" + integrity sha512-QsrV+N6YFuMo/q73Bd1P0qDyG0Ua5JmQFgKzA94eMXDyYgpRrT5RyKh0CNV81Q/AX9V5c6APrtcQ31tYzmWwbQ== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.4" + "@abp/bootstrap" "~6.0.0-rc.4" + "@abp/bootstrap-datepicker" "~6.0.0-rc.4" + "@abp/datatables.net-bs5" "~6.0.0-rc.4" + "@abp/font-awesome" "~6.0.0-rc.4" + "@abp/jquery-form" "~6.0.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.4" + "@abp/lodash" "~6.0.0-rc.4" + "@abp/luxon" "~6.0.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.4" + "@abp/select2" "~6.0.0-rc.4" + "@abp/sweetalert2" "~6.0.0-rc.4" + "@abp/timeago" "~6.0.0-rc.4" + "@abp/toastr" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.4.tgz#de70d53a900db2f5c74719b7c4e406e0de4c2662" + integrity sha512-8GUoTG4B3Tz2Xd/cFaw9EAjOUoEfMG95VkjNqdfcvPPrtFML/W3fcMUwbjOvQ/lEnAMTSGREU3w9y7Y+GIv9qA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -34,144 +34,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.3.tgz#89198b863dbfccf5f07ac3c4b20ce6199adcb17a" - integrity sha512-NLoUjcR66mqwSWuVftu2yFH4/j6QP+FiElRfZQ9OYmO8DQx2Ue5UZzjrFTrZ1DBBCfzhr2Bffj80dirGvGDyvg== +"@abp/bootstrap-datepicker@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.4.tgz#2dbc9f8f9816689b6db84948046a964ceb1bab17" + integrity sha512-tWPA3ehtU+QPKbxdLDzKk4p2wMNGo/R4CjCQydD1i9BIpkBUlA5sBtbNrLTvZ5/KM1RYecFGFrHTVVOzGsUKrA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.3.tgz#4574bf574cc3484869e8ff8bc592f6212d20a969" - integrity sha512-Q5v7WRkGhGcjRg267HXtqs1oU7ts9UXPyCXmg5y2y5qMOyioD+m4MKV4iv67DgoQjabudp8X2egTKxkej6Lzkw== +"@abp/bootstrap@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.4.tgz#f360f86b00f474236ad182cd792df24f9ecbfc47" + integrity sha512-JjHJNPkTJRYwQvRnzTvcYIbxs2TD6n+LVtCd5ItYNbg8bMyd9yMugThxtgZGE3awVQqjLxZ4fwv+CRnf70JdrQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" bootstrap "^5.1.3" -"@abp/core@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.3.tgz#5662ce813d449d97d9fb7ea2552b2774c8df7825" - integrity sha512-X/VRdk5SGNYc5gQzPcBEPAvwcuD9WXsI4YIdrqjnes0s8u2/XmfrTixojh8Y5EYUoOblEE3Soj5hBhY1cVwcbQ== +"@abp/core@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.4.tgz#d164e1ca3546dc710c569ea7ae0145e1b713658e" + integrity sha512-mH3+BCU8Wbe0mieDHd5Awvhd09X7iJKRLBQBIINcDeIIOCJ9x4v8grynvndzlaS7J2AlWZba0XJU6sZ+YpuP2w== dependencies: - "@abp/utils" "~6.0.0-rc.3" + "@abp/utils" "~6.0.0-rc.4" -"@abp/datatables.net-bs5@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.3.tgz#22865c7e621de720b71af6265b3193f6c78695bd" - integrity sha512-T+mhLc6uSzWmxDQogVwnJ6VxI4845gmF68/i9TmVKNlCtpa3EEfyuF/hgWT1hYfCb4XOsvd/CWrunbkC3fsmtg== +"@abp/datatables.net-bs5@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.4.tgz#fc3c43fb9ba8154b4b960ed0799948f5df738f7e" + integrity sha512-QtII4mFFFjvToM2LDqZugVh6/HwKbIdKYqHCxJKprZ1aVmyBeiMHi89z0G4eChAYdTpjHQstoDddYje53DkWOw== dependencies: - "@abp/datatables.net" "~6.0.0-rc.3" + "@abp/datatables.net" "~6.0.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.3.tgz#d036defe6ad7fc989dffa020ae579362ee3150d1" - integrity sha512-4cUU8/Tn0Vz9bx7jjMOD/0Viyr29fcwoQAAkxaaYZp6qiQbENgz46/xpQf2oBCoudk8CLdzpmNa7jWte7PcJJw== +"@abp/datatables.net@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.4.tgz#f6916ba9a8089b573faddcc38e6a76e38a0dce16" + integrity sha512-9zhIvAO4AX6YIUELodEUz2hsDj+RITGoxWaav90jUJEqK/jVsDfs2mbrWcLzQDMLpZVElZA0p8tUyWS8yMsjaA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.3.tgz#803569d1a7e25f8a1c2be018312449c23fb78217" - integrity sha512-lYdh38UCTSkzzw0B/mpPEo7iFXzSKHCNbBOIHe6dd6O/Qli7wYukTtUOFn5Sh+yoydLY1as92HtiGL1ckSdu1g== +"@abp/font-awesome@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.4.tgz#a3e1664cbebdbc1aa4d2dd1ac48f022b3ce100ad" + integrity sha512-tlBekvBQ/wEkx1Z2sX8cPp/JKzxmTsMSUSbnAc/Uz+De/fxhyepUACb35zFSv2VmLPz1M1xqLvLUCJmciZhINQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.3.tgz#4ec503c07e2194148c3a7e7cf7ddef2871679e6a" - integrity sha512-Q3uEpflntqrSkYakcdsBnnYYfxJWXD/CDjMiwjbb6gIc8s4qkbIYxVxvYvlEezoIDYQkMSXOn7BS4clWsesiJg== +"@abp/jquery-form@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.4.tgz#4dfbef35e4d7dc80534e0f33644142a9ccd54cb4" + integrity sha512-/21ibf99c8q7ygbj2QF7GAGCW1MaalAurueffndTGZPRRSKrCVTPINtBih7NGgh1zcavhog+GBA3INJ3etQIWQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.3.tgz#01da2a59663d373ff1c69022f4c9c66ad0b29403" - integrity sha512-ij1ML2D9rYF3pJthWO6mGQajsJhbDCtOoBvnh9yCZccuwOYkXP22PqfUxjjxtqL4HqFI31KRpFg0ANMGSzEEBg== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.4.tgz#6a498b76076683bbc77d7a73fcf893863aecb59f" + integrity sha512-+9RAPaFYsuSZ05RtJJNeHl1PkyHm9Mv3WKAw+QrKHzaK34zpjD/cZdiijcAWM3DrNPiCCuaaUgMMIMn223MIEA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.3" + "@abp/jquery-validation" "~6.0.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.3.tgz#724aea9572dcb2faccf8c6355332b0b2a4df9260" - integrity sha512-rTK5oHaMtycvWxunNwzbE/MbsXXIr6qDnOY3rVUmjTHjqUOHYz591t/XeQfjnSXPp4k/SZUjG6viTC3J2jzC1A== +"@abp/jquery-validation@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.4.tgz#2f79457d2c83795449eb6d3c82942568b0e6f273" + integrity sha512-a3v0QDWm2kqrr5r4Nim8unT7p5xHt8KR/TGmGiS6CNMRXVtd6SLMDg36D1d5AcBemFW5evlySiqAl2D7v+g0/g== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.3.tgz#ba19cc8b802c46490277939e6c674811127d8016" - integrity sha512-MbD38iInyag7/j5k42cvMT4jLZMtXH4lUK0rjvqUDVaxKEks46Ix/90uczQ9XajYONgx0CJKFj2urgM830+CCA== +"@abp/jquery@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.4.tgz#992222c2e233840ce7bf573b8bb15b0c9c15adde" + integrity sha512-JRf9NltPP++RAfPRvWFoYNgs2i/ydyROjtLSnCGdmO4UwAQZ21YuDY7x0Ia7VSj0a6cFg8d7M2PGIeJlcaXIsg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.3.tgz#8a5bab02353e5cab4ca06ab82f6dbe6285faa95a" - integrity sha512-c8yhcapzPsXyeiFjeOC+2a4bn5wFjW5gUoN+p/p+tE+FIcH37yEgyw/tAr6aZPCmR770MqQXct4t7S4Czbbk+A== +"@abp/lodash@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.4.tgz#2c88a9274e6c27334f277404280d43b2fbae6552" + integrity sha512-yOEe3SVvh5IuFMujSgC4waG0JzWzRQj907KUYzjcjfx35J5Q0Mwvu6/9wRYJx1av40YQdnzMrRoqXKDPAKdV6A== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.3.tgz#ba515e122c61918d481467d5be39f08a363822f6" - integrity sha512-2lRSSC0DYShlnKdbJ/Pmha/azjt09ZRPx57NQ01dc7ungChPry5EJL6pC3kXWnJrCkrPCF0V5+A3+taut9+l3A== +"@abp/luxon@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.4.tgz#95ae8f70d9b5d8cd753cc7d918c611692d5bf218" + integrity sha512-OFs4Uv82YienRwiiVV78hdWSanS19lvjoBBskPF5s6LK/5mzLMrtbHBRf18wcc/AfBMOxot1BX2q1v4wb2u3qw== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.3.tgz#0798e37ec6a852748118692a5fbd30c99d9745db" - integrity sha512-FlyShmRxG3wGk1OJCjHIZAdi2/Y2FJPkVxaE72CVIceQSmg0nebGTv3a7bhd4QzKkDsSA3+t6gHjnuKlTlDFLA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.4.tgz#f40968c7f64eb6b36ff2bf06b4be8661308abd12" + integrity sha512-lcOskhl+NbPqKBxg+GABYBBrMtHYw2qZ/srFix7DgGUdNlFbXRP/AtTz0Wiav0PNGZgivniRLqvqcLCiCkrBrg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.3.tgz#deb8332bfce2102a562004893321a48d5194bf53" - integrity sha512-rb0qElmmhiP09xX8ZbjzNLF6ygFBwErysGWt6Bbgzz5waX2sGe575Cgoz53FaMQ4JaRBg1N0/nCejKyDtiINRA== +"@abp/select2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.4.tgz#c7cf0f910fa6a9f97845a0659178ac02cfa022bc" + integrity sha512-NcXMZYiLDSVnjtRgvPwm9RB1M7qZnRyyyM+htdH5laEvDDGCcOLFS8iK6WI4Irmvw6MhBkDTHaH9ssJNbF7pvQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.3.tgz#e61fc6c1bed1316c1d44ca5c92f590e422db24d4" - integrity sha512-+SNpBb4XrQlWzRQK9lfdJqA9IfJrlgoqmHwPDgf3Q+P922MzO33TgDlZWbeE7MzVj2y2WmNsPuCKwhjSjSL2rw== +"@abp/sweetalert2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.4.tgz#a1a2a1a5d7e1fb83680cc35ca477cee1f2f2463b" + integrity sha512-dvslRK2oc06JjI6aV1dj1LzWbOb50BfwbHxcmOenl8Q4XMP389bFbaOiVezjk+d3YLsspCMDxxu2NTqaq67Z6g== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.3.tgz#0ef8c4801bfd4623e6895b1d047b1437063bda53" - integrity sha512-P3YRDVKjR5/Fz+cXiPg3IiUr7XGbNh7mgmJ1ywRXmKVmVMJmhQ2RsKmmtkGJn4TfVHu/l5iJXe4rqgL21/yX/g== +"@abp/timeago@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.4.tgz#3a93a65ee6b8260f7e80bb862b60623e967e08a2" + integrity sha512-/ZZy5E3PHtvmkjg+s9BvgO344DOs0jiifimDntp5jZPQPrsQ5WPC9o9hrlGb40tTw5P0wAnznjGvHnZjBiflvA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.3.tgz#6010d4247937531ebf7c8659d6254cd3db6c4855" - integrity sha512-sC9eCzYVgDrLSFIhJGe9hshzfwA1BkZNah4NQhyq+V6HQ8YF7goMS79N+/XmSoLQ9zzRhusqnPFnb+4FHjr7iA== +"@abp/toastr@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.4.tgz#3bf6abc79baf7a2b7de9840e55caf839018ab96e" + integrity sha512-zesojzXYsFd57m7XBgxLwKeAs8HRe25iNKRGC0YR7MK2HP1770jc+dEjnQ0pnqhMHouZejFJZcpqdHGr85ZUgQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.3.tgz#6d3515694314175218606e9518618ce335b4b360" - integrity sha512-K2geJ9P1ztk4Ehzb9YG3CqqLOi+z8/4iBLUzooNZLQqS+KdlUhCmqfuCoI/A5Aq9DGbTYesalp+Fwoh3S2Dl8A== +"@abp/utils@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.4.tgz#e18ef1557a2600fa153db13162e1ed097bc6f15a" + integrity sha512-eT6RVfFsyB8uAdMHDdG4M2Erg3RrvkG7Z5Xa0ko7JIhEz5VwsRcXGwTAORYHsu0M1hpewZljdD5OmQRods13LA== dependencies: just-compare "^1.3.0" diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json index fcad11c385..bcf20561e8 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.3", - "@abp/prismjs": "^6.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.4", + "@abp/prismjs": "^6.0.0-rc.4" }, "devDependencies": {} } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock index dabafb9f12..44b6f017c8 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.3.tgz#b95266387e562c635de795442f90470f8e9e6318" - integrity sha512-vVkEpotDST455E3rynvRQpBKPcNNJ2m1wLkz/B9dQNdUjvm8L4F6s0ls0XFlKUNvQfCVfedkRtGayuvNje/Oxg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.3.tgz#664ca2ee712b7d9e66103c00beb41eb9648a6075" - integrity sha512-KxCsGuoUWKaDo7Oo9aKp51pli2m0DZ2tG8m+zK+m4M9U7g96uC+DOFy3gc7MdPlszvrw32Wwm7I0AughstByNA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.3" - "@abp/bootstrap" "~6.0.0-rc.3" - "@abp/bootstrap-datepicker" "~6.0.0-rc.3" - "@abp/datatables.net-bs5" "~6.0.0-rc.3" - "@abp/font-awesome" "~6.0.0-rc.3" - "@abp/jquery-form" "~6.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.3" - "@abp/lodash" "~6.0.0-rc.3" - "@abp/luxon" "~6.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.3" - "@abp/select2" "~6.0.0-rc.3" - "@abp/sweetalert2" "~6.0.0-rc.3" - "@abp/timeago" "~6.0.0-rc.3" - "@abp/toastr" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.3.tgz#47c23b57ed3908bd78a232230e53d1f3cba2de41" - integrity sha512-7eJZy2JUGQP94Tz3JJWXRHRmDfTcPZ/lS1/VNbU8B4qvgl5ChIXklVEJLR1fwrBhKXZV8fGVmqT1XlGTGFvFJA== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.4.tgz#f57efa6f3cabb48e40a44e79adb31de58145bf89" + integrity sha512-JcoXch+j+T9V3Lfu9Of9Tbcw5sNBpSbe42SjzUcXLqdVijV/DBWKMg/9OPH8KZ4PZwl4sl9DSAmGWXHdipLxzA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.4.tgz#a0fd1e9f6f05d854d6f2119ed551a1cef485c929" + integrity sha512-QsrV+N6YFuMo/q73Bd1P0qDyG0Ua5JmQFgKzA94eMXDyYgpRrT5RyKh0CNV81Q/AX9V5c6APrtcQ31tYzmWwbQ== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.4" + "@abp/bootstrap" "~6.0.0-rc.4" + "@abp/bootstrap-datepicker" "~6.0.0-rc.4" + "@abp/datatables.net-bs5" "~6.0.0-rc.4" + "@abp/font-awesome" "~6.0.0-rc.4" + "@abp/jquery-form" "~6.0.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.4" + "@abp/lodash" "~6.0.0-rc.4" + "@abp/luxon" "~6.0.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.4" + "@abp/select2" "~6.0.0-rc.4" + "@abp/sweetalert2" "~6.0.0-rc.4" + "@abp/timeago" "~6.0.0-rc.4" + "@abp/toastr" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.4.tgz#de70d53a900db2f5c74719b7c4e406e0de4c2662" + integrity sha512-8GUoTG4B3Tz2Xd/cFaw9EAjOUoEfMG95VkjNqdfcvPPrtFML/W3fcMUwbjOvQ/lEnAMTSGREU3w9y7Y+GIv9qA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,161 +41,161 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.3.tgz#89198b863dbfccf5f07ac3c4b20ce6199adcb17a" - integrity sha512-NLoUjcR66mqwSWuVftu2yFH4/j6QP+FiElRfZQ9OYmO8DQx2Ue5UZzjrFTrZ1DBBCfzhr2Bffj80dirGvGDyvg== +"@abp/bootstrap-datepicker@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.4.tgz#2dbc9f8f9816689b6db84948046a964ceb1bab17" + integrity sha512-tWPA3ehtU+QPKbxdLDzKk4p2wMNGo/R4CjCQydD1i9BIpkBUlA5sBtbNrLTvZ5/KM1RYecFGFrHTVVOzGsUKrA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.3.tgz#4574bf574cc3484869e8ff8bc592f6212d20a969" - integrity sha512-Q5v7WRkGhGcjRg267HXtqs1oU7ts9UXPyCXmg5y2y5qMOyioD+m4MKV4iv67DgoQjabudp8X2egTKxkej6Lzkw== +"@abp/bootstrap@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.4.tgz#f360f86b00f474236ad182cd792df24f9ecbfc47" + integrity sha512-JjHJNPkTJRYwQvRnzTvcYIbxs2TD6n+LVtCd5ItYNbg8bMyd9yMugThxtgZGE3awVQqjLxZ4fwv+CRnf70JdrQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" bootstrap "^5.1.3" -"@abp/clipboard@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.3.tgz#ee3a586b491d89442eefff08aaebbf9d38cb46d4" - integrity sha512-01svpp3mR29z1FTM+2Qe+MUNLPbl95bWlOXY5zz2hvNSbdD45lGud+BiOHfeZwlDk5jjr3FqLel+hxx2ByBvOA== +"@abp/clipboard@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.4.tgz#a1f08eb23ebe7fcac0521aa992c6cebb9753c004" + integrity sha512-dX8l7Akyv5ecx7+Op8Cp/q4JslnhA9G0Eok4iPcnYwHh9NfSLnusack9x4u370Y+eShRxFiiBDq44ZsCN66h/Q== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" clipboard "^2.0.8" -"@abp/core@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.3.tgz#5662ce813d449d97d9fb7ea2552b2774c8df7825" - integrity sha512-X/VRdk5SGNYc5gQzPcBEPAvwcuD9WXsI4YIdrqjnes0s8u2/XmfrTixojh8Y5EYUoOblEE3Soj5hBhY1cVwcbQ== +"@abp/core@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.4.tgz#d164e1ca3546dc710c569ea7ae0145e1b713658e" + integrity sha512-mH3+BCU8Wbe0mieDHd5Awvhd09X7iJKRLBQBIINcDeIIOCJ9x4v8grynvndzlaS7J2AlWZba0XJU6sZ+YpuP2w== dependencies: - "@abp/utils" "~6.0.0-rc.3" + "@abp/utils" "~6.0.0-rc.4" -"@abp/datatables.net-bs5@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.3.tgz#22865c7e621de720b71af6265b3193f6c78695bd" - integrity sha512-T+mhLc6uSzWmxDQogVwnJ6VxI4845gmF68/i9TmVKNlCtpa3EEfyuF/hgWT1hYfCb4XOsvd/CWrunbkC3fsmtg== +"@abp/datatables.net-bs5@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.4.tgz#fc3c43fb9ba8154b4b960ed0799948f5df738f7e" + integrity sha512-QtII4mFFFjvToM2LDqZugVh6/HwKbIdKYqHCxJKprZ1aVmyBeiMHi89z0G4eChAYdTpjHQstoDddYje53DkWOw== dependencies: - "@abp/datatables.net" "~6.0.0-rc.3" + "@abp/datatables.net" "~6.0.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.3.tgz#d036defe6ad7fc989dffa020ae579362ee3150d1" - integrity sha512-4cUU8/Tn0Vz9bx7jjMOD/0Viyr29fcwoQAAkxaaYZp6qiQbENgz46/xpQf2oBCoudk8CLdzpmNa7jWte7PcJJw== +"@abp/datatables.net@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.4.tgz#f6916ba9a8089b573faddcc38e6a76e38a0dce16" + integrity sha512-9zhIvAO4AX6YIUELodEUz2hsDj+RITGoxWaav90jUJEqK/jVsDfs2mbrWcLzQDMLpZVElZA0p8tUyWS8yMsjaA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.3.tgz#803569d1a7e25f8a1c2be018312449c23fb78217" - integrity sha512-lYdh38UCTSkzzw0B/mpPEo7iFXzSKHCNbBOIHe6dd6O/Qli7wYukTtUOFn5Sh+yoydLY1as92HtiGL1ckSdu1g== +"@abp/font-awesome@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.4.tgz#a3e1664cbebdbc1aa4d2dd1ac48f022b3ce100ad" + integrity sha512-tlBekvBQ/wEkx1Z2sX8cPp/JKzxmTsMSUSbnAc/Uz+De/fxhyepUACb35zFSv2VmLPz1M1xqLvLUCJmciZhINQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.3.tgz#4ec503c07e2194148c3a7e7cf7ddef2871679e6a" - integrity sha512-Q3uEpflntqrSkYakcdsBnnYYfxJWXD/CDjMiwjbb6gIc8s4qkbIYxVxvYvlEezoIDYQkMSXOn7BS4clWsesiJg== +"@abp/jquery-form@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.4.tgz#4dfbef35e4d7dc80534e0f33644142a9ccd54cb4" + integrity sha512-/21ibf99c8q7ygbj2QF7GAGCW1MaalAurueffndTGZPRRSKrCVTPINtBih7NGgh1zcavhog+GBA3INJ3etQIWQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.3.tgz#01da2a59663d373ff1c69022f4c9c66ad0b29403" - integrity sha512-ij1ML2D9rYF3pJthWO6mGQajsJhbDCtOoBvnh9yCZccuwOYkXP22PqfUxjjxtqL4HqFI31KRpFg0ANMGSzEEBg== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.4.tgz#6a498b76076683bbc77d7a73fcf893863aecb59f" + integrity sha512-+9RAPaFYsuSZ05RtJJNeHl1PkyHm9Mv3WKAw+QrKHzaK34zpjD/cZdiijcAWM3DrNPiCCuaaUgMMIMn223MIEA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.3" + "@abp/jquery-validation" "~6.0.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.3.tgz#724aea9572dcb2faccf8c6355332b0b2a4df9260" - integrity sha512-rTK5oHaMtycvWxunNwzbE/MbsXXIr6qDnOY3rVUmjTHjqUOHYz591t/XeQfjnSXPp4k/SZUjG6viTC3J2jzC1A== +"@abp/jquery-validation@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.4.tgz#2f79457d2c83795449eb6d3c82942568b0e6f273" + integrity sha512-a3v0QDWm2kqrr5r4Nim8unT7p5xHt8KR/TGmGiS6CNMRXVtd6SLMDg36D1d5AcBemFW5evlySiqAl2D7v+g0/g== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.3.tgz#ba19cc8b802c46490277939e6c674811127d8016" - integrity sha512-MbD38iInyag7/j5k42cvMT4jLZMtXH4lUK0rjvqUDVaxKEks46Ix/90uczQ9XajYONgx0CJKFj2urgM830+CCA== +"@abp/jquery@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.4.tgz#992222c2e233840ce7bf573b8bb15b0c9c15adde" + integrity sha512-JRf9NltPP++RAfPRvWFoYNgs2i/ydyROjtLSnCGdmO4UwAQZ21YuDY7x0Ia7VSj0a6cFg8d7M2PGIeJlcaXIsg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.3.tgz#8a5bab02353e5cab4ca06ab82f6dbe6285faa95a" - integrity sha512-c8yhcapzPsXyeiFjeOC+2a4bn5wFjW5gUoN+p/p+tE+FIcH37yEgyw/tAr6aZPCmR770MqQXct4t7S4Czbbk+A== +"@abp/lodash@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.4.tgz#2c88a9274e6c27334f277404280d43b2fbae6552" + integrity sha512-yOEe3SVvh5IuFMujSgC4waG0JzWzRQj907KUYzjcjfx35J5Q0Mwvu6/9wRYJx1av40YQdnzMrRoqXKDPAKdV6A== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.3.tgz#ba515e122c61918d481467d5be39f08a363822f6" - integrity sha512-2lRSSC0DYShlnKdbJ/Pmha/azjt09ZRPx57NQ01dc7ungChPry5EJL6pC3kXWnJrCkrPCF0V5+A3+taut9+l3A== +"@abp/luxon@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.4.tgz#95ae8f70d9b5d8cd753cc7d918c611692d5bf218" + integrity sha512-OFs4Uv82YienRwiiVV78hdWSanS19lvjoBBskPF5s6LK/5mzLMrtbHBRf18wcc/AfBMOxot1BX2q1v4wb2u3qw== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.3.tgz#0798e37ec6a852748118692a5fbd30c99d9745db" - integrity sha512-FlyShmRxG3wGk1OJCjHIZAdi2/Y2FJPkVxaE72CVIceQSmg0nebGTv3a7bhd4QzKkDsSA3+t6gHjnuKlTlDFLA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.4.tgz#f40968c7f64eb6b36ff2bf06b4be8661308abd12" + integrity sha512-lcOskhl+NbPqKBxg+GABYBBrMtHYw2qZ/srFix7DgGUdNlFbXRP/AtTz0Wiav0PNGZgivniRLqvqcLCiCkrBrg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.3.tgz#e4faf595e29db81c5a66030e59b0e09f09759bfd" - integrity sha512-zzd3iw/Im0M9FUmTviwkTCr4slkoZJExtK+qB1FmLxRY59+hyU9wxd6hwzic/QwhXxFQoYILJ3S3FNxsPIm76A== +"@abp/prismjs@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.4.tgz#9338018487dde7ddc5384cdfbdc35c655a8fd444" + integrity sha512-F1t7ySbj+M6LDmgbvvcY2bFl0heEj1vz14YOnmwMNUhJcaLQXamgyKsWBu5UkEHUJ11DQyjIu5gjoRXbraucdA== dependencies: - "@abp/clipboard" "~6.0.0-rc.3" - "@abp/core" "~6.0.0-rc.3" + "@abp/clipboard" "~6.0.0-rc.4" + "@abp/core" "~6.0.0-rc.4" prismjs "^1.26.0" -"@abp/select2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.3.tgz#deb8332bfce2102a562004893321a48d5194bf53" - integrity sha512-rb0qElmmhiP09xX8ZbjzNLF6ygFBwErysGWt6Bbgzz5waX2sGe575Cgoz53FaMQ4JaRBg1N0/nCejKyDtiINRA== +"@abp/select2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.4.tgz#c7cf0f910fa6a9f97845a0659178ac02cfa022bc" + integrity sha512-NcXMZYiLDSVnjtRgvPwm9RB1M7qZnRyyyM+htdH5laEvDDGCcOLFS8iK6WI4Irmvw6MhBkDTHaH9ssJNbF7pvQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.3.tgz#e61fc6c1bed1316c1d44ca5c92f590e422db24d4" - integrity sha512-+SNpBb4XrQlWzRQK9lfdJqA9IfJrlgoqmHwPDgf3Q+P922MzO33TgDlZWbeE7MzVj2y2WmNsPuCKwhjSjSL2rw== +"@abp/sweetalert2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.4.tgz#a1a2a1a5d7e1fb83680cc35ca477cee1f2f2463b" + integrity sha512-dvslRK2oc06JjI6aV1dj1LzWbOb50BfwbHxcmOenl8Q4XMP389bFbaOiVezjk+d3YLsspCMDxxu2NTqaq67Z6g== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.3.tgz#0ef8c4801bfd4623e6895b1d047b1437063bda53" - integrity sha512-P3YRDVKjR5/Fz+cXiPg3IiUr7XGbNh7mgmJ1ywRXmKVmVMJmhQ2RsKmmtkGJn4TfVHu/l5iJXe4rqgL21/yX/g== +"@abp/timeago@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.4.tgz#3a93a65ee6b8260f7e80bb862b60623e967e08a2" + integrity sha512-/ZZy5E3PHtvmkjg+s9BvgO344DOs0jiifimDntp5jZPQPrsQ5WPC9o9hrlGb40tTw5P0wAnznjGvHnZjBiflvA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.3.tgz#6010d4247937531ebf7c8659d6254cd3db6c4855" - integrity sha512-sC9eCzYVgDrLSFIhJGe9hshzfwA1BkZNah4NQhyq+V6HQ8YF7goMS79N+/XmSoLQ9zzRhusqnPFnb+4FHjr7iA== +"@abp/toastr@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.4.tgz#3bf6abc79baf7a2b7de9840e55caf839018ab96e" + integrity sha512-zesojzXYsFd57m7XBgxLwKeAs8HRe25iNKRGC0YR7MK2HP1770jc+dEjnQ0pnqhMHouZejFJZcpqdHGr85ZUgQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.3.tgz#6d3515694314175218606e9518618ce335b4b360" - integrity sha512-K2geJ9P1ztk4Ehzb9YG3CqqLOi+z8/4iBLUzooNZLQqS+KdlUhCmqfuCoI/A5Aq9DGbTYesalp+Fwoh3S2Dl8A== +"@abp/utils@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.4.tgz#e18ef1557a2600fa153db13162e1ed097bc6f15a" + integrity sha512-eT6RVfFsyB8uAdMHDdG4M2Erg3RrvkG7Z5Xa0ko7JIhEz5VwsRcXGwTAORYHsu0M1hpewZljdD5OmQRods13LA== dependencies: just-compare "^1.3.0" diff --git a/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl.json b/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl.json index ee3e278929..f5f118cbdc 100644 --- a/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl.json +++ b/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl.json @@ -50,10 +50,6 @@ "BlobStoring.Database.Host.ConsoleApp.ConsoleApp": { "path": "host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.abppkg.json", "folder": "host/BlobStoring.Database.Host.ConsoleApp/src" - }, - "Volo.Abp.BlobStoring.Database.Installer": { - "path": "src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg.analyze.json b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg.analyze.json index e046a9e56a..6948f16562 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg.analyze.json +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.BlobStoring.Database.Domain.Shared", - "hash": "eed9ff456824aac8ba0fe73baa6cf288", + "hash": "a6127aa423bcf90505fde453d6852fd5", "contents": [ { "namespace": "Volo.Abp.BlobStoring.Database", diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg.analyze.json b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg.analyze.json index cf6d7ed1b3..7f830314ef 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg.analyze.json +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.BlobStoring.Database.Domain", - "hash": "744c78df1c9addf5e9f6657295f0529c", + "hash": "35614e1fa8f4e0214b7f456228ba7565", "contents": [ { "namespace": "Volo.Abp.BlobStoring.Database", @@ -28,7 +28,7 @@ { "namespace": "Volo.Abp.BlobStoring.Database", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.BlobStoring.Database", "primaryKeyType": "Guid", "summary": null, @@ -43,7 +43,7 @@ { "namespace": "Volo.Abp.BlobStoring.Database", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.BlobStoring.Database", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg.analyze.json b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg.analyze.json index 0234edc71c..99fb06f13b 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.BlobStoring.Database.EntityFrameworkCore", - "hash": "91e3a724f35375f79d9505ca0e950b9e", + "hash": "cdddb35c205079b70e3b1e8010482930", "contents": [ { "namespace": "Volo.Abp.BlobStoring.Database.EntityFrameworkCore", diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj index a2054f574c..cb351f8da9 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseInstallerModule.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseInstallerModule.cs index abd8b35732..96ea2ea912 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseInstallerModule.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.BlobStoring.Database; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpBlobStoringDatabaseInstallerModule : AbpModule diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseInstallerPipelineBuilder.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseInstallerPipelineBuilder.cs deleted file mode 100644 index 945d229dc2..0000000000 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.BlobStoring.Database; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class BlobStoringDatabaseInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.BlobStoring.Database.EntityFrameworkCore", - "ConfigureBlobStoring" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg.analyze.json b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg.analyze.json index b6fe5277b8..96b52b98c5 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg.analyze.json +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.BlobStoring.Database.MongoDB", - "hash": "4c911e5e8a2e8c4630d12f394a157819", + "hash": "9732b597f54df4ab73a8ad8aab7743d2", "contents": [ { "namespace": "Volo.Abp.BlobStoring.Database.MongoDB", diff --git a/modules/blogging/Volo.Blogging.sln b/modules/blogging/Volo.Blogging.sln index ad5c0fa895..c6cd3f41d4 100644 --- a/modules/blogging/Volo.Blogging.sln +++ b/modules/blogging/Volo.Blogging.sln @@ -63,6 +63,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{9FAD5B EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Blogging.Application.Contracts.Shared", "src\Volo.Blogging.Application.Contracts.Shared\Volo.Blogging.Application.Contracts.Shared.csproj", "{E28EBBE0-8EB7-4FC1-9267-E6D30993EAE4}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Blogging.Installer", "src\Volo.Blogging.Installer\Volo.Blogging.Installer.csproj", "{C5EAF1A4-F1DE-44B4-9F8F-3602EC2575B5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -161,6 +163,10 @@ Global {E28EBBE0-8EB7-4FC1-9267-E6D30993EAE4}.Debug|Any CPU.Build.0 = Debug|Any CPU {E28EBBE0-8EB7-4FC1-9267-E6D30993EAE4}.Release|Any CPU.ActiveCfg = Release|Any CPU {E28EBBE0-8EB7-4FC1-9267-E6D30993EAE4}.Release|Any CPU.Build.0 = Release|Any CPU + {C5EAF1A4-F1DE-44B4-9F8F-3602EC2575B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C5EAF1A4-F1DE-44B4-9F8F-3602EC2575B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C5EAF1A4-F1DE-44B4-9F8F-3602EC2575B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C5EAF1A4-F1DE-44B4-9F8F-3602EC2575B5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -193,6 +199,7 @@ Global {DB75CA32-96A5-4D10-8DD0-E62A3D0DDBCB} = {BE2A423C-271E-469A-AD90-5640DEBEE9C1} {9FAD5B78-0577-4500-92D5-DC86E05F773C} = {42BF26EF-B8C7-42DC-9FFB-3653109B7776} {E28EBBE0-8EB7-4FC1-9267-E6D30993EAE4} = {9FAD5B78-0577-4500-92D5-DC86E05F773C} + {C5EAF1A4-F1DE-44B4-9F8F-3602EC2575B5} = {9FAD5B78-0577-4500-92D5-DC86E05F773C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F2BAE819-78D4-407A-9201-22473B2850B0} diff --git a/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.abppkg.analyze.json b/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.abppkg.analyze.json new file mode 100644 index 0000000000..add4021907 --- /dev/null +++ b/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.abppkg.analyze.json @@ -0,0 +1,18 @@ +{ + "name": "Volo.BloggingTestApp.EntityFrameworkCore", + "hash": "9bca59fa99494d82517715624e8b4974", + "contents": [ + { + "namespace": "Volo.BloggingTestApp.EntityFrameworkCore", + "contentType": "abpModule", + "name": "BloggingTestAppEntityFrameworkCoreModule" + }, + { + "namespace": "Volo.BloggingTestApp.EntityFrameworkCore", + "connectionStringName": null, + "databaseTables": [], + "contentType": "efCoreDbContext", + "name": "BloggingTestAppDbContext" + } + ] +} \ No newline at end of file diff --git a/modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.abppkg.analyze.json b/modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.abppkg.analyze.json new file mode 100644 index 0000000000..c923fe174c --- /dev/null +++ b/modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.abppkg.analyze.json @@ -0,0 +1,11 @@ +{ + "name": "Volo.BloggingTestApp.MongoDB", + "hash": "fad6ecadd947f85cb1e3da6b87211432", + "contents": [ + { + "namespace": "Volo.BloggingTestApp.MongoDB", + "contentType": "abpModule", + "name": "BloggingTestAppMongoDbModule" + } + ] +} \ No newline at end of file diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json index 779b6502b4..231f24ceb1 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/package.json +++ b/modules/blogging/app/Volo.BloggingTestApp/package.json @@ -3,7 +3,7 @@ "name": "volo.blogtestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.3", - "@abp/blogging": "^6.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.4", + "@abp/blogging": "^6.0.0-rc.4" } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock index 80ace6ebb0..0962cf0661 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock +++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.3.tgz#b95266387e562c635de795442f90470f8e9e6318" - integrity sha512-vVkEpotDST455E3rynvRQpBKPcNNJ2m1wLkz/B9dQNdUjvm8L4F6s0ls0XFlKUNvQfCVfedkRtGayuvNje/Oxg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.3.tgz#664ca2ee712b7d9e66103c00beb41eb9648a6075" - integrity sha512-KxCsGuoUWKaDo7Oo9aKp51pli2m0DZ2tG8m+zK+m4M9U7g96uC+DOFy3gc7MdPlszvrw32Wwm7I0AughstByNA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.3" - "@abp/bootstrap" "~6.0.0-rc.3" - "@abp/bootstrap-datepicker" "~6.0.0-rc.3" - "@abp/datatables.net-bs5" "~6.0.0-rc.3" - "@abp/font-awesome" "~6.0.0-rc.3" - "@abp/jquery-form" "~6.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.3" - "@abp/lodash" "~6.0.0-rc.3" - "@abp/luxon" "~6.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.3" - "@abp/select2" "~6.0.0-rc.3" - "@abp/sweetalert2" "~6.0.0-rc.3" - "@abp/timeago" "~6.0.0-rc.3" - "@abp/toastr" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.3.tgz#47c23b57ed3908bd78a232230e53d1f3cba2de41" - integrity sha512-7eJZy2JUGQP94Tz3JJWXRHRmDfTcPZ/lS1/VNbU8B4qvgl5ChIXklVEJLR1fwrBhKXZV8fGVmqT1XlGTGFvFJA== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.4.tgz#f57efa6f3cabb48e40a44e79adb31de58145bf89" + integrity sha512-JcoXch+j+T9V3Lfu9Of9Tbcw5sNBpSbe42SjzUcXLqdVijV/DBWKMg/9OPH8KZ4PZwl4sl9DSAmGWXHdipLxzA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.4.tgz#a0fd1e9f6f05d854d6f2119ed551a1cef485c929" + integrity sha512-QsrV+N6YFuMo/q73Bd1P0qDyG0Ua5JmQFgKzA94eMXDyYgpRrT5RyKh0CNV81Q/AX9V5c6APrtcQ31tYzmWwbQ== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.4" + "@abp/bootstrap" "~6.0.0-rc.4" + "@abp/bootstrap-datepicker" "~6.0.0-rc.4" + "@abp/datatables.net-bs5" "~6.0.0-rc.4" + "@abp/font-awesome" "~6.0.0-rc.4" + "@abp/jquery-form" "~6.0.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.4" + "@abp/lodash" "~6.0.0-rc.4" + "@abp/luxon" "~6.0.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.4" + "@abp/select2" "~6.0.0-rc.4" + "@abp/sweetalert2" "~6.0.0-rc.4" + "@abp/timeago" "~6.0.0-rc.4" + "@abp/toastr" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.4.tgz#de70d53a900db2f5c74719b7c4e406e0de4c2662" + integrity sha512-8GUoTG4B3Tz2Xd/cFaw9EAjOUoEfMG95VkjNqdfcvPPrtFML/W3fcMUwbjOvQ/lEnAMTSGREU3w9y7Y+GIv9qA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,187 +41,187 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/blogging@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-6.0.0-rc.3.tgz#604e3497bcdfa69a29d4cbbe062b5b691234a8c5" - integrity sha512-OZyqi2Xlq7PDDvmwcVRcssr0hElxSKGoa2UXXeqF8P7FP22TsMvuX81xsNtSn7Qlu3pcFs1pr4em+SfOb8H6jw== +"@abp/blogging@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-6.0.0-rc.4.tgz#45703574696ee193c03a748734bd1c9447af984c" + integrity sha512-qbG4V39aaS2QuIjttysiRgYcvBnegBH9RRwperFkxmyZSzULiTVBc/BYylT+FJMf7uFEKPV1Qe2V1ANQgpemHQ== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.3" - "@abp/owl.carousel" "~6.0.0-rc.3" - "@abp/prismjs" "~6.0.0-rc.3" - "@abp/tui-editor" "~6.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.4" + "@abp/owl.carousel" "~6.0.0-rc.4" + "@abp/prismjs" "~6.0.0-rc.4" + "@abp/tui-editor" "~6.0.0-rc.4" -"@abp/bootstrap-datepicker@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.3.tgz#89198b863dbfccf5f07ac3c4b20ce6199adcb17a" - integrity sha512-NLoUjcR66mqwSWuVftu2yFH4/j6QP+FiElRfZQ9OYmO8DQx2Ue5UZzjrFTrZ1DBBCfzhr2Bffj80dirGvGDyvg== +"@abp/bootstrap-datepicker@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.4.tgz#2dbc9f8f9816689b6db84948046a964ceb1bab17" + integrity sha512-tWPA3ehtU+QPKbxdLDzKk4p2wMNGo/R4CjCQydD1i9BIpkBUlA5sBtbNrLTvZ5/KM1RYecFGFrHTVVOzGsUKrA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.3.tgz#4574bf574cc3484869e8ff8bc592f6212d20a969" - integrity sha512-Q5v7WRkGhGcjRg267HXtqs1oU7ts9UXPyCXmg5y2y5qMOyioD+m4MKV4iv67DgoQjabudp8X2egTKxkej6Lzkw== +"@abp/bootstrap@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.4.tgz#f360f86b00f474236ad182cd792df24f9ecbfc47" + integrity sha512-JjHJNPkTJRYwQvRnzTvcYIbxs2TD6n+LVtCd5ItYNbg8bMyd9yMugThxtgZGE3awVQqjLxZ4fwv+CRnf70JdrQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" bootstrap "^5.1.3" -"@abp/clipboard@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.3.tgz#ee3a586b491d89442eefff08aaebbf9d38cb46d4" - integrity sha512-01svpp3mR29z1FTM+2Qe+MUNLPbl95bWlOXY5zz2hvNSbdD45lGud+BiOHfeZwlDk5jjr3FqLel+hxx2ByBvOA== +"@abp/clipboard@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.4.tgz#a1f08eb23ebe7fcac0521aa992c6cebb9753c004" + integrity sha512-dX8l7Akyv5ecx7+Op8Cp/q4JslnhA9G0Eok4iPcnYwHh9NfSLnusack9x4u370Y+eShRxFiiBDq44ZsCN66h/Q== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" clipboard "^2.0.8" -"@abp/core@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.3.tgz#5662ce813d449d97d9fb7ea2552b2774c8df7825" - integrity sha512-X/VRdk5SGNYc5gQzPcBEPAvwcuD9WXsI4YIdrqjnes0s8u2/XmfrTixojh8Y5EYUoOblEE3Soj5hBhY1cVwcbQ== +"@abp/core@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.4.tgz#d164e1ca3546dc710c569ea7ae0145e1b713658e" + integrity sha512-mH3+BCU8Wbe0mieDHd5Awvhd09X7iJKRLBQBIINcDeIIOCJ9x4v8grynvndzlaS7J2AlWZba0XJU6sZ+YpuP2w== dependencies: - "@abp/utils" "~6.0.0-rc.3" + "@abp/utils" "~6.0.0-rc.4" -"@abp/datatables.net-bs5@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.3.tgz#22865c7e621de720b71af6265b3193f6c78695bd" - integrity sha512-T+mhLc6uSzWmxDQogVwnJ6VxI4845gmF68/i9TmVKNlCtpa3EEfyuF/hgWT1hYfCb4XOsvd/CWrunbkC3fsmtg== +"@abp/datatables.net-bs5@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.4.tgz#fc3c43fb9ba8154b4b960ed0799948f5df738f7e" + integrity sha512-QtII4mFFFjvToM2LDqZugVh6/HwKbIdKYqHCxJKprZ1aVmyBeiMHi89z0G4eChAYdTpjHQstoDddYje53DkWOw== dependencies: - "@abp/datatables.net" "~6.0.0-rc.3" + "@abp/datatables.net" "~6.0.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.3.tgz#d036defe6ad7fc989dffa020ae579362ee3150d1" - integrity sha512-4cUU8/Tn0Vz9bx7jjMOD/0Viyr29fcwoQAAkxaaYZp6qiQbENgz46/xpQf2oBCoudk8CLdzpmNa7jWte7PcJJw== +"@abp/datatables.net@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.4.tgz#f6916ba9a8089b573faddcc38e6a76e38a0dce16" + integrity sha512-9zhIvAO4AX6YIUELodEUz2hsDj+RITGoxWaav90jUJEqK/jVsDfs2mbrWcLzQDMLpZVElZA0p8tUyWS8yMsjaA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.3.tgz#803569d1a7e25f8a1c2be018312449c23fb78217" - integrity sha512-lYdh38UCTSkzzw0B/mpPEo7iFXzSKHCNbBOIHe6dd6O/Qli7wYukTtUOFn5Sh+yoydLY1as92HtiGL1ckSdu1g== +"@abp/font-awesome@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.4.tgz#a3e1664cbebdbc1aa4d2dd1ac48f022b3ce100ad" + integrity sha512-tlBekvBQ/wEkx1Z2sX8cPp/JKzxmTsMSUSbnAc/Uz+De/fxhyepUACb35zFSv2VmLPz1M1xqLvLUCJmciZhINQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.3.tgz#4ec503c07e2194148c3a7e7cf7ddef2871679e6a" - integrity sha512-Q3uEpflntqrSkYakcdsBnnYYfxJWXD/CDjMiwjbb6gIc8s4qkbIYxVxvYvlEezoIDYQkMSXOn7BS4clWsesiJg== +"@abp/jquery-form@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.4.tgz#4dfbef35e4d7dc80534e0f33644142a9ccd54cb4" + integrity sha512-/21ibf99c8q7ygbj2QF7GAGCW1MaalAurueffndTGZPRRSKrCVTPINtBih7NGgh1zcavhog+GBA3INJ3etQIWQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.3.tgz#01da2a59663d373ff1c69022f4c9c66ad0b29403" - integrity sha512-ij1ML2D9rYF3pJthWO6mGQajsJhbDCtOoBvnh9yCZccuwOYkXP22PqfUxjjxtqL4HqFI31KRpFg0ANMGSzEEBg== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.4.tgz#6a498b76076683bbc77d7a73fcf893863aecb59f" + integrity sha512-+9RAPaFYsuSZ05RtJJNeHl1PkyHm9Mv3WKAw+QrKHzaK34zpjD/cZdiijcAWM3DrNPiCCuaaUgMMIMn223MIEA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.3" + "@abp/jquery-validation" "~6.0.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.3.tgz#724aea9572dcb2faccf8c6355332b0b2a4df9260" - integrity sha512-rTK5oHaMtycvWxunNwzbE/MbsXXIr6qDnOY3rVUmjTHjqUOHYz591t/XeQfjnSXPp4k/SZUjG6viTC3J2jzC1A== +"@abp/jquery-validation@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.4.tgz#2f79457d2c83795449eb6d3c82942568b0e6f273" + integrity sha512-a3v0QDWm2kqrr5r4Nim8unT7p5xHt8KR/TGmGiS6CNMRXVtd6SLMDg36D1d5AcBemFW5evlySiqAl2D7v+g0/g== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.3.tgz#ba19cc8b802c46490277939e6c674811127d8016" - integrity sha512-MbD38iInyag7/j5k42cvMT4jLZMtXH4lUK0rjvqUDVaxKEks46Ix/90uczQ9XajYONgx0CJKFj2urgM830+CCA== +"@abp/jquery@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.4.tgz#992222c2e233840ce7bf573b8bb15b0c9c15adde" + integrity sha512-JRf9NltPP++RAfPRvWFoYNgs2i/ydyROjtLSnCGdmO4UwAQZ21YuDY7x0Ia7VSj0a6cFg8d7M2PGIeJlcaXIsg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.3.tgz#8a5bab02353e5cab4ca06ab82f6dbe6285faa95a" - integrity sha512-c8yhcapzPsXyeiFjeOC+2a4bn5wFjW5gUoN+p/p+tE+FIcH37yEgyw/tAr6aZPCmR770MqQXct4t7S4Czbbk+A== +"@abp/lodash@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.4.tgz#2c88a9274e6c27334f277404280d43b2fbae6552" + integrity sha512-yOEe3SVvh5IuFMujSgC4waG0JzWzRQj907KUYzjcjfx35J5Q0Mwvu6/9wRYJx1av40YQdnzMrRoqXKDPAKdV6A== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.3.tgz#ba515e122c61918d481467d5be39f08a363822f6" - integrity sha512-2lRSSC0DYShlnKdbJ/Pmha/azjt09ZRPx57NQ01dc7ungChPry5EJL6pC3kXWnJrCkrPCF0V5+A3+taut9+l3A== +"@abp/luxon@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.4.tgz#95ae8f70d9b5d8cd753cc7d918c611692d5bf218" + integrity sha512-OFs4Uv82YienRwiiVV78hdWSanS19lvjoBBskPF5s6LK/5mzLMrtbHBRf18wcc/AfBMOxot1BX2q1v4wb2u3qw== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.3.tgz#0798e37ec6a852748118692a5fbd30c99d9745db" - integrity sha512-FlyShmRxG3wGk1OJCjHIZAdi2/Y2FJPkVxaE72CVIceQSmg0nebGTv3a7bhd4QzKkDsSA3+t6gHjnuKlTlDFLA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.4.tgz#f40968c7f64eb6b36ff2bf06b4be8661308abd12" + integrity sha512-lcOskhl+NbPqKBxg+GABYBBrMtHYw2qZ/srFix7DgGUdNlFbXRP/AtTz0Wiav0PNGZgivniRLqvqcLCiCkrBrg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/owl.carousel@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-6.0.0-rc.3.tgz#5d5884a622e6423cc73175a2cd376c892325be20" - integrity sha512-4KGPzfGUEeN2CN+EtYYKuhJU1nb1OIQd1Fxi6DmkFYeN/9KdgS8dwGZjMvFxYde+BfhDZP1zrfS6ZbpJKkzsPQ== +"@abp/owl.carousel@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-6.0.0-rc.4.tgz#8ec2828f45e9b393e94cf09dc311391190d68628" + integrity sha512-CrCntx6qdbuGZaBx9D98QMfuyyLZ9HE/ws5UhWBLmGlk+3pkk1EIBrXrgUud6md7WCSDVfVShUJWhHzej5DBUQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" owl.carousel "^2.3.4" -"@abp/prismjs@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.3.tgz#e4faf595e29db81c5a66030e59b0e09f09759bfd" - integrity sha512-zzd3iw/Im0M9FUmTviwkTCr4slkoZJExtK+qB1FmLxRY59+hyU9wxd6hwzic/QwhXxFQoYILJ3S3FNxsPIm76A== +"@abp/prismjs@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.4.tgz#9338018487dde7ddc5384cdfbdc35c655a8fd444" + integrity sha512-F1t7ySbj+M6LDmgbvvcY2bFl0heEj1vz14YOnmwMNUhJcaLQXamgyKsWBu5UkEHUJ11DQyjIu5gjoRXbraucdA== dependencies: - "@abp/clipboard" "~6.0.0-rc.3" - "@abp/core" "~6.0.0-rc.3" + "@abp/clipboard" "~6.0.0-rc.4" + "@abp/core" "~6.0.0-rc.4" prismjs "^1.26.0" -"@abp/select2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.3.tgz#deb8332bfce2102a562004893321a48d5194bf53" - integrity sha512-rb0qElmmhiP09xX8ZbjzNLF6ygFBwErysGWt6Bbgzz5waX2sGe575Cgoz53FaMQ4JaRBg1N0/nCejKyDtiINRA== +"@abp/select2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.4.tgz#c7cf0f910fa6a9f97845a0659178ac02cfa022bc" + integrity sha512-NcXMZYiLDSVnjtRgvPwm9RB1M7qZnRyyyM+htdH5laEvDDGCcOLFS8iK6WI4Irmvw6MhBkDTHaH9ssJNbF7pvQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.3.tgz#e61fc6c1bed1316c1d44ca5c92f590e422db24d4" - integrity sha512-+SNpBb4XrQlWzRQK9lfdJqA9IfJrlgoqmHwPDgf3Q+P922MzO33TgDlZWbeE7MzVj2y2WmNsPuCKwhjSjSL2rw== +"@abp/sweetalert2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.4.tgz#a1a2a1a5d7e1fb83680cc35ca477cee1f2f2463b" + integrity sha512-dvslRK2oc06JjI6aV1dj1LzWbOb50BfwbHxcmOenl8Q4XMP389bFbaOiVezjk+d3YLsspCMDxxu2NTqaq67Z6g== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.3.tgz#0ef8c4801bfd4623e6895b1d047b1437063bda53" - integrity sha512-P3YRDVKjR5/Fz+cXiPg3IiUr7XGbNh7mgmJ1ywRXmKVmVMJmhQ2RsKmmtkGJn4TfVHu/l5iJXe4rqgL21/yX/g== +"@abp/timeago@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.4.tgz#3a93a65ee6b8260f7e80bb862b60623e967e08a2" + integrity sha512-/ZZy5E3PHtvmkjg+s9BvgO344DOs0jiifimDntp5jZPQPrsQ5WPC9o9hrlGb40tTw5P0wAnznjGvHnZjBiflvA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.3.tgz#6010d4247937531ebf7c8659d6254cd3db6c4855" - integrity sha512-sC9eCzYVgDrLSFIhJGe9hshzfwA1BkZNah4NQhyq+V6HQ8YF7goMS79N+/XmSoLQ9zzRhusqnPFnb+4FHjr7iA== +"@abp/toastr@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.4.tgz#3bf6abc79baf7a2b7de9840e55caf839018ab96e" + integrity sha512-zesojzXYsFd57m7XBgxLwKeAs8HRe25iNKRGC0YR7MK2HP1770jc+dEjnQ0pnqhMHouZejFJZcpqdHGr85ZUgQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" toastr "^2.1.4" -"@abp/tui-editor@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-6.0.0-rc.3.tgz#7e913a80139af381d881f2b0205d4938ec6f6ca3" - integrity sha512-FC+gyHMn/FecAb8sVNFwf9FcJ035Lqm+LwiIXckS2VaSTbuKna0K/ADlOoSr1Ntwe5GWptZ93STIgSt1QJPdEw== +"@abp/tui-editor@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-6.0.0-rc.4.tgz#58b4f7ea991a4a805bedac7f5fd5bb314dd4d8bc" + integrity sha512-1bMvVUeFUzcQB3SmNhW9K4CC5isoMTUJ4pY2OKf4Y9RgKsTUOEuaUwzSoJwDLj4mlzdLTee4/Rxi4zhdnkxDaA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" - "@abp/prismjs" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" + "@abp/prismjs" "~6.0.0-rc.4" -"@abp/utils@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.3.tgz#6d3515694314175218606e9518618ce335b4b360" - integrity sha512-K2geJ9P1ztk4Ehzb9YG3CqqLOi+z8/4iBLUzooNZLQqS+KdlUhCmqfuCoI/A5Aq9DGbTYesalp+Fwoh3S2Dl8A== +"@abp/utils@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.4.tgz#e18ef1557a2600fa153db13162e1ed097bc6f15a" + integrity sha512-eT6RVfFsyB8uAdMHDdG4M2Erg3RrvkG7Z5Xa0ko7JIhEz5VwsRcXGwTAORYHsu0M1hpewZljdD5OmQRods13LA== dependencies: just-compare "^1.3.0" diff --git a/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg.analyze.json index 66f7032ccd..6f168249f9 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg.analyze.json +++ b/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Blogging.Admin.Application.Contracts", - "hash": "bc5b2c34e2c42cadb2a10a82348aa2b7", + "hash": "be484343bc0b862114e22ee45c9027e3", "contents": [ { "namespace": "Volo.Blogging.Admin", diff --git a/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg.analyze.json index c64f53ac74..7cee7ce2a5 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg.analyze.json +++ b/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Blogging.Admin.Application", - "hash": "7b36c95fbcf2605d9ea2614cba9ed2b6", + "hash": "da2cac72c4199b60197f4b57b5e7c9e6", "contents": [ { "namespace": "Volo.Blogging.Admin", diff --git a/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.abppkg.analyze.json new file mode 100644 index 0000000000..d4444f3ee3 --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.abppkg.analyze.json @@ -0,0 +1,11 @@ +{ + "name": "Volo.Blogging.Admin.HttpApi.Client", + "hash": "a721bcce141abe86ecb9c0d1c29350c1", + "contents": [ + { + "namespace": "Volo.Blogging.Admin", + "contentType": "abpModule", + "name": "BloggingAdminHttpApiClientModule" + } + ] +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg.analyze.json index fd6e127271..db823941d1 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg.analyze.json +++ b/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Blogging.Admin.HttpApi", - "hash": "4397a28b60e20715a0d7559a882c7070", + "hash": "5a7f1b44c7977fc9ae74a04688a1f012", "contents": [ { "namespace": "Volo.Blogging.Admin", diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg.analyze.json index fb891d09d2..b823ec813c 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg.analyze.json +++ b/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Blogging.Admin.Web", - "hash": "faf036383d0b2be635023b8f9627038d", + "hash": "038f0c3d57f5f4bc8e0e773b1f0c3b3a", "contents": [ { "namespace": "Volo.Blogging.Admin", diff --git a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg.analyze.json index f587083699..a4e06785ee 100644 --- a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg.analyze.json +++ b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Blogging.Application.Contracts", - "hash": "2f9db4cac9c4fdbbbacb91565e42a287", + "hash": "f2feafeeb5d85cc3f76512948097381d", "contents": [ { "namespace": "Volo.Blogging", diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg.analyze.json index dee8571533..50a144921c 100644 --- a/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg.analyze.json +++ b/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Blogging.Application", - "hash": "cb199201deb38a1dbd87df36e993c999", + "hash": "47a4bc61ba0c33ebe3b888158ee679f6", "contents": [ { "namespace": "Volo.Blogging", diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg.analyze.json index cc8cc96766..9a3ce4eaca 100644 --- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg.analyze.json +++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Blogging.Domain.Shared", - "hash": "071426a5a0990afe3cd051a9f1c1513c", + "hash": "5c72d38b48fd549c1e4d37eb5f4a5f8e", "contents": [ { "namespace": "Volo.Blogging", diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/zh-Hans.json b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/zh-Hans.json index 282332db5a..11447d2685 100644 --- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/zh-Hans.json +++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/zh-Hans.json @@ -56,6 +56,8 @@ "ShareOn": "分享", "TitleLengthWarning": "保持标题大小不超过60个字符,实现SEO友好!", "ClearCache": "清除缓存", - "ClearCacheConfirmationMessage": "您确定要清除缓存吗？" + "ClearCacheConfirmationMessage": "您确定要清除缓存吗？", + "MarkdownSupported": "支持 Markdown", + "FileUploadInfo": "拖放，拖放，或粘贴一个复制的图像。" } } \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg.analyze.json index b67fae070e..4b3197d109 100644 --- a/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg.analyze.json +++ b/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Blogging.Domain", - "hash": "a04c90c3913af092e8990a27cb72e208", + "hash": "bf1806736d7d435af015acb0aac2eab2", "contents": [ { "namespace": "Volo.Blogging", @@ -57,7 +57,7 @@ { "namespace": "Volo.Blogging.Users", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Blogging.Users", "primaryKeyType": "Guid", "summary": null, @@ -72,7 +72,7 @@ { "namespace": "Volo.Blogging.Tagging", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Blogging.Tagging", "primaryKeyType": "Guid", "summary": null, @@ -87,7 +87,7 @@ { "namespace": "Volo.Blogging.Posts", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Blogging.Posts", "primaryKeyType": "Guid", "summary": null, @@ -104,7 +104,7 @@ { "namespace": "Volo.Blogging.Comments", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Blogging.Comments", "primaryKeyType": "Guid", "summary": null, @@ -119,7 +119,7 @@ { "namespace": "Volo.Blogging.Blogs", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Blogging.Blogs", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg.analyze.json index 865476c365..33f0e4e4e2 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Blogging.EntityFrameworkCore", - "hash": "2e7dd0b9baf54f79d100f8b439b43449", + "hash": "28d4b0828f47b8b4e6cef70a5879915f", "contents": [ { "namespace": "Volo.Blogging.EntityFrameworkCore", diff --git a/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.abppkg.analyze.json new file mode 100644 index 0000000000..28ff008598 --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.abppkg.analyze.json @@ -0,0 +1,11 @@ +{ + "name": "Volo.Blogging.HttpApi.Client", + "hash": "81cf265f097ded223f74972a77367635", + "contents": [ + { + "namespace": "Volo.Blogging", + "contentType": "abpModule", + "name": "BloggingHttpApiClientModule" + } + ] +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg.analyze.json index 8d67d96d83..97d416b25b 100644 --- a/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg.analyze.json +++ b/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Blogging.HttpApi", - "hash": "7e01f3bdcf88041ab5d7632be87716a5", + "hash": "185146640ff70ee3bc3e49c2ae9cbe23", "contents": [ { "namespace": "Volo.Blogging", diff --git a/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/FodyWeavers.xml b/modules/blogging/src/Volo.Blogging.Installer/FodyWeavers.xml similarity index 100% rename from studio/source-codes/Volo.Abp.AuditLogging.SourceCode/FodyWeavers.xml rename to modules/blogging/src/Volo.Blogging.Installer/FodyWeavers.xml diff --git a/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/FodyWeavers.xsd b/modules/blogging/src/Volo.Blogging.Installer/FodyWeavers.xsd similarity index 100% rename from studio/source-codes/Volo.Abp.AuditLogging.SourceCode/FodyWeavers.xsd rename to modules/blogging/src/Volo.Blogging.Installer/FodyWeavers.xsd diff --git a/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj b/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj new file mode 100644 index 0000000000..643522f32b --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj @@ -0,0 +1,24 @@ + + + + + + + net6.0 + true + + + + + + + + + + + + + + + + diff --git a/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerModule.cs b/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerModule.cs new file mode 100644 index 0000000000..d75137b8a2 --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerModule.cs @@ -0,0 +1,18 @@ +using Volo.Abp.Modularity; +using Volo.Abp.VirtualFileSystem; + +namespace Volo.Blogging; + +[DependsOn( + typeof(AbpVirtualFileSystemModule) + )] +public class BloggingInstallerModule : AbpModule +{ + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.FileSets.AddEmbedded(); + }); + } +} diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.abppkg.analyze.json new file mode 100644 index 0000000000..64d1d40627 --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.abppkg.analyze.json @@ -0,0 +1,44 @@ +{ + "name": "Volo.Blogging.MongoDB", + "hash": "6837c014507cf952197f4b5ae3cafb97", + "contents": [ + { + "namespace": "Volo.Blogging.MongoDB", + "contentType": "abpModule", + "name": "BloggingMongoDbModule" + }, + { + "namespace": "Volo.Blogging.MongoDB", + "connectionStringName": "Blogging", + "databaseCollections": [ + { + "entityFullName": "Volo.Blogging.Comments.Comment", + "contentType": "databaseCollection", + "name": "BlgComments" + }, + { + "entityFullName": "Volo.Blogging.Posts.Post", + "contentType": "databaseCollection", + "name": "BlgPosts" + }, + { + "entityFullName": "Volo.Blogging.Blogs.Blog", + "contentType": "databaseCollection", + "name": "BlgBlogs" + }, + { + "entityFullName": "Volo.Blogging.Tagging.Tag", + "contentType": "databaseCollection", + "name": "BlgTags" + }, + { + "entityFullName": "Volo.Blogging.Users.BlogUser", + "contentType": "databaseCollection", + "name": "BlgUsers" + } + ], + "contentType": "mongoDbContext", + "name": "BloggingMongoDbContext" + } + ] +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg.analyze.json index e8e2e45560..06a9cd0aee 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg.analyze.json +++ b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Blogging.Web", - "hash": "daa60f34c9198bebe6d9f659595dbbea", + "hash": "1e34d5e0718fb581ffbca20cbf71f4f6", "contents": [ { "namespace": "Volo.Blogging", diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json index 03f627410b..4f5264ac8c 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json @@ -3,6 +3,6 @@ "name": "client-simulation-web", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.4" } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock index 13a328d062..d639e15948 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.3.tgz#b95266387e562c635de795442f90470f8e9e6318" - integrity sha512-vVkEpotDST455E3rynvRQpBKPcNNJ2m1wLkz/B9dQNdUjvm8L4F6s0ls0XFlKUNvQfCVfedkRtGayuvNje/Oxg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.3.tgz#664ca2ee712b7d9e66103c00beb41eb9648a6075" - integrity sha512-KxCsGuoUWKaDo7Oo9aKp51pli2m0DZ2tG8m+zK+m4M9U7g96uC+DOFy3gc7MdPlszvrw32Wwm7I0AughstByNA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.3" - "@abp/bootstrap" "~6.0.0-rc.3" - "@abp/bootstrap-datepicker" "~6.0.0-rc.3" - "@abp/datatables.net-bs5" "~6.0.0-rc.3" - "@abp/font-awesome" "~6.0.0-rc.3" - "@abp/jquery-form" "~6.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.3" - "@abp/lodash" "~6.0.0-rc.3" - "@abp/luxon" "~6.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.3" - "@abp/select2" "~6.0.0-rc.3" - "@abp/sweetalert2" "~6.0.0-rc.3" - "@abp/timeago" "~6.0.0-rc.3" - "@abp/toastr" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.3.tgz#47c23b57ed3908bd78a232230e53d1f3cba2de41" - integrity sha512-7eJZy2JUGQP94Tz3JJWXRHRmDfTcPZ/lS1/VNbU8B4qvgl5ChIXklVEJLR1fwrBhKXZV8fGVmqT1XlGTGFvFJA== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.4.tgz#f57efa6f3cabb48e40a44e79adb31de58145bf89" + integrity sha512-JcoXch+j+T9V3Lfu9Of9Tbcw5sNBpSbe42SjzUcXLqdVijV/DBWKMg/9OPH8KZ4PZwl4sl9DSAmGWXHdipLxzA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.4.tgz#a0fd1e9f6f05d854d6f2119ed551a1cef485c929" + integrity sha512-QsrV+N6YFuMo/q73Bd1P0qDyG0Ua5JmQFgKzA94eMXDyYgpRrT5RyKh0CNV81Q/AX9V5c6APrtcQ31tYzmWwbQ== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.4" + "@abp/bootstrap" "~6.0.0-rc.4" + "@abp/bootstrap-datepicker" "~6.0.0-rc.4" + "@abp/datatables.net-bs5" "~6.0.0-rc.4" + "@abp/font-awesome" "~6.0.0-rc.4" + "@abp/jquery-form" "~6.0.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.4" + "@abp/lodash" "~6.0.0-rc.4" + "@abp/luxon" "~6.0.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.4" + "@abp/select2" "~6.0.0-rc.4" + "@abp/sweetalert2" "~6.0.0-rc.4" + "@abp/timeago" "~6.0.0-rc.4" + "@abp/toastr" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.4.tgz#de70d53a900db2f5c74719b7c4e406e0de4c2662" + integrity sha512-8GUoTG4B3Tz2Xd/cFaw9EAjOUoEfMG95VkjNqdfcvPPrtFML/W3fcMUwbjOvQ/lEnAMTSGREU3w9y7Y+GIv9qA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.3.tgz#89198b863dbfccf5f07ac3c4b20ce6199adcb17a" - integrity sha512-NLoUjcR66mqwSWuVftu2yFH4/j6QP+FiElRfZQ9OYmO8DQx2Ue5UZzjrFTrZ1DBBCfzhr2Bffj80dirGvGDyvg== +"@abp/bootstrap-datepicker@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.4.tgz#2dbc9f8f9816689b6db84948046a964ceb1bab17" + integrity sha512-tWPA3ehtU+QPKbxdLDzKk4p2wMNGo/R4CjCQydD1i9BIpkBUlA5sBtbNrLTvZ5/KM1RYecFGFrHTVVOzGsUKrA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.3.tgz#4574bf574cc3484869e8ff8bc592f6212d20a969" - integrity sha512-Q5v7WRkGhGcjRg267HXtqs1oU7ts9UXPyCXmg5y2y5qMOyioD+m4MKV4iv67DgoQjabudp8X2egTKxkej6Lzkw== +"@abp/bootstrap@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.4.tgz#f360f86b00f474236ad182cd792df24f9ecbfc47" + integrity sha512-JjHJNPkTJRYwQvRnzTvcYIbxs2TD6n+LVtCd5ItYNbg8bMyd9yMugThxtgZGE3awVQqjLxZ4fwv+CRnf70JdrQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" bootstrap "^5.1.3" -"@abp/core@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.3.tgz#5662ce813d449d97d9fb7ea2552b2774c8df7825" - integrity sha512-X/VRdk5SGNYc5gQzPcBEPAvwcuD9WXsI4YIdrqjnes0s8u2/XmfrTixojh8Y5EYUoOblEE3Soj5hBhY1cVwcbQ== +"@abp/core@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.4.tgz#d164e1ca3546dc710c569ea7ae0145e1b713658e" + integrity sha512-mH3+BCU8Wbe0mieDHd5Awvhd09X7iJKRLBQBIINcDeIIOCJ9x4v8grynvndzlaS7J2AlWZba0XJU6sZ+YpuP2w== dependencies: - "@abp/utils" "~6.0.0-rc.3" + "@abp/utils" "~6.0.0-rc.4" -"@abp/datatables.net-bs5@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.3.tgz#22865c7e621de720b71af6265b3193f6c78695bd" - integrity sha512-T+mhLc6uSzWmxDQogVwnJ6VxI4845gmF68/i9TmVKNlCtpa3EEfyuF/hgWT1hYfCb4XOsvd/CWrunbkC3fsmtg== +"@abp/datatables.net-bs5@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.4.tgz#fc3c43fb9ba8154b4b960ed0799948f5df738f7e" + integrity sha512-QtII4mFFFjvToM2LDqZugVh6/HwKbIdKYqHCxJKprZ1aVmyBeiMHi89z0G4eChAYdTpjHQstoDddYje53DkWOw== dependencies: - "@abp/datatables.net" "~6.0.0-rc.3" + "@abp/datatables.net" "~6.0.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.3.tgz#d036defe6ad7fc989dffa020ae579362ee3150d1" - integrity sha512-4cUU8/Tn0Vz9bx7jjMOD/0Viyr29fcwoQAAkxaaYZp6qiQbENgz46/xpQf2oBCoudk8CLdzpmNa7jWte7PcJJw== +"@abp/datatables.net@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.4.tgz#f6916ba9a8089b573faddcc38e6a76e38a0dce16" + integrity sha512-9zhIvAO4AX6YIUELodEUz2hsDj+RITGoxWaav90jUJEqK/jVsDfs2mbrWcLzQDMLpZVElZA0p8tUyWS8yMsjaA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.3.tgz#803569d1a7e25f8a1c2be018312449c23fb78217" - integrity sha512-lYdh38UCTSkzzw0B/mpPEo7iFXzSKHCNbBOIHe6dd6O/Qli7wYukTtUOFn5Sh+yoydLY1as92HtiGL1ckSdu1g== +"@abp/font-awesome@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.4.tgz#a3e1664cbebdbc1aa4d2dd1ac48f022b3ce100ad" + integrity sha512-tlBekvBQ/wEkx1Z2sX8cPp/JKzxmTsMSUSbnAc/Uz+De/fxhyepUACb35zFSv2VmLPz1M1xqLvLUCJmciZhINQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.3.tgz#4ec503c07e2194148c3a7e7cf7ddef2871679e6a" - integrity sha512-Q3uEpflntqrSkYakcdsBnnYYfxJWXD/CDjMiwjbb6gIc8s4qkbIYxVxvYvlEezoIDYQkMSXOn7BS4clWsesiJg== +"@abp/jquery-form@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.4.tgz#4dfbef35e4d7dc80534e0f33644142a9ccd54cb4" + integrity sha512-/21ibf99c8q7ygbj2QF7GAGCW1MaalAurueffndTGZPRRSKrCVTPINtBih7NGgh1zcavhog+GBA3INJ3etQIWQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.3.tgz#01da2a59663d373ff1c69022f4c9c66ad0b29403" - integrity sha512-ij1ML2D9rYF3pJthWO6mGQajsJhbDCtOoBvnh9yCZccuwOYkXP22PqfUxjjxtqL4HqFI31KRpFg0ANMGSzEEBg== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.4.tgz#6a498b76076683bbc77d7a73fcf893863aecb59f" + integrity sha512-+9RAPaFYsuSZ05RtJJNeHl1PkyHm9Mv3WKAw+QrKHzaK34zpjD/cZdiijcAWM3DrNPiCCuaaUgMMIMn223MIEA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.3" + "@abp/jquery-validation" "~6.0.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.3.tgz#724aea9572dcb2faccf8c6355332b0b2a4df9260" - integrity sha512-rTK5oHaMtycvWxunNwzbE/MbsXXIr6qDnOY3rVUmjTHjqUOHYz591t/XeQfjnSXPp4k/SZUjG6viTC3J2jzC1A== +"@abp/jquery-validation@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.4.tgz#2f79457d2c83795449eb6d3c82942568b0e6f273" + integrity sha512-a3v0QDWm2kqrr5r4Nim8unT7p5xHt8KR/TGmGiS6CNMRXVtd6SLMDg36D1d5AcBemFW5evlySiqAl2D7v+g0/g== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.3.tgz#ba19cc8b802c46490277939e6c674811127d8016" - integrity sha512-MbD38iInyag7/j5k42cvMT4jLZMtXH4lUK0rjvqUDVaxKEks46Ix/90uczQ9XajYONgx0CJKFj2urgM830+CCA== +"@abp/jquery@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.4.tgz#992222c2e233840ce7bf573b8bb15b0c9c15adde" + integrity sha512-JRf9NltPP++RAfPRvWFoYNgs2i/ydyROjtLSnCGdmO4UwAQZ21YuDY7x0Ia7VSj0a6cFg8d7M2PGIeJlcaXIsg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.3.tgz#8a5bab02353e5cab4ca06ab82f6dbe6285faa95a" - integrity sha512-c8yhcapzPsXyeiFjeOC+2a4bn5wFjW5gUoN+p/p+tE+FIcH37yEgyw/tAr6aZPCmR770MqQXct4t7S4Czbbk+A== +"@abp/lodash@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.4.tgz#2c88a9274e6c27334f277404280d43b2fbae6552" + integrity sha512-yOEe3SVvh5IuFMujSgC4waG0JzWzRQj907KUYzjcjfx35J5Q0Mwvu6/9wRYJx1av40YQdnzMrRoqXKDPAKdV6A== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.3.tgz#ba515e122c61918d481467d5be39f08a363822f6" - integrity sha512-2lRSSC0DYShlnKdbJ/Pmha/azjt09ZRPx57NQ01dc7ungChPry5EJL6pC3kXWnJrCkrPCF0V5+A3+taut9+l3A== +"@abp/luxon@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.4.tgz#95ae8f70d9b5d8cd753cc7d918c611692d5bf218" + integrity sha512-OFs4Uv82YienRwiiVV78hdWSanS19lvjoBBskPF5s6LK/5mzLMrtbHBRf18wcc/AfBMOxot1BX2q1v4wb2u3qw== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.3.tgz#0798e37ec6a852748118692a5fbd30c99d9745db" - integrity sha512-FlyShmRxG3wGk1OJCjHIZAdi2/Y2FJPkVxaE72CVIceQSmg0nebGTv3a7bhd4QzKkDsSA3+t6gHjnuKlTlDFLA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.4.tgz#f40968c7f64eb6b36ff2bf06b4be8661308abd12" + integrity sha512-lcOskhl+NbPqKBxg+GABYBBrMtHYw2qZ/srFix7DgGUdNlFbXRP/AtTz0Wiav0PNGZgivniRLqvqcLCiCkrBrg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.3.tgz#deb8332bfce2102a562004893321a48d5194bf53" - integrity sha512-rb0qElmmhiP09xX8ZbjzNLF6ygFBwErysGWt6Bbgzz5waX2sGe575Cgoz53FaMQ4JaRBg1N0/nCejKyDtiINRA== +"@abp/select2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.4.tgz#c7cf0f910fa6a9f97845a0659178ac02cfa022bc" + integrity sha512-NcXMZYiLDSVnjtRgvPwm9RB1M7qZnRyyyM+htdH5laEvDDGCcOLFS8iK6WI4Irmvw6MhBkDTHaH9ssJNbF7pvQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.3.tgz#e61fc6c1bed1316c1d44ca5c92f590e422db24d4" - integrity sha512-+SNpBb4XrQlWzRQK9lfdJqA9IfJrlgoqmHwPDgf3Q+P922MzO33TgDlZWbeE7MzVj2y2WmNsPuCKwhjSjSL2rw== +"@abp/sweetalert2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.4.tgz#a1a2a1a5d7e1fb83680cc35ca477cee1f2f2463b" + integrity sha512-dvslRK2oc06JjI6aV1dj1LzWbOb50BfwbHxcmOenl8Q4XMP389bFbaOiVezjk+d3YLsspCMDxxu2NTqaq67Z6g== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.3.tgz#0ef8c4801bfd4623e6895b1d047b1437063bda53" - integrity sha512-P3YRDVKjR5/Fz+cXiPg3IiUr7XGbNh7mgmJ1ywRXmKVmVMJmhQ2RsKmmtkGJn4TfVHu/l5iJXe4rqgL21/yX/g== +"@abp/timeago@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.4.tgz#3a93a65ee6b8260f7e80bb862b60623e967e08a2" + integrity sha512-/ZZy5E3PHtvmkjg+s9BvgO344DOs0jiifimDntp5jZPQPrsQ5WPC9o9hrlGb40tTw5P0wAnznjGvHnZjBiflvA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.3.tgz#6010d4247937531ebf7c8659d6254cd3db6c4855" - integrity sha512-sC9eCzYVgDrLSFIhJGe9hshzfwA1BkZNah4NQhyq+V6HQ8YF7goMS79N+/XmSoLQ9zzRhusqnPFnb+4FHjr7iA== +"@abp/toastr@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.4.tgz#3bf6abc79baf7a2b7de9840e55caf839018ab96e" + integrity sha512-zesojzXYsFd57m7XBgxLwKeAs8HRe25iNKRGC0YR7MK2HP1770jc+dEjnQ0pnqhMHouZejFJZcpqdHGr85ZUgQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.3.tgz#6d3515694314175218606e9518618ce335b4b360" - integrity sha512-K2geJ9P1ztk4Ehzb9YG3CqqLOi+z8/4iBLUzooNZLQqS+KdlUhCmqfuCoI/A5Aq9DGbTYesalp+Fwoh3S2Dl8A== +"@abp/utils@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.4.tgz#e18ef1557a2600fa153db13162e1ed097bc6f15a" + integrity sha512-eT6RVfFsyB8uAdMHDdG4M2Erg3RrvkG7Z5Xa0ko7JIhEz5VwsRcXGwTAORYHsu0M1hpewZljdD5OmQRods13LA== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/Volo.CmsKit.abpmdl.json b/modules/cms-kit/Volo.CmsKit.abpmdl.json index 06e86b66bb..5e0bfb9317 100644 --- a/modules/cms-kit/Volo.CmsKit.abpmdl.json +++ b/modules/cms-kit/Volo.CmsKit.abpmdl.json @@ -146,10 +146,6 @@ "Volo.CmsKit.Common.HttpApi.Client": { "path": "src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.json", "folder": "src" - }, - "Volo.CmsKit.Installer": { - "path": "src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index 54f5f486ed..ba230bb9d1 100644 --- a/modules/cms-kit/angular/package.json +++ b/modules/cms-kit/angular/package.json @@ -15,11 +15,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~6.0.0-rc.3", - "@abp/ng.identity": "~6.0.0-rc.3", - "@abp/ng.setting-management": "~6.0.0-rc.3", - "@abp/ng.tenant-management": "~6.0.0-rc.3", - "@abp/ng.theme.basic": "~6.0.0-rc.3", + "@abp/ng.account": "~6.0.0-rc.4", + "@abp/ng.identity": "~6.0.0-rc.4", + "@abp/ng.setting-management": "~6.0.0-rc.4", + "@abp/ng.tenant-management": "~6.0.0-rc.4", + "@abp/ng.theme.basic": "~6.0.0-rc.4", "@angular/animations": "~10.0.0", "@angular/common": "~10.0.0", "@angular/compiler": "~10.0.0", diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json index aebab1daa7..a264ab34d1 100644 --- a/modules/cms-kit/angular/projects/cms-kit/package.json +++ b/modules/cms-kit/angular/projects/cms-kit/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": "^9.1.11", "@angular/core": "^9.1.11", - "@abp/ng.core": ">=6.0.0-rc.3", - "@abp/ng.theme.shared": ">=6.0.0-rc.3" + "@abp/ng.core": ">=6.0.0-rc.4", + "@abp/ng.theme.shared": ">=6.0.0-rc.4" }, "dependencies": { "tslib": "^2.0.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.analyze.json b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.analyze.json index 1f221b30a5..d700158eff 100644 --- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.analyze.json +++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.HttpApi.Host", - "hash": "a94f87ec06a48733eb72887f12c6a3e2", + "hash": "da40e46c3889c8e7a250a070a7366fac", "contents": [ { "namespace": "Volo.CmsKit", diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json index c920638942..1c4c120f59 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.4" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index 43759f8de6..5fb9303c9c 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.3.tgz#b95266387e562c635de795442f90470f8e9e6318" - integrity sha512-vVkEpotDST455E3rynvRQpBKPcNNJ2m1wLkz/B9dQNdUjvm8L4F6s0ls0XFlKUNvQfCVfedkRtGayuvNje/Oxg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.3.tgz#664ca2ee712b7d9e66103c00beb41eb9648a6075" - integrity sha512-KxCsGuoUWKaDo7Oo9aKp51pli2m0DZ2tG8m+zK+m4M9U7g96uC+DOFy3gc7MdPlszvrw32Wwm7I0AughstByNA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.3" - "@abp/bootstrap" "~6.0.0-rc.3" - "@abp/bootstrap-datepicker" "~6.0.0-rc.3" - "@abp/datatables.net-bs5" "~6.0.0-rc.3" - "@abp/font-awesome" "~6.0.0-rc.3" - "@abp/jquery-form" "~6.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.3" - "@abp/lodash" "~6.0.0-rc.3" - "@abp/luxon" "~6.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.3" - "@abp/select2" "~6.0.0-rc.3" - "@abp/sweetalert2" "~6.0.0-rc.3" - "@abp/timeago" "~6.0.0-rc.3" - "@abp/toastr" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.3.tgz#47c23b57ed3908bd78a232230e53d1f3cba2de41" - integrity sha512-7eJZy2JUGQP94Tz3JJWXRHRmDfTcPZ/lS1/VNbU8B4qvgl5ChIXklVEJLR1fwrBhKXZV8fGVmqT1XlGTGFvFJA== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.4.tgz#f57efa6f3cabb48e40a44e79adb31de58145bf89" + integrity sha512-JcoXch+j+T9V3Lfu9Of9Tbcw5sNBpSbe42SjzUcXLqdVijV/DBWKMg/9OPH8KZ4PZwl4sl9DSAmGWXHdipLxzA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.4.tgz#a0fd1e9f6f05d854d6f2119ed551a1cef485c929" + integrity sha512-QsrV+N6YFuMo/q73Bd1P0qDyG0Ua5JmQFgKzA94eMXDyYgpRrT5RyKh0CNV81Q/AX9V5c6APrtcQ31tYzmWwbQ== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.4" + "@abp/bootstrap" "~6.0.0-rc.4" + "@abp/bootstrap-datepicker" "~6.0.0-rc.4" + "@abp/datatables.net-bs5" "~6.0.0-rc.4" + "@abp/font-awesome" "~6.0.0-rc.4" + "@abp/jquery-form" "~6.0.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.4" + "@abp/lodash" "~6.0.0-rc.4" + "@abp/luxon" "~6.0.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.4" + "@abp/select2" "~6.0.0-rc.4" + "@abp/sweetalert2" "~6.0.0-rc.4" + "@abp/timeago" "~6.0.0-rc.4" + "@abp/toastr" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.4.tgz#de70d53a900db2f5c74719b7c4e406e0de4c2662" + integrity sha512-8GUoTG4B3Tz2Xd/cFaw9EAjOUoEfMG95VkjNqdfcvPPrtFML/W3fcMUwbjOvQ/lEnAMTSGREU3w9y7Y+GIv9qA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.3.tgz#89198b863dbfccf5f07ac3c4b20ce6199adcb17a" - integrity sha512-NLoUjcR66mqwSWuVftu2yFH4/j6QP+FiElRfZQ9OYmO8DQx2Ue5UZzjrFTrZ1DBBCfzhr2Bffj80dirGvGDyvg== +"@abp/bootstrap-datepicker@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.4.tgz#2dbc9f8f9816689b6db84948046a964ceb1bab17" + integrity sha512-tWPA3ehtU+QPKbxdLDzKk4p2wMNGo/R4CjCQydD1i9BIpkBUlA5sBtbNrLTvZ5/KM1RYecFGFrHTVVOzGsUKrA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.3.tgz#4574bf574cc3484869e8ff8bc592f6212d20a969" - integrity sha512-Q5v7WRkGhGcjRg267HXtqs1oU7ts9UXPyCXmg5y2y5qMOyioD+m4MKV4iv67DgoQjabudp8X2egTKxkej6Lzkw== +"@abp/bootstrap@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.4.tgz#f360f86b00f474236ad182cd792df24f9ecbfc47" + integrity sha512-JjHJNPkTJRYwQvRnzTvcYIbxs2TD6n+LVtCd5ItYNbg8bMyd9yMugThxtgZGE3awVQqjLxZ4fwv+CRnf70JdrQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" bootstrap "^5.1.3" -"@abp/core@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.3.tgz#5662ce813d449d97d9fb7ea2552b2774c8df7825" - integrity sha512-X/VRdk5SGNYc5gQzPcBEPAvwcuD9WXsI4YIdrqjnes0s8u2/XmfrTixojh8Y5EYUoOblEE3Soj5hBhY1cVwcbQ== +"@abp/core@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.4.tgz#d164e1ca3546dc710c569ea7ae0145e1b713658e" + integrity sha512-mH3+BCU8Wbe0mieDHd5Awvhd09X7iJKRLBQBIINcDeIIOCJ9x4v8grynvndzlaS7J2AlWZba0XJU6sZ+YpuP2w== dependencies: - "@abp/utils" "~6.0.0-rc.3" + "@abp/utils" "~6.0.0-rc.4" -"@abp/datatables.net-bs5@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.3.tgz#22865c7e621de720b71af6265b3193f6c78695bd" - integrity sha512-T+mhLc6uSzWmxDQogVwnJ6VxI4845gmF68/i9TmVKNlCtpa3EEfyuF/hgWT1hYfCb4XOsvd/CWrunbkC3fsmtg== +"@abp/datatables.net-bs5@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.4.tgz#fc3c43fb9ba8154b4b960ed0799948f5df738f7e" + integrity sha512-QtII4mFFFjvToM2LDqZugVh6/HwKbIdKYqHCxJKprZ1aVmyBeiMHi89z0G4eChAYdTpjHQstoDddYje53DkWOw== dependencies: - "@abp/datatables.net" "~6.0.0-rc.3" + "@abp/datatables.net" "~6.0.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.3.tgz#d036defe6ad7fc989dffa020ae579362ee3150d1" - integrity sha512-4cUU8/Tn0Vz9bx7jjMOD/0Viyr29fcwoQAAkxaaYZp6qiQbENgz46/xpQf2oBCoudk8CLdzpmNa7jWte7PcJJw== +"@abp/datatables.net@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.4.tgz#f6916ba9a8089b573faddcc38e6a76e38a0dce16" + integrity sha512-9zhIvAO4AX6YIUELodEUz2hsDj+RITGoxWaav90jUJEqK/jVsDfs2mbrWcLzQDMLpZVElZA0p8tUyWS8yMsjaA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.3.tgz#803569d1a7e25f8a1c2be018312449c23fb78217" - integrity sha512-lYdh38UCTSkzzw0B/mpPEo7iFXzSKHCNbBOIHe6dd6O/Qli7wYukTtUOFn5Sh+yoydLY1as92HtiGL1ckSdu1g== +"@abp/font-awesome@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.4.tgz#a3e1664cbebdbc1aa4d2dd1ac48f022b3ce100ad" + integrity sha512-tlBekvBQ/wEkx1Z2sX8cPp/JKzxmTsMSUSbnAc/Uz+De/fxhyepUACb35zFSv2VmLPz1M1xqLvLUCJmciZhINQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.3.tgz#4ec503c07e2194148c3a7e7cf7ddef2871679e6a" - integrity sha512-Q3uEpflntqrSkYakcdsBnnYYfxJWXD/CDjMiwjbb6gIc8s4qkbIYxVxvYvlEezoIDYQkMSXOn7BS4clWsesiJg== +"@abp/jquery-form@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.4.tgz#4dfbef35e4d7dc80534e0f33644142a9ccd54cb4" + integrity sha512-/21ibf99c8q7ygbj2QF7GAGCW1MaalAurueffndTGZPRRSKrCVTPINtBih7NGgh1zcavhog+GBA3INJ3etQIWQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.3.tgz#01da2a59663d373ff1c69022f4c9c66ad0b29403" - integrity sha512-ij1ML2D9rYF3pJthWO6mGQajsJhbDCtOoBvnh9yCZccuwOYkXP22PqfUxjjxtqL4HqFI31KRpFg0ANMGSzEEBg== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.4.tgz#6a498b76076683bbc77d7a73fcf893863aecb59f" + integrity sha512-+9RAPaFYsuSZ05RtJJNeHl1PkyHm9Mv3WKAw+QrKHzaK34zpjD/cZdiijcAWM3DrNPiCCuaaUgMMIMn223MIEA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.3" + "@abp/jquery-validation" "~6.0.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.3.tgz#724aea9572dcb2faccf8c6355332b0b2a4df9260" - integrity sha512-rTK5oHaMtycvWxunNwzbE/MbsXXIr6qDnOY3rVUmjTHjqUOHYz591t/XeQfjnSXPp4k/SZUjG6viTC3J2jzC1A== +"@abp/jquery-validation@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.4.tgz#2f79457d2c83795449eb6d3c82942568b0e6f273" + integrity sha512-a3v0QDWm2kqrr5r4Nim8unT7p5xHt8KR/TGmGiS6CNMRXVtd6SLMDg36D1d5AcBemFW5evlySiqAl2D7v+g0/g== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.3.tgz#ba19cc8b802c46490277939e6c674811127d8016" - integrity sha512-MbD38iInyag7/j5k42cvMT4jLZMtXH4lUK0rjvqUDVaxKEks46Ix/90uczQ9XajYONgx0CJKFj2urgM830+CCA== +"@abp/jquery@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.4.tgz#992222c2e233840ce7bf573b8bb15b0c9c15adde" + integrity sha512-JRf9NltPP++RAfPRvWFoYNgs2i/ydyROjtLSnCGdmO4UwAQZ21YuDY7x0Ia7VSj0a6cFg8d7M2PGIeJlcaXIsg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.3.tgz#8a5bab02353e5cab4ca06ab82f6dbe6285faa95a" - integrity sha512-c8yhcapzPsXyeiFjeOC+2a4bn5wFjW5gUoN+p/p+tE+FIcH37yEgyw/tAr6aZPCmR770MqQXct4t7S4Czbbk+A== +"@abp/lodash@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.4.tgz#2c88a9274e6c27334f277404280d43b2fbae6552" + integrity sha512-yOEe3SVvh5IuFMujSgC4waG0JzWzRQj907KUYzjcjfx35J5Q0Mwvu6/9wRYJx1av40YQdnzMrRoqXKDPAKdV6A== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.3.tgz#ba515e122c61918d481467d5be39f08a363822f6" - integrity sha512-2lRSSC0DYShlnKdbJ/Pmha/azjt09ZRPx57NQ01dc7ungChPry5EJL6pC3kXWnJrCkrPCF0V5+A3+taut9+l3A== +"@abp/luxon@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.4.tgz#95ae8f70d9b5d8cd753cc7d918c611692d5bf218" + integrity sha512-OFs4Uv82YienRwiiVV78hdWSanS19lvjoBBskPF5s6LK/5mzLMrtbHBRf18wcc/AfBMOxot1BX2q1v4wb2u3qw== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.3.tgz#0798e37ec6a852748118692a5fbd30c99d9745db" - integrity sha512-FlyShmRxG3wGk1OJCjHIZAdi2/Y2FJPkVxaE72CVIceQSmg0nebGTv3a7bhd4QzKkDsSA3+t6gHjnuKlTlDFLA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.4.tgz#f40968c7f64eb6b36ff2bf06b4be8661308abd12" + integrity sha512-lcOskhl+NbPqKBxg+GABYBBrMtHYw2qZ/srFix7DgGUdNlFbXRP/AtTz0Wiav0PNGZgivniRLqvqcLCiCkrBrg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.3.tgz#deb8332bfce2102a562004893321a48d5194bf53" - integrity sha512-rb0qElmmhiP09xX8ZbjzNLF6ygFBwErysGWt6Bbgzz5waX2sGe575Cgoz53FaMQ4JaRBg1N0/nCejKyDtiINRA== +"@abp/select2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.4.tgz#c7cf0f910fa6a9f97845a0659178ac02cfa022bc" + integrity sha512-NcXMZYiLDSVnjtRgvPwm9RB1M7qZnRyyyM+htdH5laEvDDGCcOLFS8iK6WI4Irmvw6MhBkDTHaH9ssJNbF7pvQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.3.tgz#e61fc6c1bed1316c1d44ca5c92f590e422db24d4" - integrity sha512-+SNpBb4XrQlWzRQK9lfdJqA9IfJrlgoqmHwPDgf3Q+P922MzO33TgDlZWbeE7MzVj2y2WmNsPuCKwhjSjSL2rw== +"@abp/sweetalert2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.4.tgz#a1a2a1a5d7e1fb83680cc35ca477cee1f2f2463b" + integrity sha512-dvslRK2oc06JjI6aV1dj1LzWbOb50BfwbHxcmOenl8Q4XMP389bFbaOiVezjk+d3YLsspCMDxxu2NTqaq67Z6g== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.3.tgz#0ef8c4801bfd4623e6895b1d047b1437063bda53" - integrity sha512-P3YRDVKjR5/Fz+cXiPg3IiUr7XGbNh7mgmJ1ywRXmKVmVMJmhQ2RsKmmtkGJn4TfVHu/l5iJXe4rqgL21/yX/g== +"@abp/timeago@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.4.tgz#3a93a65ee6b8260f7e80bb862b60623e967e08a2" + integrity sha512-/ZZy5E3PHtvmkjg+s9BvgO344DOs0jiifimDntp5jZPQPrsQ5WPC9o9hrlGb40tTw5P0wAnznjGvHnZjBiflvA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.3.tgz#6010d4247937531ebf7c8659d6254cd3db6c4855" - integrity sha512-sC9eCzYVgDrLSFIhJGe9hshzfwA1BkZNah4NQhyq+V6HQ8YF7goMS79N+/XmSoLQ9zzRhusqnPFnb+4FHjr7iA== +"@abp/toastr@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.4.tgz#3bf6abc79baf7a2b7de9840e55caf839018ab96e" + integrity sha512-zesojzXYsFd57m7XBgxLwKeAs8HRe25iNKRGC0YR7MK2HP1770jc+dEjnQ0pnqhMHouZejFJZcpqdHGr85ZUgQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.3.tgz#6d3515694314175218606e9518618ce335b4b360" - integrity sha512-K2geJ9P1ztk4Ehzb9YG3CqqLOi+z8/4iBLUzooNZLQqS+KdlUhCmqfuCoI/A5Aq9DGbTYesalp+Fwoh3S2Dl8A== +"@abp/utils@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.4.tgz#e18ef1557a2600fa153db13162e1ed097bc6f15a" + integrity sha512-eT6RVfFsyB8uAdMHDdG4M2Erg3RrvkG7Z5Xa0ko7JIhEz5VwsRcXGwTAORYHsu0M1hpewZljdD5OmQRods13LA== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.analyze.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.analyze.json index 1b928a9d2a..8fe6adf6d6 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.analyze.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Web.Host", - "hash": "cc4d27ed5d3b15d46c68449fc409a9ea", + "hash": "b8c7f8a05e4ae2f56af72d7c331242d7", "contents": [ { "namespace": "Volo.CmsKit", diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json index 34dba93009..5f0414e1fa 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.4" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock index d501d9343d..d07ba96065 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.3.tgz#b95266387e562c635de795442f90470f8e9e6318" - integrity sha512-vVkEpotDST455E3rynvRQpBKPcNNJ2m1wLkz/B9dQNdUjvm8L4F6s0ls0XFlKUNvQfCVfedkRtGayuvNje/Oxg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.3.tgz#664ca2ee712b7d9e66103c00beb41eb9648a6075" - integrity sha512-KxCsGuoUWKaDo7Oo9aKp51pli2m0DZ2tG8m+zK+m4M9U7g96uC+DOFy3gc7MdPlszvrw32Wwm7I0AughstByNA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.3" - "@abp/bootstrap" "~6.0.0-rc.3" - "@abp/bootstrap-datepicker" "~6.0.0-rc.3" - "@abp/datatables.net-bs5" "~6.0.0-rc.3" - "@abp/font-awesome" "~6.0.0-rc.3" - "@abp/jquery-form" "~6.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.3" - "@abp/lodash" "~6.0.0-rc.3" - "@abp/luxon" "~6.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.3" - "@abp/select2" "~6.0.0-rc.3" - "@abp/sweetalert2" "~6.0.0-rc.3" - "@abp/timeago" "~6.0.0-rc.3" - "@abp/toastr" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.3.tgz#47c23b57ed3908bd78a232230e53d1f3cba2de41" - integrity sha512-7eJZy2JUGQP94Tz3JJWXRHRmDfTcPZ/lS1/VNbU8B4qvgl5ChIXklVEJLR1fwrBhKXZV8fGVmqT1XlGTGFvFJA== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.4.tgz#f57efa6f3cabb48e40a44e79adb31de58145bf89" + integrity sha512-JcoXch+j+T9V3Lfu9Of9Tbcw5sNBpSbe42SjzUcXLqdVijV/DBWKMg/9OPH8KZ4PZwl4sl9DSAmGWXHdipLxzA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.4.tgz#a0fd1e9f6f05d854d6f2119ed551a1cef485c929" + integrity sha512-QsrV+N6YFuMo/q73Bd1P0qDyG0Ua5JmQFgKzA94eMXDyYgpRrT5RyKh0CNV81Q/AX9V5c6APrtcQ31tYzmWwbQ== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.4" + "@abp/bootstrap" "~6.0.0-rc.4" + "@abp/bootstrap-datepicker" "~6.0.0-rc.4" + "@abp/datatables.net-bs5" "~6.0.0-rc.4" + "@abp/font-awesome" "~6.0.0-rc.4" + "@abp/jquery-form" "~6.0.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.4" + "@abp/lodash" "~6.0.0-rc.4" + "@abp/luxon" "~6.0.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.4" + "@abp/select2" "~6.0.0-rc.4" + "@abp/sweetalert2" "~6.0.0-rc.4" + "@abp/timeago" "~6.0.0-rc.4" + "@abp/toastr" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.4.tgz#de70d53a900db2f5c74719b7c4e406e0de4c2662" + integrity sha512-8GUoTG4B3Tz2Xd/cFaw9EAjOUoEfMG95VkjNqdfcvPPrtFML/W3fcMUwbjOvQ/lEnAMTSGREU3w9y7Y+GIv9qA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.3.tgz#89198b863dbfccf5f07ac3c4b20ce6199adcb17a" - integrity sha512-NLoUjcR66mqwSWuVftu2yFH4/j6QP+FiElRfZQ9OYmO8DQx2Ue5UZzjrFTrZ1DBBCfzhr2Bffj80dirGvGDyvg== +"@abp/bootstrap-datepicker@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.4.tgz#2dbc9f8f9816689b6db84948046a964ceb1bab17" + integrity sha512-tWPA3ehtU+QPKbxdLDzKk4p2wMNGo/R4CjCQydD1i9BIpkBUlA5sBtbNrLTvZ5/KM1RYecFGFrHTVVOzGsUKrA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.3.tgz#4574bf574cc3484869e8ff8bc592f6212d20a969" - integrity sha512-Q5v7WRkGhGcjRg267HXtqs1oU7ts9UXPyCXmg5y2y5qMOyioD+m4MKV4iv67DgoQjabudp8X2egTKxkej6Lzkw== +"@abp/bootstrap@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.4.tgz#f360f86b00f474236ad182cd792df24f9ecbfc47" + integrity sha512-JjHJNPkTJRYwQvRnzTvcYIbxs2TD6n+LVtCd5ItYNbg8bMyd9yMugThxtgZGE3awVQqjLxZ4fwv+CRnf70JdrQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" bootstrap "^5.1.3" -"@abp/core@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.3.tgz#5662ce813d449d97d9fb7ea2552b2774c8df7825" - integrity sha512-X/VRdk5SGNYc5gQzPcBEPAvwcuD9WXsI4YIdrqjnes0s8u2/XmfrTixojh8Y5EYUoOblEE3Soj5hBhY1cVwcbQ== +"@abp/core@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.4.tgz#d164e1ca3546dc710c569ea7ae0145e1b713658e" + integrity sha512-mH3+BCU8Wbe0mieDHd5Awvhd09X7iJKRLBQBIINcDeIIOCJ9x4v8grynvndzlaS7J2AlWZba0XJU6sZ+YpuP2w== dependencies: - "@abp/utils" "~6.0.0-rc.3" + "@abp/utils" "~6.0.0-rc.4" -"@abp/datatables.net-bs5@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.3.tgz#22865c7e621de720b71af6265b3193f6c78695bd" - integrity sha512-T+mhLc6uSzWmxDQogVwnJ6VxI4845gmF68/i9TmVKNlCtpa3EEfyuF/hgWT1hYfCb4XOsvd/CWrunbkC3fsmtg== +"@abp/datatables.net-bs5@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.4.tgz#fc3c43fb9ba8154b4b960ed0799948f5df738f7e" + integrity sha512-QtII4mFFFjvToM2LDqZugVh6/HwKbIdKYqHCxJKprZ1aVmyBeiMHi89z0G4eChAYdTpjHQstoDddYje53DkWOw== dependencies: - "@abp/datatables.net" "~6.0.0-rc.3" + "@abp/datatables.net" "~6.0.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.3.tgz#d036defe6ad7fc989dffa020ae579362ee3150d1" - integrity sha512-4cUU8/Tn0Vz9bx7jjMOD/0Viyr29fcwoQAAkxaaYZp6qiQbENgz46/xpQf2oBCoudk8CLdzpmNa7jWte7PcJJw== +"@abp/datatables.net@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.4.tgz#f6916ba9a8089b573faddcc38e6a76e38a0dce16" + integrity sha512-9zhIvAO4AX6YIUELodEUz2hsDj+RITGoxWaav90jUJEqK/jVsDfs2mbrWcLzQDMLpZVElZA0p8tUyWS8yMsjaA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.3.tgz#803569d1a7e25f8a1c2be018312449c23fb78217" - integrity sha512-lYdh38UCTSkzzw0B/mpPEo7iFXzSKHCNbBOIHe6dd6O/Qli7wYukTtUOFn5Sh+yoydLY1as92HtiGL1ckSdu1g== +"@abp/font-awesome@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.4.tgz#a3e1664cbebdbc1aa4d2dd1ac48f022b3ce100ad" + integrity sha512-tlBekvBQ/wEkx1Z2sX8cPp/JKzxmTsMSUSbnAc/Uz+De/fxhyepUACb35zFSv2VmLPz1M1xqLvLUCJmciZhINQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.3.tgz#4ec503c07e2194148c3a7e7cf7ddef2871679e6a" - integrity sha512-Q3uEpflntqrSkYakcdsBnnYYfxJWXD/CDjMiwjbb6gIc8s4qkbIYxVxvYvlEezoIDYQkMSXOn7BS4clWsesiJg== +"@abp/jquery-form@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.4.tgz#4dfbef35e4d7dc80534e0f33644142a9ccd54cb4" + integrity sha512-/21ibf99c8q7ygbj2QF7GAGCW1MaalAurueffndTGZPRRSKrCVTPINtBih7NGgh1zcavhog+GBA3INJ3etQIWQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.3.tgz#01da2a59663d373ff1c69022f4c9c66ad0b29403" - integrity sha512-ij1ML2D9rYF3pJthWO6mGQajsJhbDCtOoBvnh9yCZccuwOYkXP22PqfUxjjxtqL4HqFI31KRpFg0ANMGSzEEBg== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.4.tgz#6a498b76076683bbc77d7a73fcf893863aecb59f" + integrity sha512-+9RAPaFYsuSZ05RtJJNeHl1PkyHm9Mv3WKAw+QrKHzaK34zpjD/cZdiijcAWM3DrNPiCCuaaUgMMIMn223MIEA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.3" + "@abp/jquery-validation" "~6.0.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.3.tgz#724aea9572dcb2faccf8c6355332b0b2a4df9260" - integrity sha512-rTK5oHaMtycvWxunNwzbE/MbsXXIr6qDnOY3rVUmjTHjqUOHYz591t/XeQfjnSXPp4k/SZUjG6viTC3J2jzC1A== +"@abp/jquery-validation@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.4.tgz#2f79457d2c83795449eb6d3c82942568b0e6f273" + integrity sha512-a3v0QDWm2kqrr5r4Nim8unT7p5xHt8KR/TGmGiS6CNMRXVtd6SLMDg36D1d5AcBemFW5evlySiqAl2D7v+g0/g== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.3.tgz#ba19cc8b802c46490277939e6c674811127d8016" - integrity sha512-MbD38iInyag7/j5k42cvMT4jLZMtXH4lUK0rjvqUDVaxKEks46Ix/90uczQ9XajYONgx0CJKFj2urgM830+CCA== +"@abp/jquery@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.4.tgz#992222c2e233840ce7bf573b8bb15b0c9c15adde" + integrity sha512-JRf9NltPP++RAfPRvWFoYNgs2i/ydyROjtLSnCGdmO4UwAQZ21YuDY7x0Ia7VSj0a6cFg8d7M2PGIeJlcaXIsg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.3.tgz#8a5bab02353e5cab4ca06ab82f6dbe6285faa95a" - integrity sha512-c8yhcapzPsXyeiFjeOC+2a4bn5wFjW5gUoN+p/p+tE+FIcH37yEgyw/tAr6aZPCmR770MqQXct4t7S4Czbbk+A== +"@abp/lodash@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.4.tgz#2c88a9274e6c27334f277404280d43b2fbae6552" + integrity sha512-yOEe3SVvh5IuFMujSgC4waG0JzWzRQj907KUYzjcjfx35J5Q0Mwvu6/9wRYJx1av40YQdnzMrRoqXKDPAKdV6A== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.3.tgz#ba515e122c61918d481467d5be39f08a363822f6" - integrity sha512-2lRSSC0DYShlnKdbJ/Pmha/azjt09ZRPx57NQ01dc7ungChPry5EJL6pC3kXWnJrCkrPCF0V5+A3+taut9+l3A== +"@abp/luxon@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.4.tgz#95ae8f70d9b5d8cd753cc7d918c611692d5bf218" + integrity sha512-OFs4Uv82YienRwiiVV78hdWSanS19lvjoBBskPF5s6LK/5mzLMrtbHBRf18wcc/AfBMOxot1BX2q1v4wb2u3qw== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.3.tgz#0798e37ec6a852748118692a5fbd30c99d9745db" - integrity sha512-FlyShmRxG3wGk1OJCjHIZAdi2/Y2FJPkVxaE72CVIceQSmg0nebGTv3a7bhd4QzKkDsSA3+t6gHjnuKlTlDFLA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.4.tgz#f40968c7f64eb6b36ff2bf06b4be8661308abd12" + integrity sha512-lcOskhl+NbPqKBxg+GABYBBrMtHYw2qZ/srFix7DgGUdNlFbXRP/AtTz0Wiav0PNGZgivniRLqvqcLCiCkrBrg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.3.tgz#deb8332bfce2102a562004893321a48d5194bf53" - integrity sha512-rb0qElmmhiP09xX8ZbjzNLF6ygFBwErysGWt6Bbgzz5waX2sGe575Cgoz53FaMQ4JaRBg1N0/nCejKyDtiINRA== +"@abp/select2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.4.tgz#c7cf0f910fa6a9f97845a0659178ac02cfa022bc" + integrity sha512-NcXMZYiLDSVnjtRgvPwm9RB1M7qZnRyyyM+htdH5laEvDDGCcOLFS8iK6WI4Irmvw6MhBkDTHaH9ssJNbF7pvQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.3.tgz#e61fc6c1bed1316c1d44ca5c92f590e422db24d4" - integrity sha512-+SNpBb4XrQlWzRQK9lfdJqA9IfJrlgoqmHwPDgf3Q+P922MzO33TgDlZWbeE7MzVj2y2WmNsPuCKwhjSjSL2rw== +"@abp/sweetalert2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.4.tgz#a1a2a1a5d7e1fb83680cc35ca477cee1f2f2463b" + integrity sha512-dvslRK2oc06JjI6aV1dj1LzWbOb50BfwbHxcmOenl8Q4XMP389bFbaOiVezjk+d3YLsspCMDxxu2NTqaq67Z6g== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.3.tgz#0ef8c4801bfd4623e6895b1d047b1437063bda53" - integrity sha512-P3YRDVKjR5/Fz+cXiPg3IiUr7XGbNh7mgmJ1ywRXmKVmVMJmhQ2RsKmmtkGJn4TfVHu/l5iJXe4rqgL21/yX/g== +"@abp/timeago@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.4.tgz#3a93a65ee6b8260f7e80bb862b60623e967e08a2" + integrity sha512-/ZZy5E3PHtvmkjg+s9BvgO344DOs0jiifimDntp5jZPQPrsQ5WPC9o9hrlGb40tTw5P0wAnznjGvHnZjBiflvA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.3.tgz#6010d4247937531ebf7c8659d6254cd3db6c4855" - integrity sha512-sC9eCzYVgDrLSFIhJGe9hshzfwA1BkZNah4NQhyq+V6HQ8YF7goMS79N+/XmSoLQ9zzRhusqnPFnb+4FHjr7iA== +"@abp/toastr@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.4.tgz#3bf6abc79baf7a2b7de9840e55caf839018ab96e" + integrity sha512-zesojzXYsFd57m7XBgxLwKeAs8HRe25iNKRGC0YR7MK2HP1770jc+dEjnQ0pnqhMHouZejFJZcpqdHGr85ZUgQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.3.tgz#6d3515694314175218606e9518618ce335b4b360" - integrity sha512-K2geJ9P1ztk4Ehzb9YG3CqqLOi+z8/4iBLUzooNZLQqS+KdlUhCmqfuCoI/A5Aq9DGbTYesalp+Fwoh3S2Dl8A== +"@abp/utils@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.4.tgz#e18ef1557a2600fa153db13162e1ed097bc6f15a" + integrity sha512-eT6RVfFsyB8uAdMHDdG4M2Erg3RrvkG7Z5Xa0ko7JIhEz5VwsRcXGwTAORYHsu0M1hpewZljdD5OmQRods13LA== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json index 38f9f7fac3..1c1f12d3dc 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.3", - "@abp/cms-kit": "6.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.4", + "@abp/cms-kit": "6.0.0-rc.4" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock index 16b4938438..ae3431aed5 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.3.tgz#b95266387e562c635de795442f90470f8e9e6318" - integrity sha512-vVkEpotDST455E3rynvRQpBKPcNNJ2m1wLkz/B9dQNdUjvm8L4F6s0ls0XFlKUNvQfCVfedkRtGayuvNje/Oxg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.3.tgz#664ca2ee712b7d9e66103c00beb41eb9648a6075" - integrity sha512-KxCsGuoUWKaDo7Oo9aKp51pli2m0DZ2tG8m+zK+m4M9U7g96uC+DOFy3gc7MdPlszvrw32Wwm7I0AughstByNA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.3" - "@abp/bootstrap" "~6.0.0-rc.3" - "@abp/bootstrap-datepicker" "~6.0.0-rc.3" - "@abp/datatables.net-bs5" "~6.0.0-rc.3" - "@abp/font-awesome" "~6.0.0-rc.3" - "@abp/jquery-form" "~6.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.3" - "@abp/lodash" "~6.0.0-rc.3" - "@abp/luxon" "~6.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.3" - "@abp/select2" "~6.0.0-rc.3" - "@abp/sweetalert2" "~6.0.0-rc.3" - "@abp/timeago" "~6.0.0-rc.3" - "@abp/toastr" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.3.tgz#47c23b57ed3908bd78a232230e53d1f3cba2de41" - integrity sha512-7eJZy2JUGQP94Tz3JJWXRHRmDfTcPZ/lS1/VNbU8B4qvgl5ChIXklVEJLR1fwrBhKXZV8fGVmqT1XlGTGFvFJA== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.4.tgz#f57efa6f3cabb48e40a44e79adb31de58145bf89" + integrity sha512-JcoXch+j+T9V3Lfu9Of9Tbcw5sNBpSbe42SjzUcXLqdVijV/DBWKMg/9OPH8KZ4PZwl4sl9DSAmGWXHdipLxzA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.4.tgz#a0fd1e9f6f05d854d6f2119ed551a1cef485c929" + integrity sha512-QsrV+N6YFuMo/q73Bd1P0qDyG0Ua5JmQFgKzA94eMXDyYgpRrT5RyKh0CNV81Q/AX9V5c6APrtcQ31tYzmWwbQ== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.4" + "@abp/bootstrap" "~6.0.0-rc.4" + "@abp/bootstrap-datepicker" "~6.0.0-rc.4" + "@abp/datatables.net-bs5" "~6.0.0-rc.4" + "@abp/font-awesome" "~6.0.0-rc.4" + "@abp/jquery-form" "~6.0.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.4" + "@abp/lodash" "~6.0.0-rc.4" + "@abp/luxon" "~6.0.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.4" + "@abp/select2" "~6.0.0-rc.4" + "@abp/sweetalert2" "~6.0.0-rc.4" + "@abp/timeago" "~6.0.0-rc.4" + "@abp/toastr" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.4.tgz#de70d53a900db2f5c74719b7c4e406e0de4c2662" + integrity sha512-8GUoTG4B3Tz2Xd/cFaw9EAjOUoEfMG95VkjNqdfcvPPrtFML/W3fcMUwbjOvQ/lEnAMTSGREU3w9y7Y+GIv9qA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,243 +41,243 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.3.tgz#89198b863dbfccf5f07ac3c4b20ce6199adcb17a" - integrity sha512-NLoUjcR66mqwSWuVftu2yFH4/j6QP+FiElRfZQ9OYmO8DQx2Ue5UZzjrFTrZ1DBBCfzhr2Bffj80dirGvGDyvg== +"@abp/bootstrap-datepicker@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.4.tgz#2dbc9f8f9816689b6db84948046a964ceb1bab17" + integrity sha512-tWPA3ehtU+QPKbxdLDzKk4p2wMNGo/R4CjCQydD1i9BIpkBUlA5sBtbNrLTvZ5/KM1RYecFGFrHTVVOzGsUKrA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.3.tgz#4574bf574cc3484869e8ff8bc592f6212d20a969" - integrity sha512-Q5v7WRkGhGcjRg267HXtqs1oU7ts9UXPyCXmg5y2y5qMOyioD+m4MKV4iv67DgoQjabudp8X2egTKxkej6Lzkw== +"@abp/bootstrap@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.4.tgz#f360f86b00f474236ad182cd792df24f9ecbfc47" + integrity sha512-JjHJNPkTJRYwQvRnzTvcYIbxs2TD6n+LVtCd5ItYNbg8bMyd9yMugThxtgZGE3awVQqjLxZ4fwv+CRnf70JdrQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" bootstrap "^5.1.3" -"@abp/clipboard@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.3.tgz#ee3a586b491d89442eefff08aaebbf9d38cb46d4" - integrity sha512-01svpp3mR29z1FTM+2Qe+MUNLPbl95bWlOXY5zz2hvNSbdD45lGud+BiOHfeZwlDk5jjr3FqLel+hxx2ByBvOA== +"@abp/clipboard@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.4.tgz#a1f08eb23ebe7fcac0521aa992c6cebb9753c004" + integrity sha512-dX8l7Akyv5ecx7+Op8Cp/q4JslnhA9G0Eok4iPcnYwHh9NfSLnusack9x4u370Y+eShRxFiiBDq44ZsCN66h/Q== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" clipboard "^2.0.8" -"@abp/cms-kit.admin@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-6.0.0-rc.3.tgz#2e1b05e88846971e73977736635b4fd1c235a092" - integrity sha512-ClVNcpKpOrZSUf0TuEx175ucK3IIxgH7GdqJpGkirqjCxVKyeGWhwyWB1JRCkXfHdE5XUxNJaYitrhQoNuZklw== +"@abp/cms-kit.admin@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-6.0.0-rc.4.tgz#a5b8b00e0d95bcb20fefe8888fb512dd33c92d08" + integrity sha512-iAmIejFqkpkd/8BBDjdkmpMmuTdKd6v8+DBGwaW13itxSMXM9bHuigNZqVZ4SdcQ35MI0NZMg1GtIi/gmc0IUw== dependencies: - "@abp/codemirror" "~6.0.0-rc.3" - "@abp/jstree" "~6.0.0-rc.3" - "@abp/slugify" "~6.0.0-rc.3" - "@abp/tui-editor" "~6.0.0-rc.3" - "@abp/uppy" "~6.0.0-rc.3" + "@abp/codemirror" "~6.0.0-rc.4" + "@abp/jstree" "~6.0.0-rc.4" + "@abp/slugify" "~6.0.0-rc.4" + "@abp/tui-editor" "~6.0.0-rc.4" + "@abp/uppy" "~6.0.0-rc.4" -"@abp/cms-kit.public@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-6.0.0-rc.3.tgz#18c3e18d094a0c5d6fafb7865f27bfba49bdc420" - integrity sha512-6Pg1Y2UGwsBLLHe37MMerxSg0n8Qa3CLJoyGJndPmRpxfX14Vu465efSPjxENJrhnoU1FEe9xaNssJ9Lb+JdjA== +"@abp/cms-kit.public@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-6.0.0-rc.4.tgz#1cfaaef1a199282e37361e98b0b27aa4d1b3fe81" + integrity sha512-9kJTPm5cAgMfuvoEgH4shKslYmd1Yu6mV/OGVcOjOHLFN5XRmM4AuwmYj2AvGQHaUIrAlh2m7f4OOgZL8JK9ug== dependencies: - "@abp/highlight.js" "~6.0.0-rc.3" - "@abp/star-rating-svg" "~6.0.0-rc.3" + "@abp/highlight.js" "~6.0.0-rc.4" + "@abp/star-rating-svg" "~6.0.0-rc.4" -"@abp/cms-kit@6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-6.0.0-rc.3.tgz#3e8883553b57f6daf025cb6fa595984a2f6d0be0" - integrity sha512-WiZrpuNhmh/ei8e6HFneBIH99rFdIE2cCGhFBY9WY+Ne3SzcUGYUjJ8DN4x63OS5P2AtxVDhckIznYZWpAw+kQ== +"@abp/cms-kit@6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-6.0.0-rc.4.tgz#9ef05935faadfc4a28a466c8eb2461e16222a10a" + integrity sha512-Ds+TTwPghQOqyWiv3qp9SX1SWqnH2Ac3pfcNRivzgV8LseR7I7inkxIa1RQY+8McJXMUgaAXKMqVtHoXyhLLFQ== dependencies: - "@abp/cms-kit.admin" "~6.0.0-rc.3" - "@abp/cms-kit.public" "~6.0.0-rc.3" + "@abp/cms-kit.admin" "~6.0.0-rc.4" + "@abp/cms-kit.public" "~6.0.0-rc.4" -"@abp/codemirror@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-6.0.0-rc.3.tgz#3624229745308b14fc95b19cf99a7771945d458e" - integrity sha512-FqqYAKFzLCtcRri33YhMcVNuM2zHpV2Qvcu1DTWPL+kdeiw5tPi/Nm9qB0D0aRfefJNkcVLDvP64pnLnVLLWMA== +"@abp/codemirror@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-6.0.0-rc.4.tgz#94f02b5e9eac77a680507132e46e2290ec283340" + integrity sha512-RvBFeSHYOSTotAqQ6mfzd7xwJz1PQ5v0gu8MqBVLV19SuKHAk+DwHdJgai0iQlT/YKRBEC1UlPrQ4M/zoEz6sg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" codemirror "^5.65.1" -"@abp/core@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.3.tgz#5662ce813d449d97d9fb7ea2552b2774c8df7825" - integrity sha512-X/VRdk5SGNYc5gQzPcBEPAvwcuD9WXsI4YIdrqjnes0s8u2/XmfrTixojh8Y5EYUoOblEE3Soj5hBhY1cVwcbQ== +"@abp/core@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.4.tgz#d164e1ca3546dc710c569ea7ae0145e1b713658e" + integrity sha512-mH3+BCU8Wbe0mieDHd5Awvhd09X7iJKRLBQBIINcDeIIOCJ9x4v8grynvndzlaS7J2AlWZba0XJU6sZ+YpuP2w== dependencies: - "@abp/utils" "~6.0.0-rc.3" + "@abp/utils" "~6.0.0-rc.4" -"@abp/datatables.net-bs5@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.3.tgz#22865c7e621de720b71af6265b3193f6c78695bd" - integrity sha512-T+mhLc6uSzWmxDQogVwnJ6VxI4845gmF68/i9TmVKNlCtpa3EEfyuF/hgWT1hYfCb4XOsvd/CWrunbkC3fsmtg== +"@abp/datatables.net-bs5@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.4.tgz#fc3c43fb9ba8154b4b960ed0799948f5df738f7e" + integrity sha512-QtII4mFFFjvToM2LDqZugVh6/HwKbIdKYqHCxJKprZ1aVmyBeiMHi89z0G4eChAYdTpjHQstoDddYje53DkWOw== dependencies: - "@abp/datatables.net" "~6.0.0-rc.3" + "@abp/datatables.net" "~6.0.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.3.tgz#d036defe6ad7fc989dffa020ae579362ee3150d1" - integrity sha512-4cUU8/Tn0Vz9bx7jjMOD/0Viyr29fcwoQAAkxaaYZp6qiQbENgz46/xpQf2oBCoudk8CLdzpmNa7jWte7PcJJw== +"@abp/datatables.net@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.4.tgz#f6916ba9a8089b573faddcc38e6a76e38a0dce16" + integrity sha512-9zhIvAO4AX6YIUELodEUz2hsDj+RITGoxWaav90jUJEqK/jVsDfs2mbrWcLzQDMLpZVElZA0p8tUyWS8yMsjaA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.3.tgz#803569d1a7e25f8a1c2be018312449c23fb78217" - integrity sha512-lYdh38UCTSkzzw0B/mpPEo7iFXzSKHCNbBOIHe6dd6O/Qli7wYukTtUOFn5Sh+yoydLY1as92HtiGL1ckSdu1g== +"@abp/font-awesome@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.4.tgz#a3e1664cbebdbc1aa4d2dd1ac48f022b3ce100ad" + integrity sha512-tlBekvBQ/wEkx1Z2sX8cPp/JKzxmTsMSUSbnAc/Uz+De/fxhyepUACb35zFSv2VmLPz1M1xqLvLUCJmciZhINQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/highlight.js@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-6.0.0-rc.3.tgz#e7aa8388afb57a1574f2645a7f786000b553562d" - integrity sha512-q0WhsovYfYrlNvIJyyXShXSTaY9cXNMEJbwJmmlQMVSyHUUPMfOf3w4ofBEC92U0mgzeIi7TMx9vJlm9qjSVJA== +"@abp/highlight.js@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-6.0.0-rc.4.tgz#2c1b9ae55299340dd93b6dcd938db9939a34fda9" + integrity sha512-5LOZmsVW/2rQ51Ls34j+VGz7rnjfhkn5ajWL+aFbbzt4FSACatFOjHGInByjcvRG3ucN5wvHpoIlK31zUmtXgA== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" "@highlightjs/cdn-assets" "~11.4.0" -"@abp/jquery-form@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.3.tgz#4ec503c07e2194148c3a7e7cf7ddef2871679e6a" - integrity sha512-Q3uEpflntqrSkYakcdsBnnYYfxJWXD/CDjMiwjbb6gIc8s4qkbIYxVxvYvlEezoIDYQkMSXOn7BS4clWsesiJg== +"@abp/jquery-form@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.4.tgz#4dfbef35e4d7dc80534e0f33644142a9ccd54cb4" + integrity sha512-/21ibf99c8q7ygbj2QF7GAGCW1MaalAurueffndTGZPRRSKrCVTPINtBih7NGgh1zcavhog+GBA3INJ3etQIWQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.3.tgz#01da2a59663d373ff1c69022f4c9c66ad0b29403" - integrity sha512-ij1ML2D9rYF3pJthWO6mGQajsJhbDCtOoBvnh9yCZccuwOYkXP22PqfUxjjxtqL4HqFI31KRpFg0ANMGSzEEBg== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.4.tgz#6a498b76076683bbc77d7a73fcf893863aecb59f" + integrity sha512-+9RAPaFYsuSZ05RtJJNeHl1PkyHm9Mv3WKAw+QrKHzaK34zpjD/cZdiijcAWM3DrNPiCCuaaUgMMIMn223MIEA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.3" + "@abp/jquery-validation" "~6.0.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.3.tgz#724aea9572dcb2faccf8c6355332b0b2a4df9260" - integrity sha512-rTK5oHaMtycvWxunNwzbE/MbsXXIr6qDnOY3rVUmjTHjqUOHYz591t/XeQfjnSXPp4k/SZUjG6viTC3J2jzC1A== +"@abp/jquery-validation@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.4.tgz#2f79457d2c83795449eb6d3c82942568b0e6f273" + integrity sha512-a3v0QDWm2kqrr5r4Nim8unT7p5xHt8KR/TGmGiS6CNMRXVtd6SLMDg36D1d5AcBemFW5evlySiqAl2D7v+g0/g== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.3.tgz#ba19cc8b802c46490277939e6c674811127d8016" - integrity sha512-MbD38iInyag7/j5k42cvMT4jLZMtXH4lUK0rjvqUDVaxKEks46Ix/90uczQ9XajYONgx0CJKFj2urgM830+CCA== +"@abp/jquery@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.4.tgz#992222c2e233840ce7bf573b8bb15b0c9c15adde" + integrity sha512-JRf9NltPP++RAfPRvWFoYNgs2i/ydyROjtLSnCGdmO4UwAQZ21YuDY7x0Ia7VSj0a6cFg8d7M2PGIeJlcaXIsg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" jquery "~3.6.0" -"@abp/jstree@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-6.0.0-rc.3.tgz#b43b83d0b4904daf3f16df6465b26ce38348a62b" - integrity sha512-0N+U/pBWyTg634h2Hfq44ECKvGB2Sryp/JNJAbqbAsIagiaA67xcC2Gj5C/NbNKkPCTTjhC6nh4wNvZX7A+x1Q== +"@abp/jstree@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-6.0.0-rc.4.tgz#1789792593d28a65c817f021e2c7f6f8b708e5f2" + integrity sha512-aHIPeRpV6OGwsrNxkR2ROTgL1Wzv9j0UPT9UpIF823wuXAIjUfeqpVsIN+T9IUT17it9L8IL5UoEzFfdyjExng== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jstree "^3.3.12" -"@abp/lodash@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.3.tgz#8a5bab02353e5cab4ca06ab82f6dbe6285faa95a" - integrity sha512-c8yhcapzPsXyeiFjeOC+2a4bn5wFjW5gUoN+p/p+tE+FIcH37yEgyw/tAr6aZPCmR770MqQXct4t7S4Czbbk+A== +"@abp/lodash@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.4.tgz#2c88a9274e6c27334f277404280d43b2fbae6552" + integrity sha512-yOEe3SVvh5IuFMujSgC4waG0JzWzRQj907KUYzjcjfx35J5Q0Mwvu6/9wRYJx1av40YQdnzMrRoqXKDPAKdV6A== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.3.tgz#ba515e122c61918d481467d5be39f08a363822f6" - integrity sha512-2lRSSC0DYShlnKdbJ/Pmha/azjt09ZRPx57NQ01dc7ungChPry5EJL6pC3kXWnJrCkrPCF0V5+A3+taut9+l3A== +"@abp/luxon@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.4.tgz#95ae8f70d9b5d8cd753cc7d918c611692d5bf218" + integrity sha512-OFs4Uv82YienRwiiVV78hdWSanS19lvjoBBskPF5s6LK/5mzLMrtbHBRf18wcc/AfBMOxot1BX2q1v4wb2u3qw== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.3.tgz#0798e37ec6a852748118692a5fbd30c99d9745db" - integrity sha512-FlyShmRxG3wGk1OJCjHIZAdi2/Y2FJPkVxaE72CVIceQSmg0nebGTv3a7bhd4QzKkDsSA3+t6gHjnuKlTlDFLA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.4.tgz#f40968c7f64eb6b36ff2bf06b4be8661308abd12" + integrity sha512-lcOskhl+NbPqKBxg+GABYBBrMtHYw2qZ/srFix7DgGUdNlFbXRP/AtTz0Wiav0PNGZgivniRLqvqcLCiCkrBrg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.3.tgz#e4faf595e29db81c5a66030e59b0e09f09759bfd" - integrity sha512-zzd3iw/Im0M9FUmTviwkTCr4slkoZJExtK+qB1FmLxRY59+hyU9wxd6hwzic/QwhXxFQoYILJ3S3FNxsPIm76A== +"@abp/prismjs@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.4.tgz#9338018487dde7ddc5384cdfbdc35c655a8fd444" + integrity sha512-F1t7ySbj+M6LDmgbvvcY2bFl0heEj1vz14YOnmwMNUhJcaLQXamgyKsWBu5UkEHUJ11DQyjIu5gjoRXbraucdA== dependencies: - "@abp/clipboard" "~6.0.0-rc.3" - "@abp/core" "~6.0.0-rc.3" + "@abp/clipboard" "~6.0.0-rc.4" + "@abp/core" "~6.0.0-rc.4" prismjs "^1.26.0" -"@abp/select2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.3.tgz#deb8332bfce2102a562004893321a48d5194bf53" - integrity sha512-rb0qElmmhiP09xX8ZbjzNLF6ygFBwErysGWt6Bbgzz5waX2sGe575Cgoz53FaMQ4JaRBg1N0/nCejKyDtiINRA== +"@abp/select2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.4.tgz#c7cf0f910fa6a9f97845a0659178ac02cfa022bc" + integrity sha512-NcXMZYiLDSVnjtRgvPwm9RB1M7qZnRyyyM+htdH5laEvDDGCcOLFS8iK6WI4Irmvw6MhBkDTHaH9ssJNbF7pvQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" select2 "^4.0.13" -"@abp/slugify@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-6.0.0-rc.3.tgz#9ab27f563a6f89ba254240f4f0fe7c6a162bf0e8" - integrity sha512-V/lAX81CYe5DDGCv+xFiHuleOW/H/2ntXBByNDOqAFpK74vbEsxLTeCRpJ902intRDlnZFJb2G4khJNPQgb91w== +"@abp/slugify@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-6.0.0-rc.4.tgz#469cf0e43a7717a29de23ddd39bfaa2d3af2982f" + integrity sha512-jZdPfVf/78PSbcNpXjNJal5U+QHljkoHu8ywkBAbYo81LfierXziQiNbqMbai4spD7ZhpU1Fz4fIg5qTdRegBA== dependencies: slugify "^1.6.5" -"@abp/star-rating-svg@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-6.0.0-rc.3.tgz#81c6bdcf5161ca269de5b7162c4178d2bac2d877" - integrity sha512-o3ciRL2wID/TZflcAZybGMaXLs76Ed7a4LHmDuvPcN/VP92uUWB/baKcl2bVbYLq+xokyko+Ei2YtkqoysG7/A== +"@abp/star-rating-svg@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-6.0.0-rc.4.tgz#69885023aca13654658304714c46ae0c539d8311" + integrity sha512-pJOR68fX24e0WblMb6RpRk5muBCax//aMAjAEXC9bbUU0simRXf3P5dnVm3RVseMIrh/fd4Wj1kBetg8yf2i4g== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" star-rating-svg "^3.5.0" -"@abp/sweetalert2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.3.tgz#e61fc6c1bed1316c1d44ca5c92f590e422db24d4" - integrity sha512-+SNpBb4XrQlWzRQK9lfdJqA9IfJrlgoqmHwPDgf3Q+P922MzO33TgDlZWbeE7MzVj2y2WmNsPuCKwhjSjSL2rw== +"@abp/sweetalert2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.4.tgz#a1a2a1a5d7e1fb83680cc35ca477cee1f2f2463b" + integrity sha512-dvslRK2oc06JjI6aV1dj1LzWbOb50BfwbHxcmOenl8Q4XMP389bFbaOiVezjk+d3YLsspCMDxxu2NTqaq67Z6g== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.3.tgz#0ef8c4801bfd4623e6895b1d047b1437063bda53" - integrity sha512-P3YRDVKjR5/Fz+cXiPg3IiUr7XGbNh7mgmJ1ywRXmKVmVMJmhQ2RsKmmtkGJn4TfVHu/l5iJXe4rqgL21/yX/g== +"@abp/timeago@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.4.tgz#3a93a65ee6b8260f7e80bb862b60623e967e08a2" + integrity sha512-/ZZy5E3PHtvmkjg+s9BvgO344DOs0jiifimDntp5jZPQPrsQ5WPC9o9hrlGb40tTw5P0wAnznjGvHnZjBiflvA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.3.tgz#6010d4247937531ebf7c8659d6254cd3db6c4855" - integrity sha512-sC9eCzYVgDrLSFIhJGe9hshzfwA1BkZNah4NQhyq+V6HQ8YF7goMS79N+/XmSoLQ9zzRhusqnPFnb+4FHjr7iA== +"@abp/toastr@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.4.tgz#3bf6abc79baf7a2b7de9840e55caf839018ab96e" + integrity sha512-zesojzXYsFd57m7XBgxLwKeAs8HRe25iNKRGC0YR7MK2HP1770jc+dEjnQ0pnqhMHouZejFJZcpqdHGr85ZUgQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" toastr "^2.1.4" -"@abp/tui-editor@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-6.0.0-rc.3.tgz#7e913a80139af381d881f2b0205d4938ec6f6ca3" - integrity sha512-FC+gyHMn/FecAb8sVNFwf9FcJ035Lqm+LwiIXckS2VaSTbuKna0K/ADlOoSr1Ntwe5GWptZ93STIgSt1QJPdEw== +"@abp/tui-editor@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-6.0.0-rc.4.tgz#58b4f7ea991a4a805bedac7f5fd5bb314dd4d8bc" + integrity sha512-1bMvVUeFUzcQB3SmNhW9K4CC5isoMTUJ4pY2OKf4Y9RgKsTUOEuaUwzSoJwDLj4mlzdLTee4/Rxi4zhdnkxDaA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" - "@abp/prismjs" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" + "@abp/prismjs" "~6.0.0-rc.4" -"@abp/uppy@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-6.0.0-rc.3.tgz#9b978aa86ef4721a4e7b534e92d717c6f594873d" - integrity sha512-RDj30BLUJIQYWUMsJOC6Px0Ez4qqMYBsodmp6SpnayI8V+PRLYBkHvRQGE4cgul9lpMMcAO87fohpL9w0oRm8w== +"@abp/uppy@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-6.0.0-rc.4.tgz#53b1f510d3e3786beeb1cf06709d0e7011a7f65a" + integrity sha512-LSAmZYuWTK2GISFrkhTxpuCZSvqd/Rx+DzQcTvTFza2a+MG8TNOeX3i4qdTadoJzmjHHjxxPO/oFBNj0ApLc0g== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" uppy "^1.16.1" -"@abp/utils@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.3.tgz#6d3515694314175218606e9518618ce335b4b360" - integrity sha512-K2geJ9P1ztk4Ehzb9YG3CqqLOi+z8/4iBLUzooNZLQqS+KdlUhCmqfuCoI/A5Aq9DGbTYesalp+Fwoh3S2Dl8A== +"@abp/utils@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.4.tgz#e18ef1557a2600fa153db13162e1ed097bc6f15a" + integrity sha512-eT6RVfFsyB8uAdMHDdG4M2Erg3RrvkG7Z5Xa0ko7JIhEz5VwsRcXGwTAORYHsu0M1hpewZljdD5OmQRods13LA== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json index a24b8b89cb..7a3207da51 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Admin.Application", - "hash": "26aaaf7203b92c171ba27f811f10b409", + "hash": "d397763f02ef471e9dd35eb1f819db29", "contents": [ { "namespace": "Volo.CmsKit.Admin", @@ -21,12 +21,12 @@ "summary": null, "implementingInterfaces": [ "Volo.CmsKit.Admin.Tags.ITagAdminAppService", - "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", "Volo.Abp.Application.Services.IDeleteAppService`1[[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]" ], "contentType": "applicationService", @@ -37,11 +37,11 @@ "summary": null, "implementingInterfaces": [ "Volo.CmsKit.Admin.Pages.IPageAdminAppService", - "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.GetPagesInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.CreatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.UpdatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.GetPagesInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.CreatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.UpdatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.CreatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.UpdatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.GetPagesInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.CreatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.UpdatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.GetPagesInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.CreatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.UpdatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.CreatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.UpdatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", "Volo.Abp.Application.Services.IDeleteAppService`1[[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]" ], "contentType": "applicationService", @@ -65,6 +65,15 @@ "contentType": "applicationService", "name": "MediaDescriptorAdminAppService" }, + { + "namespace": "Volo.CmsKit.Admin.GlobalResources", + "summary": null, + "implementingInterfaces": [ + "Volo.CmsKit.Admin.GlobalResources.IGlobalResourceAdminAppService" + ], + "contentType": "applicationService", + "name": "GlobalResourceAdminAppService" + }, { "namespace": "Volo.CmsKit.Admin.Comments", "summary": null, @@ -79,12 +88,12 @@ "summary": null, "implementingInterfaces": [ "Volo.CmsKit.Admin.Blogs.IBlogAdminAppService", - "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", "Volo.Abp.Application.Services.IDeleteAppService`1[[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]" ], "contentType": "applicationService", @@ -104,11 +113,11 @@ "summary": null, "implementingInterfaces": [ "Volo.CmsKit.Admin.Blogs.IBlogPostAdminAppService", - "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogPostListDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogPostGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogPostListDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogPostGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.CreateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.UpdateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogPostListDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogPostGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogPostListDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogPostGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.CreateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.UpdateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", "Volo.Abp.Application.Services.IDeleteAppService`1[[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]" ], "contentType": "applicationService", diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.analyze.json index baab75054d..67ed3e0f3b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Admin.HttpApi.Client", - "hash": "d3e74606dde1a5099e9f02c0384b9057", + "hash": "e9b74f85924bb2ea21d651612c337c8d", "contents": [ { "namespace": "Volo.CmsKit.Admin", diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.analyze.json index 824c9d950a..8dcbb1dadd 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Admin.HttpApi", - "hash": "2db77730b823b6adecfe095f7a8a4449", + "hash": "613b16275c5d464aa927a53ca452f7ab", "contents": [ { "namespace": "Volo.CmsKit.Admin", diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs index bc9bbfb310..9d212f9c82 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs @@ -35,7 +35,8 @@ public class CmsKitAdminMenuContributor : IMenuContributor CmsKitAdminMenus.Pages.PagesMenu, l["Pages"].Value, "/Cms/Pages", - "fa fa-file-alt") + "fa fa-file-alt", + order: 6) .RequireGlobalFeatures(typeof(PagesFeature)) .RequirePermissions(CmsKitAdminPermissions.Pages.Default)); @@ -43,7 +44,8 @@ public class CmsKitAdminMenuContributor : IMenuContributor CmsKitAdminMenus.Blogs.BlogsMenu, l["Blogs"], "/Cms/Blogs", - "fa fa-blog") + "fa fa-blog", + order: 1) .RequireGlobalFeatures(typeof(BlogsFeature)) .RequirePermissions(CmsKitAdminPermissions.Blogs.Default)); @@ -51,7 +53,8 @@ public class CmsKitAdminMenuContributor : IMenuContributor CmsKitAdminMenus.BlogPosts.BlogPostsMenu, l["BlogPosts"], "/Cms/BlogPosts", - "fa fa-file-signature") + "fa fa-file-signature", + order: 2) .RequireGlobalFeatures(typeof(BlogsFeature)) .RequirePermissions(CmsKitAdminPermissions.BlogPosts.Default)); @@ -59,7 +62,8 @@ public class CmsKitAdminMenuContributor : IMenuContributor CmsKitAdminMenus.Tags.TagsMenu, l["Tags"].Value, "/Cms/Tags", - "fa fa-tags") + "fa fa-tags", + order: 7) .RequireGlobalFeatures(typeof(TagsFeature)) .RequirePermissions(CmsKitAdminPermissions.Tags.Default)); @@ -67,7 +71,8 @@ public class CmsKitAdminMenuContributor : IMenuContributor CmsKitAdminMenus.Comments.CommentsMenu, l["Comments"].Value, "/Cms/Comments", - "fa fa-comments") + "fa fa-comments", + order: 3) .RequireGlobalFeatures(typeof(CommentsFeature)) .RequirePermissions(CmsKitAdminPermissions.Comments.Default)); @@ -75,7 +80,8 @@ public class CmsKitAdminMenuContributor : IMenuContributor CmsKitAdminMenus.Menus.MenusMenu, l["Menus"], "/Cms/Menus/Items", - "fa fa-stream") + "fa fa-stream", + order: 5) .RequireGlobalFeatures(typeof(MenuFeature)) .RequirePermissions(CmsKitAdminPermissions.Menus.Default)); @@ -83,7 +89,8 @@ public class CmsKitAdminMenuContributor : IMenuContributor CmsKitAdminMenus.GlobalResources.GlobalResourcesMenu, l["GlobalResources"], "/Cms/GlobalResources", - "fa fa-newspaper") + "bi bi-code-slash", + order: 4) .RequireGlobalFeatures(typeof(GlobalResourcesFeature)) .RequirePermissions(CmsKitAdminPermissions.GlobalResources.Default)); @@ -105,6 +112,7 @@ public class CmsKitAdminMenuContributor : IMenuContributor { cmsMenu.AddItem(menu); } + } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.analyze.json index 5e9e23d74e..6fc1fc080f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Admin.Web", - "hash": "3f95d9795d85d7afbd3311ce13806594", + "hash": "5f85ca165f250e4965434f76a73f0d24", "contents": [ { "namespace": "Volo.CmsKit.Admin.Web", diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.analyze.json index c84529efdf..0ce0a4102e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Application.Contracts", - "hash": "a30e3d8764aeafd628434d7773d25dc2", + "hash": "66221b0ded80b705e67d327260d7d58e", "contents": [ { "namespace": "Volo.CmsKit", diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.analyze.json index 91370f95df..5cfde7838f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Application", - "hash": "a8ce451337675e03f5fb68c1965a3ded", + "hash": "d248c6d5c1b031c459ad8814fd734a18", "contents": [ { "namespace": "Volo.CmsKit", diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.analyze.json index 9741f09173..d93eced25a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Common.Application", - "hash": "8c5b6af4aae1a9199e8ed2a8481cf201", + "hash": "07abca3b46e8b2c5233c0d9b1a803f02", "contents": [ { "namespace": "Volo.CmsKit", diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.analyze.json index cb6e64c996..ae90aece20 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Common.HttpApi.Client", - "hash": "4563bb2a82a6f3c4c49fbbac9e12a622", + "hash": "047466e6fe6a292e3cf8d1f334303f42", "contents": [ { "namespace": "Volo.CmsKit", diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.analyze.json index 9fc9293fcd..342a3b3c38 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Common.HttpApi", - "hash": "a14749de61debbd45eac761d91707413", + "hash": "9120a59e9639dcaec305df9314b55b02", "contents": [ { "namespace": "Volo.CmsKit", diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.analyze.json index 442b81dc19..c56f4ae15d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Common.Web", - "hash": "3c0628c43dbbcfb430af79992fd6fd3f", + "hash": "2540b0ef97a790d3999d72c87961397e", "contents": [ { "namespace": "Volo.CmsKit.Web", diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.analyze.json index d3d3cb08a1..1af4d1a735 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Domain.Shared", - "hash": "515d3328db0b4ded3a5076a582f00053", + "hash": "dd817fe9197c1b28242920e4238da6ee", "contents": [ { "namespace": "Volo.CmsKit", diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hans.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hans.json index b312349ef4..2d4683a150 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hans.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hans.json @@ -85,6 +85,7 @@ "Permission:BlogPostManagement.Create": "创建", "Permission:BlogPostManagement.Delete": "删除", "Permission:BlogPostManagement.Update": "更新", + "Permission:BlogPostManagement.Publish": "发布", "Permission:CmsKit": "Cms工具包", "Permission:Comments": "评论管理", "Permission:Comments.Delete": "删除", @@ -115,6 +116,7 @@ "Permission:TagManagement.Create": "创建", "Permission:TagManagement.Delete": "删除", "Permission:TagManagement.Update": "更新", + "Permission:GlobalResources": "全局资源", "PickYourReaction": "选择你的回应", "Rating": "评分", "RatingUndoMessage": "您的评分将被撤消", @@ -129,6 +131,7 @@ "SelectAll": "选择所有", "Send": "发送", "SendMessage": "发送消息", + "SelectedAuthor": "作者", "ShortDescription": "简介", "Slug": "Slug", "Source": "源", @@ -158,6 +161,32 @@ "YourEmailAddress": "你的邮件地址", "YourFullName": "你的全称", "YourMessage": "你的消息", - "YourReply": "你的回复" + "YourReply": "你的回复", + "MarkdownSupported": "Markdown 支持。", + "GlobalResources": "全局资源", + "SavedSuccessfully": "保存成功", + "CmsKit.BlogPost.Status.0": "草稿", + "CmsKit.BlogPost.Status.1": "已发布", + "CmsKit.BlogPost.Status.2": "等待审核", + "BlogPostPublishConfirmationMessage": "你确定要发布博客文章“{0}”吗？", + "SuccessfullyPublished": "成功发布！", + "Draft": "草稿", + "Publish": "发布", + "BlogPostDraftConfirmationMessage": "你确定要将博客文章“{0}”设置为草稿吗？", + "BlogPostSendToReviewConfirmationMessage": "你确定要将博客文章“{0}”发送给管理员审核发布吗？", + "SaveAsDraft": "保存为草稿", + "SendToReview": "发送到审核", + "SendToReviewToPublish": "发送到审核并发布", + "BlogPostSendToReviewSuccessMessage": "博客文章“{0}”已发送给管理员审核发布。", + "HasBlogPostWaitingForReviewMessage": "你有一篇博客文章等待审核。点击查看。", + "SelectAStatus": "选择一个状态", + "Status": "状态", + "CmsKit.BlogPost.ScrollIndex": "博客文章快速导航栏", + "Add": "添加", + "AddWidget": "添加组件", + "PleaseConfigureWidgets": "请配置组件", + "SelectAnAuthor": "选择一个作者", + "InThisDocument": "在此文档", + "GoToTop": "跳至顶部" } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.analyze.json index afd65daf19..20d1bbb536 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Domain", - "hash": "6e431ab37f61b3f7bb7ca8517a1543d6", + "hash": "1e318a63acb08c17193414845709b752", "contents": [ { "namespace": "Volo.CmsKit", @@ -70,6 +70,15 @@ "contentType": "aggregateRoot", "name": "MediaDescriptor" }, + { + "namespace": "Volo.CmsKit.GlobalResources", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "aggregateRoot", + "name": "GlobalResource" + }, { "namespace": "Volo.CmsKit.Comments", "primaryKeyType": "Guid", @@ -150,6 +159,12 @@ "contentType": "domainService", "name": "MediaDescriptorManager" }, + { + "namespace": "Volo.CmsKit.GlobalResources", + "summary": null, + "contentType": "domainService", + "name": "GlobalResourceManager" + }, { "namespace": "Volo.CmsKit.Comments", "summary": null, @@ -177,7 +192,7 @@ { "namespace": "Volo.CmsKit.Users", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.CmsKit.Users", "primaryKeyType": "Guid", "summary": null, @@ -192,7 +207,7 @@ { "namespace": "Volo.CmsKit.Tags", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.CmsKit.Tags", "primaryKeyType": null, "summary": null, @@ -207,7 +222,7 @@ { "namespace": "Volo.CmsKit.Tags", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.CmsKit.Tags", "primaryKeyType": "Guid", "summary": null, @@ -222,7 +237,7 @@ { "namespace": "Volo.CmsKit.Reactions", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.CmsKit.Reactions", "primaryKeyType": "Guid", "summary": null, @@ -237,7 +252,7 @@ { "namespace": "Volo.CmsKit.Ratings", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.CmsKit.Ratings", "primaryKeyType": "Guid", "summary": null, @@ -252,7 +267,7 @@ { "namespace": "Volo.CmsKit.Pages", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.CmsKit.Pages", "primaryKeyType": "Guid", "summary": null, @@ -267,7 +282,7 @@ { "namespace": "Volo.CmsKit.Menus", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.CmsKit.Menus", "primaryKeyType": "Guid", "summary": null, @@ -282,7 +297,7 @@ { "namespace": "Volo.CmsKit.MediaDescriptors", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.CmsKit.MediaDescriptors", "primaryKeyType": "Guid", "summary": null, @@ -294,10 +309,25 @@ "contentType": "repositoryInterface", "name": "IMediaDescriptorRepository" }, + { + "namespace": "Volo.CmsKit.GlobalResources", + "summary": null, + "entityAnalyzeModel": { + "namespace": "Volo.CmsKit.GlobalResources", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "entity", + "name": "GlobalResource" + }, + "contentType": "repositoryInterface", + "name": "IGlobalResourceRepository" + }, { "namespace": "Volo.CmsKit.Comments", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.CmsKit.Comments", "primaryKeyType": "Guid", "summary": null, @@ -312,7 +342,7 @@ { "namespace": "Volo.CmsKit.Blogs", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.CmsKit.Blogs", "primaryKeyType": "Guid", "summary": null, @@ -327,7 +357,7 @@ { "namespace": "Volo.CmsKit.Blogs", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.CmsKit.Blogs", "primaryKeyType": "Guid", "summary": null, @@ -344,7 +374,7 @@ { "namespace": "Volo.CmsKit.Blogs", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.CmsKit.Blogs", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.analyze.json index 35e555ec1a..fa9d342f83 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.EntityFrameworkCore", - "hash": "f0cfc503a962ac59adb8d27be83a20a1", + "hash": "b7aab122bf55ecff3063a1b65efe0642", "contents": [ { "namespace": "Volo.CmsKit.EntityFrameworkCore", diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.analyze.json index cd62bcacf9..ee45a8e783 100644 --- a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.HttpApi.Client", - "hash": "6471d04d18e68f42e54afa8e98035ca5", + "hash": "dac3747019bc31633a80784616bdbe61", "contents": [ { "namespace": "Volo.CmsKit", diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.analyze.json index c1ffb79749..2adf100593 100644 --- a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.HttpApi", - "hash": "396cfcff38fbee04def6feee7d1cfec8", + "hash": "35d6b578e63adb4e4fe8876bfdba83c8", "contents": [ { "namespace": "Volo.CmsKit", diff --git a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj index 4ed4ae03fa..75cf15ad04 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/AbpCmsKitInstallerModule.cs b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/AbpCmsKitInstallerModule.cs index f7724fb7b5..546a9c3f1e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/AbpCmsKitInstallerModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/AbpCmsKitInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.CmsKit; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class VoloCmsKitInstallerModule : AbpModule diff --git a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/CmsKitInstallerPipelineBuilder.cs b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/CmsKitInstallerPipelineBuilder.cs deleted file mode 100644 index 951ea57362..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/CmsKitInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.CmsKit; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class BlobStoringDatabaseInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.CmsKit.EntityFrameworkCore", - "ConfigureCmsKit" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.analyze.json index e74164abd4..f9e9fde584 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.MongoDB", - "hash": "8c2fac3aaa67ccfc101938cf7e0e6ba3", + "hash": "6ab237cd16e1bd42d96b93f76b992622", "contents": [ { "namespace": "Volo.CmsKit.MongoDB", @@ -12,24 +12,34 @@ "connectionStringName": "CmsKit", "databaseCollections": [ { - "entityFullName": "Volo.CmsKit.Comments.Comment", + "entityFullName": "Volo.CmsKit.Users.CmsUser", "contentType": "databaseCollection", - "name": "CmsComments" + "name": "CmsUsers" }, { - "entityFullName": "Volo.CmsKit.Tags.Tag", + "entityFullName": "Volo.CmsKit.Reactions.UserReaction", "contentType": "databaseCollection", - "name": "CmsTags" + "name": "CmsUserReactions" }, { - "entityFullName": "Volo.CmsKit.Reactions.UserReaction", + "entityFullName": "Volo.CmsKit.Blogs.BlogPost", "contentType": "databaseCollection", - "name": "CmsUserReactions" + "name": "CmsBlogPosts" }, { - "entityFullName": "Volo.CmsKit.Tags.EntityTag", + "entityFullName": "Volo.CmsKit.MediaDescriptors.MediaDescriptor", "contentType": "databaseCollection", - "name": "CmsEntityTags" + "name": "CmsMediaDescriptors" + }, + { + "entityFullName": "Volo.CmsKit.Pages.Page", + "contentType": "databaseCollection", + "name": "CmsPages" + }, + { + "entityFullName": "Volo.CmsKit.Tags.Tag", + "contentType": "databaseCollection", + "name": "CmsTags" }, { "entityFullName": "Volo.CmsKit.Blogs.BlogFeature", @@ -37,19 +47,19 @@ "name": "CmsBlogFeatures" }, { - "entityFullName": "Volo.CmsKit.Menus.MenuItem", + "entityFullName": "Volo.CmsKit.Blogs.Blog", "contentType": "databaseCollection", - "name": "CmsMenuItems" + "name": "CmsBlogs" }, { - "entityFullName": "Volo.CmsKit.MediaDescriptors.MediaDescriptor", + "entityFullName": "Volo.CmsKit.Comments.Comment", "contentType": "databaseCollection", - "name": "CmsMediaDescriptors" + "name": "CmsComments" }, { - "entityFullName": "Volo.CmsKit.Pages.Page", + "entityFullName": "Volo.CmsKit.GlobalResources.GlobalResource", "contentType": "databaseCollection", - "name": "CmsPages" + "name": "CmsGlobalResources" }, { "entityFullName": "Volo.CmsKit.Ratings.Rating", @@ -57,19 +67,14 @@ "name": "CmsRatings" }, { - "entityFullName": "Volo.CmsKit.Blogs.BlogPost", - "contentType": "databaseCollection", - "name": "CmsBlogPosts" - }, - { - "entityFullName": "Volo.CmsKit.Blogs.Blog", + "entityFullName": "Volo.CmsKit.Menus.MenuItem", "contentType": "databaseCollection", - "name": "CmsBlogs" + "name": "CmsMenuItems" }, { - "entityFullName": "Volo.CmsKit.Users.CmsUser", + "entityFullName": "Volo.CmsKit.Tags.EntityTag", "contentType": "databaseCollection", - "name": "CmsUsers" + "name": "CmsEntityTags" } ], "contentType": "mongoDbContext", diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.analyze.json index fda8fcbaa2..929233d3d3 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Public.Application.Contracts", - "hash": "308c90693f153360adbe46dcecaab560", + "hash": "dadad9e526e7b82b280e75a06e1456fc", "contents": [ { "namespace": "Volo.CmsKit.Public", diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.analyze.json index af31e0e774..93891adcf9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Public.Application", - "hash": "9b54d4165467908818b3fa241e9f273e", + "hash": "35fc84bf4ee895c703bdf1cf037afb14", "contents": [ { "namespace": "Volo.CmsKit.Public", @@ -43,6 +43,15 @@ "contentType": "applicationService", "name": "MenuItemPublicAppService" }, + { + "namespace": "Volo.CmsKit.Public.GlobalResources", + "summary": null, + "implementingInterfaces": [ + "Volo.CmsKit.Public.GlobalResources.IGlobalResourcePublicAppService" + ], + "contentType": "applicationService", + "name": "GlobalResourcePublicAppService" + }, { "namespace": "Volo.CmsKit.Public.Comments", "summary": null, diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.analyze.json index 3171e78892..71cd18093e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Public.HttpApi.Client", - "hash": "2b8ae9a9344c5cd824c182a36d9298a1", + "hash": "60549438786408497e188a1626a25bfb", "contents": [ { "namespace": "Volo.CmsKit.Public", diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg.analyze.json index 2e4a56e7bb..2a6f62215a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Public.HttpApi", - "hash": "08fec37c43e420f19636d8c301dc80f9", + "hash": "8ec175d273c21b4de197b0085c3cddb2", "contents": [ { "namespace": "Volo.CmsKit.Public", diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg.analyze.json index 1941b5618d..25a0536d5d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Public.Web", - "hash": "4b477e78e2267c3b43a3677d5dbbdddb", + "hash": "c7feb0964cd3dafb92e2f73ac8f944b4", "contents": [ { "namespace": "Volo.CmsKit.Public.Web", diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg.analyze.json index af881d5fb9..e10f650a63 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Web", - "hash": "49826349c7aaabed8c65d9a3e568423c", + "hash": "b852b82969c272b32a42d6666a7ce9f0", "contents": [ { "namespace": "Volo.CmsKit.Web", diff --git a/modules/docs/Volo.Docs.sln b/modules/docs/Volo.Docs.sln index 1c32767baa..6bb8d84d0a 100644 --- a/modules/docs/Volo.Docs.sln +++ b/modules/docs/Volo.Docs.sln @@ -61,6 +61,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Docs.MongoDB", "src\Vo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Docs.MongoDB.Tests", "test\Volo.Docs.MongoDB.Tests\Volo.Docs.MongoDB.Tests.csproj", "{C5E2A2A3-D54D-4C2E-97BA-EA50A49ED7AD}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Docs.Installer", "src\Volo.Docs.Installer\Volo.Docs.Installer.csproj", "{50B9AC1D-C03E-47AA-9ED8-E7986BCFABA1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -159,6 +161,10 @@ Global {C5E2A2A3-D54D-4C2E-97BA-EA50A49ED7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {C5E2A2A3-D54D-4C2E-97BA-EA50A49ED7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {C5E2A2A3-D54D-4C2E-97BA-EA50A49ED7AD}.Release|Any CPU.Build.0 = Release|Any CPU + {50B9AC1D-C03E-47AA-9ED8-E7986BCFABA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50B9AC1D-C03E-47AA-9ED8-E7986BCFABA1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50B9AC1D-C03E-47AA-9ED8-E7986BCFABA1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50B9AC1D-C03E-47AA-9ED8-E7986BCFABA1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -190,6 +196,7 @@ Global {8A5E5001-C017-44A8-ADDA-DC66C102556E} = {555508AD-F593-43E3-9354-9FA51512F181} {DBE846CD-1BED-4F2C-ABF2-94F6240BCB9B} = {A982A58E-1E92-4764-9F56-39E7AABB8556} {C5E2A2A3-D54D-4C2E-97BA-EA50A49ED7AD} = {59D430A9-AC61-4457-8338-5DA0705ABB5D} + {50B9AC1D-C03E-47AA-9ED8-E7986BCFABA1} = {A982A58E-1E92-4764-9F56-39E7AABB8556} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {13691265-2547-4FFF-B757-E8FACB05679D} diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.abppkg.analyze.json b/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.abppkg.analyze.json new file mode 100644 index 0000000000..f57a795bed --- /dev/null +++ b/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.abppkg.analyze.json @@ -0,0 +1,18 @@ +{ + "name": "VoloDocs.EntityFrameworkCore", + "hash": "8ac808bc478d207d2d1ed672d5f16244", + "contents": [ + { + "namespace": "VoloDocs.EntityFrameworkCore", + "contentType": "abpModule", + "name": "VoloDocsEntityFrameworkCoreModule" + }, + { + "namespace": "VoloDocs.EntityFrameworkCore", + "connectionStringName": null, + "databaseTables": [], + "contentType": "efCoreDbContext", + "name": "VoloDocsDbContext" + } + ] +} \ No newline at end of file diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index 8666f1e0fc..96bb824925 100644 --- a/modules/docs/app/VoloDocs.Web/package.json +++ b/modules/docs/app/VoloDocs.Web/package.json @@ -3,7 +3,7 @@ "name": "volo.docstestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.3", - "@abp/docs": "^6.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.4", + "@abp/docs": "^6.0.0-rc.4" } } diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock index 6bcbfd7051..fcc64ec490 100644 --- a/modules/docs/app/VoloDocs.Web/yarn.lock +++ b/modules/docs/app/VoloDocs.Web/yarn.lock @@ -2,45 +2,45 @@ # yarn lockfile v1 -"@abp/anchor-js@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-6.0.0-rc.3.tgz#1f350b7cb1b73f5c5d07b7a64b5a184b11a62d25" - integrity sha512-1eQZPnANlQgrBqYCUKDXzytUw1MPKBakJnyRFIWknW7IBTMbRTZZFjdqscRV4JaXil3wfrYJJKaa2WWyD4nxbg== +"@abp/anchor-js@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-6.0.0-rc.4.tgz#41ab4ca9ba5ef0d6359549100ad7d589f48e87af" + integrity sha512-eXZnygOwy40BMdfR4LOC/7/ga3fiindwH/k3XyAyfWzK+Tp2USoVp0iNf2B9O7uoROC5x8DnAf3vYJwhLnk4nA== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" anchor-js "^4.3.1" -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.3.tgz#b95266387e562c635de795442f90470f8e9e6318" - integrity sha512-vVkEpotDST455E3rynvRQpBKPcNNJ2m1wLkz/B9dQNdUjvm8L4F6s0ls0XFlKUNvQfCVfedkRtGayuvNje/Oxg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.3.tgz#664ca2ee712b7d9e66103c00beb41eb9648a6075" - integrity sha512-KxCsGuoUWKaDo7Oo9aKp51pli2m0DZ2tG8m+zK+m4M9U7g96uC+DOFy3gc7MdPlszvrw32Wwm7I0AughstByNA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.3" - "@abp/bootstrap" "~6.0.0-rc.3" - "@abp/bootstrap-datepicker" "~6.0.0-rc.3" - "@abp/datatables.net-bs5" "~6.0.0-rc.3" - "@abp/font-awesome" "~6.0.0-rc.3" - "@abp/jquery-form" "~6.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.3" - "@abp/lodash" "~6.0.0-rc.3" - "@abp/luxon" "~6.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.3" - "@abp/select2" "~6.0.0-rc.3" - "@abp/sweetalert2" "~6.0.0-rc.3" - "@abp/timeago" "~6.0.0-rc.3" - "@abp/toastr" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.3.tgz#47c23b57ed3908bd78a232230e53d1f3cba2de41" - integrity sha512-7eJZy2JUGQP94Tz3JJWXRHRmDfTcPZ/lS1/VNbU8B4qvgl5ChIXklVEJLR1fwrBhKXZV8fGVmqT1XlGTGFvFJA== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.4.tgz#f57efa6f3cabb48e40a44e79adb31de58145bf89" + integrity sha512-JcoXch+j+T9V3Lfu9Of9Tbcw5sNBpSbe42SjzUcXLqdVijV/DBWKMg/9OPH8KZ4PZwl4sl9DSAmGWXHdipLxzA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.4.tgz#a0fd1e9f6f05d854d6f2119ed551a1cef485c929" + integrity sha512-QsrV+N6YFuMo/q73Bd1P0qDyG0Ua5JmQFgKzA94eMXDyYgpRrT5RyKh0CNV81Q/AX9V5c6APrtcQ31tYzmWwbQ== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.4" + "@abp/bootstrap" "~6.0.0-rc.4" + "@abp/bootstrap-datepicker" "~6.0.0-rc.4" + "@abp/datatables.net-bs5" "~6.0.0-rc.4" + "@abp/font-awesome" "~6.0.0-rc.4" + "@abp/jquery-form" "~6.0.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.4" + "@abp/lodash" "~6.0.0-rc.4" + "@abp/luxon" "~6.0.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.4" + "@abp/select2" "~6.0.0-rc.4" + "@abp/sweetalert2" "~6.0.0-rc.4" + "@abp/timeago" "~6.0.0-rc.4" + "@abp/toastr" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.4.tgz#de70d53a900db2f5c74719b7c4e406e0de4c2662" + integrity sha512-8GUoTG4B3Tz2Xd/cFaw9EAjOUoEfMG95VkjNqdfcvPPrtFML/W3fcMUwbjOvQ/lEnAMTSGREU3w9y7Y+GIv9qA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -49,180 +49,180 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.3.tgz#89198b863dbfccf5f07ac3c4b20ce6199adcb17a" - integrity sha512-NLoUjcR66mqwSWuVftu2yFH4/j6QP+FiElRfZQ9OYmO8DQx2Ue5UZzjrFTrZ1DBBCfzhr2Bffj80dirGvGDyvg== +"@abp/bootstrap-datepicker@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.4.tgz#2dbc9f8f9816689b6db84948046a964ceb1bab17" + integrity sha512-tWPA3ehtU+QPKbxdLDzKk4p2wMNGo/R4CjCQydD1i9BIpkBUlA5sBtbNrLTvZ5/KM1RYecFGFrHTVVOzGsUKrA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.3.tgz#4574bf574cc3484869e8ff8bc592f6212d20a969" - integrity sha512-Q5v7WRkGhGcjRg267HXtqs1oU7ts9UXPyCXmg5y2y5qMOyioD+m4MKV4iv67DgoQjabudp8X2egTKxkej6Lzkw== +"@abp/bootstrap@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.4.tgz#f360f86b00f474236ad182cd792df24f9ecbfc47" + integrity sha512-JjHJNPkTJRYwQvRnzTvcYIbxs2TD6n+LVtCd5ItYNbg8bMyd9yMugThxtgZGE3awVQqjLxZ4fwv+CRnf70JdrQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" bootstrap "^5.1.3" -"@abp/clipboard@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.3.tgz#ee3a586b491d89442eefff08aaebbf9d38cb46d4" - integrity sha512-01svpp3mR29z1FTM+2Qe+MUNLPbl95bWlOXY5zz2hvNSbdD45lGud+BiOHfeZwlDk5jjr3FqLel+hxx2ByBvOA== +"@abp/clipboard@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.4.tgz#a1f08eb23ebe7fcac0521aa992c6cebb9753c004" + integrity sha512-dX8l7Akyv5ecx7+Op8Cp/q4JslnhA9G0Eok4iPcnYwHh9NfSLnusack9x4u370Y+eShRxFiiBDq44ZsCN66h/Q== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" clipboard "^2.0.8" -"@abp/core@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.3.tgz#5662ce813d449d97d9fb7ea2552b2774c8df7825" - integrity sha512-X/VRdk5SGNYc5gQzPcBEPAvwcuD9WXsI4YIdrqjnes0s8u2/XmfrTixojh8Y5EYUoOblEE3Soj5hBhY1cVwcbQ== +"@abp/core@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.4.tgz#d164e1ca3546dc710c569ea7ae0145e1b713658e" + integrity sha512-mH3+BCU8Wbe0mieDHd5Awvhd09X7iJKRLBQBIINcDeIIOCJ9x4v8grynvndzlaS7J2AlWZba0XJU6sZ+YpuP2w== dependencies: - "@abp/utils" "~6.0.0-rc.3" + "@abp/utils" "~6.0.0-rc.4" -"@abp/datatables.net-bs5@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.3.tgz#22865c7e621de720b71af6265b3193f6c78695bd" - integrity sha512-T+mhLc6uSzWmxDQogVwnJ6VxI4845gmF68/i9TmVKNlCtpa3EEfyuF/hgWT1hYfCb4XOsvd/CWrunbkC3fsmtg== +"@abp/datatables.net-bs5@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.4.tgz#fc3c43fb9ba8154b4b960ed0799948f5df738f7e" + integrity sha512-QtII4mFFFjvToM2LDqZugVh6/HwKbIdKYqHCxJKprZ1aVmyBeiMHi89z0G4eChAYdTpjHQstoDddYje53DkWOw== dependencies: - "@abp/datatables.net" "~6.0.0-rc.3" + "@abp/datatables.net" "~6.0.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.3.tgz#d036defe6ad7fc989dffa020ae579362ee3150d1" - integrity sha512-4cUU8/Tn0Vz9bx7jjMOD/0Viyr29fcwoQAAkxaaYZp6qiQbENgz46/xpQf2oBCoudk8CLdzpmNa7jWte7PcJJw== +"@abp/datatables.net@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.4.tgz#f6916ba9a8089b573faddcc38e6a76e38a0dce16" + integrity sha512-9zhIvAO4AX6YIUELodEUz2hsDj+RITGoxWaav90jUJEqK/jVsDfs2mbrWcLzQDMLpZVElZA0p8tUyWS8yMsjaA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" datatables.net "^1.11.4" -"@abp/docs@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-6.0.0-rc.3.tgz#3300578c2bdface9e7672e9093c2a387c11f482f" - integrity sha512-ymLh1jR6qGTB+4G5uttYvbiYWZ853GYLRkRbQ6VtcyBDnX+IpexsxPCtL9Ralp8YGDbxYIHnnRAC5TAvSHn16Q== +"@abp/docs@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-6.0.0-rc.4.tgz#8ea7c1f65684999efdba371bfca735f75258dcd6" + integrity sha512-fJHIzfyvhRPX6jGWJFZmZX74esjj7DPDEIHL6pbW/4D0alGy9ToUpESNnRzSGOaBQHTx/SguoQW2hz/+Ix0GXg== dependencies: - "@abp/anchor-js" "~6.0.0-rc.3" - "@abp/clipboard" "~6.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.3" - "@abp/popper.js" "~6.0.0-rc.3" - "@abp/prismjs" "~6.0.0-rc.3" + "@abp/anchor-js" "~6.0.0-rc.4" + "@abp/clipboard" "~6.0.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.4" + "@abp/popper.js" "~6.0.0-rc.4" + "@abp/prismjs" "~6.0.0-rc.4" -"@abp/font-awesome@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.3.tgz#803569d1a7e25f8a1c2be018312449c23fb78217" - integrity sha512-lYdh38UCTSkzzw0B/mpPEo7iFXzSKHCNbBOIHe6dd6O/Qli7wYukTtUOFn5Sh+yoydLY1as92HtiGL1ckSdu1g== +"@abp/font-awesome@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.4.tgz#a3e1664cbebdbc1aa4d2dd1ac48f022b3ce100ad" + integrity sha512-tlBekvBQ/wEkx1Z2sX8cPp/JKzxmTsMSUSbnAc/Uz+De/fxhyepUACb35zFSv2VmLPz1M1xqLvLUCJmciZhINQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.3.tgz#4ec503c07e2194148c3a7e7cf7ddef2871679e6a" - integrity sha512-Q3uEpflntqrSkYakcdsBnnYYfxJWXD/CDjMiwjbb6gIc8s4qkbIYxVxvYvlEezoIDYQkMSXOn7BS4clWsesiJg== +"@abp/jquery-form@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.4.tgz#4dfbef35e4d7dc80534e0f33644142a9ccd54cb4" + integrity sha512-/21ibf99c8q7ygbj2QF7GAGCW1MaalAurueffndTGZPRRSKrCVTPINtBih7NGgh1zcavhog+GBA3INJ3etQIWQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.3.tgz#01da2a59663d373ff1c69022f4c9c66ad0b29403" - integrity sha512-ij1ML2D9rYF3pJthWO6mGQajsJhbDCtOoBvnh9yCZccuwOYkXP22PqfUxjjxtqL4HqFI31KRpFg0ANMGSzEEBg== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.4.tgz#6a498b76076683bbc77d7a73fcf893863aecb59f" + integrity sha512-+9RAPaFYsuSZ05RtJJNeHl1PkyHm9Mv3WKAw+QrKHzaK34zpjD/cZdiijcAWM3DrNPiCCuaaUgMMIMn223MIEA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.3" + "@abp/jquery-validation" "~6.0.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.3.tgz#724aea9572dcb2faccf8c6355332b0b2a4df9260" - integrity sha512-rTK5oHaMtycvWxunNwzbE/MbsXXIr6qDnOY3rVUmjTHjqUOHYz591t/XeQfjnSXPp4k/SZUjG6viTC3J2jzC1A== +"@abp/jquery-validation@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.4.tgz#2f79457d2c83795449eb6d3c82942568b0e6f273" + integrity sha512-a3v0QDWm2kqrr5r4Nim8unT7p5xHt8KR/TGmGiS6CNMRXVtd6SLMDg36D1d5AcBemFW5evlySiqAl2D7v+g0/g== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.3.tgz#ba19cc8b802c46490277939e6c674811127d8016" - integrity sha512-MbD38iInyag7/j5k42cvMT4jLZMtXH4lUK0rjvqUDVaxKEks46Ix/90uczQ9XajYONgx0CJKFj2urgM830+CCA== +"@abp/jquery@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.4.tgz#992222c2e233840ce7bf573b8bb15b0c9c15adde" + integrity sha512-JRf9NltPP++RAfPRvWFoYNgs2i/ydyROjtLSnCGdmO4UwAQZ21YuDY7x0Ia7VSj0a6cFg8d7M2PGIeJlcaXIsg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.3.tgz#8a5bab02353e5cab4ca06ab82f6dbe6285faa95a" - integrity sha512-c8yhcapzPsXyeiFjeOC+2a4bn5wFjW5gUoN+p/p+tE+FIcH37yEgyw/tAr6aZPCmR770MqQXct4t7S4Czbbk+A== +"@abp/lodash@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.4.tgz#2c88a9274e6c27334f277404280d43b2fbae6552" + integrity sha512-yOEe3SVvh5IuFMujSgC4waG0JzWzRQj907KUYzjcjfx35J5Q0Mwvu6/9wRYJx1av40YQdnzMrRoqXKDPAKdV6A== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.3.tgz#ba515e122c61918d481467d5be39f08a363822f6" - integrity sha512-2lRSSC0DYShlnKdbJ/Pmha/azjt09ZRPx57NQ01dc7ungChPry5EJL6pC3kXWnJrCkrPCF0V5+A3+taut9+l3A== +"@abp/luxon@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.4.tgz#95ae8f70d9b5d8cd753cc7d918c611692d5bf218" + integrity sha512-OFs4Uv82YienRwiiVV78hdWSanS19lvjoBBskPF5s6LK/5mzLMrtbHBRf18wcc/AfBMOxot1BX2q1v4wb2u3qw== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.3.tgz#0798e37ec6a852748118692a5fbd30c99d9745db" - integrity sha512-FlyShmRxG3wGk1OJCjHIZAdi2/Y2FJPkVxaE72CVIceQSmg0nebGTv3a7bhd4QzKkDsSA3+t6gHjnuKlTlDFLA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.4.tgz#f40968c7f64eb6b36ff2bf06b4be8661308abd12" + integrity sha512-lcOskhl+NbPqKBxg+GABYBBrMtHYw2qZ/srFix7DgGUdNlFbXRP/AtTz0Wiav0PNGZgivniRLqvqcLCiCkrBrg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/popper.js@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-6.0.0-rc.3.tgz#de55a85186f720e16607a3d2445885accb8c1527" - integrity sha512-YggzPKVWaERf5esSzAsa9Qi6+BCSfNPULkwXAPa3qoP/OtXuI6e+U12CzhTWrcFLp4Xv6Wq8Y+iNNSkVhj/n2w== +"@abp/popper.js@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-6.0.0-rc.4.tgz#601feface5bbc40f4e3830ae227afeedf70461ff" + integrity sha512-hLh+CMQxocgPM8W9NpB8v0i90mGysFDKDOBLnpyFEuSQoWeDW5hwlFYORnQYmTKt6puIBN4NeyX10f3ewANF4w== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" "@popperjs/core" "^2.11.2" -"@abp/prismjs@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.3.tgz#e4faf595e29db81c5a66030e59b0e09f09759bfd" - integrity sha512-zzd3iw/Im0M9FUmTviwkTCr4slkoZJExtK+qB1FmLxRY59+hyU9wxd6hwzic/QwhXxFQoYILJ3S3FNxsPIm76A== +"@abp/prismjs@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.4.tgz#9338018487dde7ddc5384cdfbdc35c655a8fd444" + integrity sha512-F1t7ySbj+M6LDmgbvvcY2bFl0heEj1vz14YOnmwMNUhJcaLQXamgyKsWBu5UkEHUJ11DQyjIu5gjoRXbraucdA== dependencies: - "@abp/clipboard" "~6.0.0-rc.3" - "@abp/core" "~6.0.0-rc.3" + "@abp/clipboard" "~6.0.0-rc.4" + "@abp/core" "~6.0.0-rc.4" prismjs "^1.26.0" -"@abp/select2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.3.tgz#deb8332bfce2102a562004893321a48d5194bf53" - integrity sha512-rb0qElmmhiP09xX8ZbjzNLF6ygFBwErysGWt6Bbgzz5waX2sGe575Cgoz53FaMQ4JaRBg1N0/nCejKyDtiINRA== +"@abp/select2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.4.tgz#c7cf0f910fa6a9f97845a0659178ac02cfa022bc" + integrity sha512-NcXMZYiLDSVnjtRgvPwm9RB1M7qZnRyyyM+htdH5laEvDDGCcOLFS8iK6WI4Irmvw6MhBkDTHaH9ssJNbF7pvQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.3.tgz#e61fc6c1bed1316c1d44ca5c92f590e422db24d4" - integrity sha512-+SNpBb4XrQlWzRQK9lfdJqA9IfJrlgoqmHwPDgf3Q+P922MzO33TgDlZWbeE7MzVj2y2WmNsPuCKwhjSjSL2rw== +"@abp/sweetalert2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.4.tgz#a1a2a1a5d7e1fb83680cc35ca477cee1f2f2463b" + integrity sha512-dvslRK2oc06JjI6aV1dj1LzWbOb50BfwbHxcmOenl8Q4XMP389bFbaOiVezjk+d3YLsspCMDxxu2NTqaq67Z6g== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.3.tgz#0ef8c4801bfd4623e6895b1d047b1437063bda53" - integrity sha512-P3YRDVKjR5/Fz+cXiPg3IiUr7XGbNh7mgmJ1ywRXmKVmVMJmhQ2RsKmmtkGJn4TfVHu/l5iJXe4rqgL21/yX/g== +"@abp/timeago@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.4.tgz#3a93a65ee6b8260f7e80bb862b60623e967e08a2" + integrity sha512-/ZZy5E3PHtvmkjg+s9BvgO344DOs0jiifimDntp5jZPQPrsQ5WPC9o9hrlGb40tTw5P0wAnznjGvHnZjBiflvA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.3.tgz#6010d4247937531ebf7c8659d6254cd3db6c4855" - integrity sha512-sC9eCzYVgDrLSFIhJGe9hshzfwA1BkZNah4NQhyq+V6HQ8YF7goMS79N+/XmSoLQ9zzRhusqnPFnb+4FHjr7iA== +"@abp/toastr@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.4.tgz#3bf6abc79baf7a2b7de9840e55caf839018ab96e" + integrity sha512-zesojzXYsFd57m7XBgxLwKeAs8HRe25iNKRGC0YR7MK2HP1770jc+dEjnQ0pnqhMHouZejFJZcpqdHGr85ZUgQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.3.tgz#6d3515694314175218606e9518618ce335b4b360" - integrity sha512-K2geJ9P1ztk4Ehzb9YG3CqqLOi+z8/4iBLUzooNZLQqS+KdlUhCmqfuCoI/A5Aq9DGbTYesalp+Fwoh3S2Dl8A== +"@abp/utils@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.4.tgz#e18ef1557a2600fa153db13162e1ed097bc6f15a" + integrity sha512-eT6RVfFsyB8uAdMHDdG4M2Erg3RrvkG7Z5Xa0ko7JIhEz5VwsRcXGwTAORYHsu0M1hpewZljdD5OmQRods13LA== dependencies: just-compare "^1.3.0" diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.analyze.json index f366cff867..6ff12518c7 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Admin.Application", - "hash": "a4fd7ea711b7f38af3235eabde130328", + "hash": "1ebc44195de6a5460ff52b8b04113eda", "contents": [ { "namespace": "Volo.Docs.Admin", diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg.analyze.json new file mode 100644 index 0000000000..a316aaf8ac --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg.analyze.json @@ -0,0 +1,11 @@ +{ + "name": "Volo.Docs.Admin.HttpApi.Client", + "hash": "b89a21854479861a94321c9b9b14c1ef", + "contents": [ + { + "namespace": "Volo.Docs.Admin", + "contentType": "abpModule", + "name": "DocsAdminHttpApiClientModule" + } + ] +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg.analyze.json index fbaed474fc..99183af528 100644 --- a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Admin.HttpApi", - "hash": "55c63d7060a78c41b6731fc57bac2791", + "hash": "2ce1eb9b94903de99e5e94c61fecd09d", "contents": [ { "namespace": "Volo.Docs.Admin", diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg.analyze.json index d68eab6fbe..e4f8fe301f 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Admin.Web", - "hash": "213ccad3d288d801779462d0fb32d938", + "hash": "9bf873547c3d7a73d22281db34ccb755", "contents": [ { "namespace": "Volo.Docs.Admin", diff --git a/modules/docs/src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg.analyze.json index a992d2876d..abcf0ea811 100644 --- a/modules/docs/src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Application.Contracts", - "hash": "9d790bb2a90cf3a9617b0f6999b95db1", + "hash": "262e4f1684408074bc48fd8b516291ac", "contents": [ { "namespace": "Volo.Docs", diff --git a/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.abppkg.analyze.json index aa47000fde..efcc550dc6 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Application", - "hash": "604b6ef5c6cc68a154a2a4700a711c77", + "hash": "87e3d3c4ba832643880025f927061542", "contents": [ { "namespace": "Volo.Docs", diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg.analyze.json index 2101d8e65c..1f88d13232 100644 --- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Domain.Shared", - "hash": "1b0b7a34c4980008c5a51453f6a147a4", + "hash": "55aba204a9318469c1df9a9a68a29f86", "contents": [ { "namespace": "Volo.Docs", diff --git a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg.analyze.json index b36bc5a8ff..8bd0e5b0a9 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Domain", - "hash": "4d8e34c525b142b8afff3b212951f70e", + "hash": "f162d16971e9084446f20fc58b84586d", "contents": [ { "namespace": "Volo.Docs", @@ -54,7 +54,7 @@ { "namespace": "Volo.Docs.Projects", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Docs.Projects", "primaryKeyType": "Guid", "summary": null, @@ -69,7 +69,7 @@ { "namespace": "Volo.Docs.Documents", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Docs.Documents", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg.analyze.json b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg.analyze.json index ce431f5313..9ce6b08aa0 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.EntityFrameworkCore", - "hash": "2da3ab87dd243fc228af9141b263a838", + "hash": "8f4f450885d4dfe7da4ab5b6c7a436de", "contents": [ { "namespace": "Volo.Docs.EntityFrameworkCore", diff --git a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.abppkg.analyze.json b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.abppkg.analyze.json new file mode 100644 index 0000000000..0ba065deda --- /dev/null +++ b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.abppkg.analyze.json @@ -0,0 +1,11 @@ +{ + "name": "Volo.Docs.HttpApi.Client", + "hash": "50c3210eb30ae0ec2be506452e76e304", + "contents": [ + { + "namespace": "Volo.Docs", + "contentType": "abpModule", + "name": "DocsHttpApiClientModule" + } + ] +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg.analyze.json b/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg.analyze.json index 30d4f390f6..93f4d884f4 100644 --- a/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.HttpApi", - "hash": "40e275d55e049ef2430257c0dcaebf1c", + "hash": "182385cfe2cc437b662822257d7e78c7", "contents": [ { "namespace": "Volo.Docs", diff --git a/modules/docs/src/Volo.Docs.Installer/FodyWeavers.xml b/modules/docs/src/Volo.Docs.Installer/FodyWeavers.xml new file mode 100644 index 0000000000..00e1d9a1c1 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Installer/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Installer/FodyWeavers.xsd b/modules/docs/src/Volo.Docs.Installer/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Installer/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj b/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj new file mode 100644 index 0000000000..322d689782 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj @@ -0,0 +1,24 @@ + + + + + + + net6.0 + true + + + + + + + + + + + + + + + + diff --git a/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerModule.cs b/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerModule.cs new file mode 100644 index 0000000000..f041885cc3 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerModule.cs @@ -0,0 +1,18 @@ +using Volo.Abp.Modularity; +using Volo.Abp.VirtualFileSystem; + +namespace Volo.Docs; + +[DependsOn( + typeof(AbpVirtualFileSystemModule) + )] +public class DocsInstallerModule : AbpModule +{ + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.FileSets.AddEmbedded(); + }); + } +} diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.abppkg.analyze.json b/modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.abppkg.analyze.json new file mode 100644 index 0000000000..73c0434d13 --- /dev/null +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.abppkg.analyze.json @@ -0,0 +1,29 @@ +{ + "name": "Volo.Docs.MongoDB", + "hash": "a3746fbf103117f78e369dded9a6c7b0", + "contents": [ + { + "namespace": "Volo.Docs.MongoDB", + "contentType": "abpModule", + "name": "DocsMongoDbModule" + }, + { + "namespace": "Volo.Docs.MongoDB", + "connectionStringName": "Docs", + "databaseCollections": [ + { + "entityFullName": "Volo.Docs.Projects.Project", + "contentType": "databaseCollection", + "name": "DocsProjects" + }, + { + "entityFullName": "Volo.Docs.Documents.Document", + "contentType": "databaseCollection", + "name": "DocsDocumentS" + } + ], + "contentType": "mongoDbContext", + "name": "DocsMongoDbContext" + } + ] +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg.analyze.json index 52cddaf987..4806c71b20 100644 --- a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Web", - "hash": "1e9dc32233dc11c064eabd8d5470318c", + "hash": "774b48775ac310eea144c8a3182a56b2", "contents": [ { "namespace": "Volo.Docs", diff --git a/modules/feature-management/Volo.Abp.FeatureManagement.abpmdl.json b/modules/feature-management/Volo.Abp.FeatureManagement.abpmdl.json index 41f55d2ebb..4f99948bd0 100644 --- a/modules/feature-management/Volo.Abp.FeatureManagement.abpmdl.json +++ b/modules/feature-management/Volo.Abp.FeatureManagement.abpmdl.json @@ -73,10 +73,6 @@ "Volo.Abp.FeatureManagement.Blazor.WebAssembly": { "path": "src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.abppkg.json", "folder": "src" - }, - "Volo.Abp.FeatureManagement.Installer": { - "path": "src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg.analyze.json index 6893bca50d..420961153e 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.Application", - "hash": "0a1e4a174a26dbb996988ce6c9964901", + "hash": "464a98075956c59482f5442b4c57c7bd", "contents": [ { "namespace": "Volo.Abp.FeatureManagement", diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg.analyze.json index 33e9856888..adccde52df 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.Domain.Shared", - "hash": "a5b302399f33908142d67bce567fcba8", + "hash": "5a921dc2b9bbd17f772d55246647db55", "contents": [ { "namespace": "Volo.Abp.FeatureManagement", diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg.analyze.json index 23a0797717..170c34da44 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.Domain", - "hash": "dc844bd57c080aeb4c391df420023816", + "hash": "6fe29d46ceb964bb16638d684318ef9a", "contents": [ { "namespace": "Volo.Abp.FeatureManagement", @@ -19,7 +19,7 @@ { "namespace": "Volo.Abp.FeatureManagement", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.FeatureManagement", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg.analyze.json index ebe4eb8121..0782f662ae 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.EntityFrameworkCore", - "hash": "853d5803132c60f1e2494c1e6eccea33", + "hash": "cc5257a0b2c407388aebb23e5dc96ee0", "contents": [ { "namespace": "Volo.Abp.FeatureManagement.EntityFrameworkCore", diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg.analyze.json index e109425cee..12e113712a 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.HttpApi.Client", - "hash": "eb617711357b3b251becf562b208cff6", + "hash": "e93ac980bcfa0fbbd2f42f6f34157643", "contents": [ { "namespace": "Volo.Abp.FeatureManagement", diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg.analyze.json index 8f21302168..a390b349d4 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.HttpApi", - "hash": "4f9c79b9d96c4c033c25ec12008eb07a", + "hash": "9381d1bc9af6ab1460dd76c79547e1e9", "contents": [ { "namespace": "Volo.Abp.FeatureManagement", diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj index de78fd2a68..892777d2ab 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/AbpFeatureManagementInstallerModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/AbpFeatureManagementInstallerModule.cs index 596831e338..1c888dd77c 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/AbpFeatureManagementInstallerModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/AbpFeatureManagementInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.FeatureManagement; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpFeatureManagementInstallerModule : AbpModule diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/FeatureManagementInstallerPipelineBuilder.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/FeatureManagementInstallerPipelineBuilder.cs deleted file mode 100644 index 5e06086e9c..0000000000 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/FeatureManagementInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.FeatureManagement; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class FeatureManagementInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.FeatureManagement.EntityFrameworkCore", - "ConfigureFeatureManagement" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg.analyze.json index a32d542b6b..49307d21e2 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.MongoDB", - "hash": "0b753d8d44423206f1e7292522638194", + "hash": "d194c87394a1950dcb728d610fba38af", "contents": [ { "namespace": "Volo.Abp.FeatureManagement.MongoDB", diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg.analyze.json index 22fdb85e9f..a07c88cc2a 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.Web", - "hash": "54ac0a56a5e7786d63e587ccfdc62e05", + "hash": "970dcffc6a95ca8c5d403796f1e03ffa", "contents": [ { "namespace": "Volo.Abp.FeatureManagement", diff --git a/modules/identity/Volo.Abp.Identity.sln b/modules/identity/Volo.Abp.Identity.sln index bb81ccf749..6079bce031 100644 --- a/modules/identity/Volo.Abp.Identity.sln +++ b/modules/identity/Volo.Abp.Identity.sln @@ -47,6 +47,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.Blazor.Se EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.Blazor.WebAssembly", "src\Volo.Abp.Identity.Blazor.WebAssembly\Volo.Abp.Identity.Blazor.WebAssembly.csproj", "{4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.Installer", "src\Volo.Abp.Identity.Installer\Volo.Abp.Identity.Installer.csproj", "{69C00922-AF2F-4E6E-A78D-65C025F83C1B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -133,6 +135,10 @@ Global {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}.Debug|Any CPU.Build.0 = Debug|Any CPU {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}.Release|Any CPU.ActiveCfg = Release|Any CPU {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}.Release|Any CPU.Build.0 = Release|Any CPU + {69C00922-AF2F-4E6E-A78D-65C025F83C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69C00922-AF2F-4E6E-A78D-65C025F83C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69C00922-AF2F-4E6E-A78D-65C025F83C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69C00922-AF2F-4E6E-A78D-65C025F83C1B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -158,6 +164,7 @@ Global {3F7BB653-3F3A-4889-B73C-E463F239099A} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B} {A5BAC86D-1231-4B95-918E-2011477A81E7} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B} {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B} + {69C00922-AF2F-4E6E-A78D-65C025F83C1B} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {05740D37-83CF-4041-9C2A-D89F1B3DB5A4} diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg.analyze.json index d461b13e37..1c5e740096 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.Application", - "hash": "75bf6dcf1aede2e8a88a993d5d9e75ac", + "hash": "814ef7cd33425671dda3a5530f55a114", "contents": [ { "namespace": "Volo.Abp.Identity", @@ -12,12 +12,12 @@ "summary": null, "implementingInterfaces": [ "Volo.Abp.Identity.IIdentityRoleAppService", - "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.GetIdentityRolesInput, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.GetIdentityRolesInput, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.GetIdentityRolesInput, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.GetIdentityRolesInput, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.GetIdentityRolesInput, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.GetIdentityRolesInput, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", "Volo.Abp.Application.Services.IDeleteAppService`1[[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]" ], "contentType": "applicationService", @@ -28,12 +28,12 @@ "summary": null, "implementingInterfaces": [ "Volo.Abp.Identity.IIdentityUserAppService", - "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", "Volo.Abp.Application.Services.IDeleteAppService`1[[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]" ], "contentType": "applicationService", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg.analyze.json index b485594d90..274ccebb1c 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.Domain.Shared", - "hash": "5f9216e13f38f29ec5f66aeecd448321", + "hash": "8483bba8a84d052fe31e3d494ca190d9", "contents": [ { "namespace": "Volo.Abp.Identity", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.analyze.json index 0c9ef1803e..2f42c3b1f6 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.Domain", - "hash": "51a7170cfa7f0a3ede0888bd0efa1588", + "hash": "32e61cdb91088ee3abe9501c380f3073", "contents": [ { "namespace": "Volo.Abp.Identity", @@ -104,7 +104,7 @@ { "namespace": "Volo.Abp.Identity", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.Identity", "primaryKeyType": "Guid", "summary": null, @@ -119,7 +119,7 @@ { "namespace": "Volo.Abp.Identity", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.Identity", "primaryKeyType": "Guid", "summary": null, @@ -134,7 +134,7 @@ { "namespace": "Volo.Abp.Identity", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.Identity", "primaryKeyType": "Guid", "summary": "Represents a role in the identity system", @@ -151,7 +151,7 @@ { "namespace": "Volo.Abp.Identity", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.Identity", "primaryKeyType": "Guid", "summary": null, @@ -166,7 +166,7 @@ { "namespace": "Volo.Abp.Identity", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.Identity", "primaryKeyType": "Guid", "summary": null, @@ -187,7 +187,7 @@ { "namespace": "Volo.Abp.Identity", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.Identity", "primaryKeyType": "Guid", "summary": "Represents an organization unit (OU).", diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg.analyze.json index d4011f4fde..28f5ce4feb 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.EntityFrameworkCore", - "hash": "302d5996ef84002f4eadcb44cdaac3a5", + "hash": "a7ed00412f00238de041a53dafee4e7b", "contents": [ { "namespace": "Volo.Abp.Identity.EntityFrameworkCore", diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg.analyze.json index 303ecf2d99..2058f34dad 100644 --- a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.HttpApi.Client", - "hash": "dad63d5e17ea5af2f0fe08156f16b8ea", + "hash": "ac3fa34231b6537af3334707e79c4773", "contents": [ { "namespace": "Volo.Abp.Identity", diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg.analyze.json index 5bf7fcedd9..796ab0beba 100644 --- a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.HttpApi", - "hash": "33929bcf8a1400d4a00bbd407c345cb7", + "hash": "5609d7197a88b2b61c75da1314ead391", "contents": [ { "namespace": "Volo.Abp.Identity", diff --git a/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj b/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj index 80a1b51bb0..71cdf1eff3 100644 --- a/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/AbpIdentityInstallerModule.cs b/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/AbpIdentityInstallerModule.cs index 23a1de23a2..cab6b3cc2f 100644 --- a/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/AbpIdentityInstallerModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/AbpIdentityInstallerModule.cs @@ -1,11 +1,9 @@ -using Volo.Abp.Studio; -using Volo.Abp.Modularity; +using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.Identity { [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpIdentityInstallerModule : AbpModule diff --git a/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/IdentityInstallerPipelineBuilder.cs b/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/IdentityInstallerPipelineBuilder.cs deleted file mode 100644 index 8f2f75c30c..0000000000 --- a/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/IdentityInstallerPipelineBuilder.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.Identity -{ - [Dependency(ServiceLifetime.Transient, ReplaceServices = true)] - [ExposeServices(typeof(IModuleInstallingPipelineBuilder))] - public class IdentityInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency - { - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.Identity.EntityFrameworkCore", - "ConfigureIdentity" - ) - ); - - return GetBasePipeline(context); - } - } -} diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg.analyze.json index 4901d0fd08..b3282b59b5 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.MongoDB", - "hash": "d17360bc2d0285185d2886bbcd891684", + "hash": "1c65fcf4db723d3097f3312ea1e058cd", "contents": [ { "namespace": "Volo.Abp.Identity.MongoDB", @@ -12,9 +12,9 @@ "connectionStringName": "AbpIdentity", "databaseCollections": [ { - "entityFullName": "Volo.Abp.Identity.IdentityLinkUser", + "entityFullName": "Volo.Abp.Identity.IdentitySecurityLog", "contentType": "databaseCollection", - "name": "AbpLinkUsers" + "name": "AbpSecurityLogs" }, { "entityFullName": "Volo.Abp.Identity.IdentityClaimType", @@ -22,19 +22,19 @@ "name": "AbpClaimTypes" }, { - "entityFullName": "Volo.Abp.Identity.IdentityUser", + "entityFullName": "Volo.Abp.Identity.OrganizationUnit", "contentType": "databaseCollection", - "name": "AbpUsers" + "name": "AbpOrganizationUnits" }, { - "entityFullName": "Volo.Abp.Identity.IdentitySecurityLog", + "entityFullName": "Volo.Abp.Identity.IdentityLinkUser", "contentType": "databaseCollection", - "name": "AbpSecurityLogs" + "name": "AbpLinkUsers" }, { - "entityFullName": "Volo.Abp.Identity.OrganizationUnit", + "entityFullName": "Volo.Abp.Identity.IdentityUser", "contentType": "databaseCollection", - "name": "AbpOrganizationUnits" + "name": "AbpUsers" }, { "entityFullName": "Volo.Abp.Identity.IdentityRole", diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg.analyze.json index 69f917f1d6..683ad94fb0 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.Web", - "hash": "fbb18bece916f40b1ea7a2d1487f0028", + "hash": "28144e19882c7781eaf09b39ce8a320b", "contents": [ { "namespace": "Volo.Abp.Identity.Web", diff --git a/modules/identityserver/Volo.Abp.IdentityServer.abpmdl.json b/modules/identityserver/Volo.Abp.IdentityServer.abpmdl.json index db174c5cf1..01fe37ad9f 100644 --- a/modules/identityserver/Volo.Abp.IdentityServer.abpmdl.json +++ b/modules/identityserver/Volo.Abp.IdentityServer.abpmdl.json @@ -41,10 +41,6 @@ "Volo.Abp.PermissionManagement.Domain.IdentityServer": { "path": "src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo.Abp.PermissionManagement.Domain.IdentityServer.abppkg.json", "folder": "src" - }, - "Volo.Abp.IdentityServer.Installer": { - "path": "src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.abppkg.json b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj index ca7d96ac5d..6b99c2fd47 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj @@ -4,13 +4,13 @@ - net5.0 + net6.0 true - + diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/AbpIdentityServerInstallerModule.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/AbpIdentityServerInstallerModule.cs index cbb7f66c1b..80b73a8979 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/AbpIdentityServerInstallerModule.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/AbpIdentityServerInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.IdentityServer; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpIdentityServerInstallerModule : AbpModule diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/IdentityServerInstallerPipelineBuilder.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/IdentityServerInstallerPipelineBuilder.cs deleted file mode 100644 index 76e1692193..0000000000 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/IdentityServerInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.IdentityServer; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class IdentityServerInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.IdentityServer.EntityFrameworkCore", - "ConfigureIdentityServer" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/openiddict/Volo.Abp.OpenIddict.abpmdl.json b/modules/openiddict/Volo.Abp.OpenIddict.abpmdl.json new file mode 100644 index 0000000000..7cb30216ab --- /dev/null +++ b/modules/openiddict/Volo.Abp.OpenIddict.abpmdl.json @@ -0,0 +1,71 @@ +{ + "folders": { + "items": { + "src": {}, + "test": {}, + "app": {} + } + }, + "packages": { + "Volo.Abp.OpenIddict.Domain.Shared": { + "path": "src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.json", + "folder": "src" + }, + "Volo.Abp.OpenIddict.Domain": { + "path": "src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.json", + "folder": "src" + }, + "Volo.Abp.OpenIddict.EntityFrameworkCore": { + "path": "src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.json", + "folder": "src" + }, + "Volo.Abp.OpenIddict.MongoDB": { + "path": "src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.json", + "folder": "src" + }, + "Volo.Abp.OpenIddict.TestBase": { + "path": "test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg.json", + "folder": "test" + }, + "Volo.Abp.OpenIddict.EntityFrameworkCore.Tests": { + "path": "test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg.json", + "folder": "test" + }, + "Volo.Abp.OpenIddict.MongoDB.Tests": { + "path": "test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg.json", + "folder": "test" + }, + "Volo.Abp.OpenIddict.Domain.Tests": { + "path": "test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg.json", + "folder": "test" + }, + "OpenIddict.Demo.Server": { + "path": "app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.abppkg.json", + "folder": "app" + }, + "OpenIddict.Demo.Client.Mvc": { + "path": "app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.json", + "folder": "app" + }, + "Volo.Abp.OpenIddict.AspNetCore": { + "path": "src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.abppkg.json", + "folder": "src" + }, + "OpenIddict.Demo.Client.Console": { + "path": "app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.abppkg.json", + "folder": "app" + }, + "OpenIddict.Demo.API": { + "path": "app/OpenIddict.Demo.API/OpenIddict.Demo.API.abppkg.json", + "folder": "app" + }, + "OpenIddict.Demo.Client.BlazorWASM": { + "path": "app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.abppkg.json", + "folder": "app" + }, + "Volo.Abp.PermissionManagement.Domain.OpenIddict": { + "path": "src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo.Abp.PermissionManagement.Domain.OpenIddict.abppkg.json", + "folder": "src" + } + } +} \ No newline at end of file diff --git a/modules/openiddict/Volo.Abp.OpenIddict.abpsln.json b/modules/openiddict/Volo.Abp.OpenIddict.abpsln.json new file mode 100644 index 0000000000..3e59583a9a --- /dev/null +++ b/modules/openiddict/Volo.Abp.OpenIddict.abpsln.json @@ -0,0 +1,8 @@ +{ + "template": "empty", + "modules": { + "Volo.Abp.OpenIddict": { + "path": "Volo.Abp.OpenIddict.abpmdl.json" + } + } +} \ No newline at end of file diff --git a/modules/openiddict/Volo.Abp.OpenIddict.sln b/modules/openiddict/Volo.Abp.OpenIddict.sln index c95dc5f251..8161e82a2a 100644 --- a/modules/openiddict/Volo.Abp.OpenIddict.sln +++ b/modules/openiddict/Volo.Abp.OpenIddict.sln @@ -39,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIddict.Demo.Client.Blaz EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.PermissionManagement.Domain.OpenIddict", "src\Volo.Abp.PermissionManagement.Domain.OpenIddict\Volo.Abp.PermissionManagement.Domain.OpenIddict.csproj", "{674D0A62-4F7B-436C-83A9-AA8FE03F3A11}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.OpenIddict.Installer", "src\Volo.Abp.OpenIddict.Installer\Volo.Abp.OpenIddict.Installer.csproj", "{B748241A-E782-493D-8905-0C27033AB519}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -105,6 +107,10 @@ Global {674D0A62-4F7B-436C-83A9-AA8FE03F3A11}.Debug|Any CPU.Build.0 = Debug|Any CPU {674D0A62-4F7B-436C-83A9-AA8FE03F3A11}.Release|Any CPU.ActiveCfg = Release|Any CPU {674D0A62-4F7B-436C-83A9-AA8FE03F3A11}.Release|Any CPU.Build.0 = Release|Any CPU + {B748241A-E782-493D-8905-0C27033AB519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B748241A-E782-493D-8905-0C27033AB519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B748241A-E782-493D-8905-0C27033AB519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B748241A-E782-493D-8905-0C27033AB519}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -125,6 +131,7 @@ Global {70FD6E90-BBE8-4DA1-AE07-55064803225B} = {2B5CD179-FF7B-428F-98F6-2ADBB9538D18} {F3853F2B-72D4-496C-B59C-87E2759AD79B} = {2B5CD179-FF7B-428F-98F6-2ADBB9538D18} {674D0A62-4F7B-436C-83A9-AA8FE03F3A11} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} + {B748241A-E782-493D-8905-0C27033AB519} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C09128AF-C73F-ED7D-33F5-69BF7D934D50} diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.abppkg.json similarity index 100% rename from modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.abppkg.json diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.abppkg.json similarity index 100% rename from modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.abppkg.json diff --git a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.abppkg.json similarity index 100% rename from modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.abppkg.json diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.analyze.json b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.analyze.json new file mode 100644 index 0000000000..81b2b19298 --- /dev/null +++ b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.analyze.json @@ -0,0 +1,5 @@ +{ + "name": "OpenIddict.Demo.Client.Mvc", + "hash": "2132c41341e3f1486a7036fbdd82d4f9", + "contents": [] +} \ No newline at end of file diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.json new file mode 100644 index 0000000000..48875c29cf --- /dev/null +++ b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "host.mvc" +} \ No newline at end of file diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.abppkg.json similarity index 100% rename from modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.abppkg.json diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/package.json b/modules/openiddict/app/OpenIddict.Demo.Server/package.json index fa1f07511a..768676f8f0 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/package.json +++ b/modules/openiddict/app/OpenIddict.Demo.Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~6.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~6.0.0-rc.4" } } diff --git a/modules/openiddict/app/angular/package.json b/modules/openiddict/app/angular/package.json index 85a9a5bd21..55a636654c 100644 --- a/modules/openiddict/app/angular/package.json +++ b/modules/openiddict/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~6.0.0-rc.3", - "@abp/ng.components": "~6.0.0-rc.3", - "@abp/ng.core": "~6.0.0-rc.3", - "@abp/ng.identity": "~6.0.0-rc.3", - "@abp/ng.setting-management": "~6.0.0-rc.3", - "@abp/ng.tenant-management": "~6.0.0-rc.3", - "@abp/ng.theme.basic": "~6.0.0-rc.3", - "@abp/ng.theme.shared": "~6.0.0-rc.3", + "@abp/ng.account": "~6.0.0-rc.4", + "@abp/ng.components": "~6.0.0-rc.4", + "@abp/ng.core": "~6.0.0-rc.4", + "@abp/ng.identity": "~6.0.0-rc.4", + "@abp/ng.setting-management": "~6.0.0-rc.4", + "@abp/ng.tenant-management": "~6.0.0-rc.4", + "@abp/ng.theme.basic": "~6.0.0-rc.4", + "@abp/ng.theme.shared": "~6.0.0-rc.4", "@angular/animations": "~13.1.1", "@angular/common": "~13.1.1", "@angular/compiler": "~13.1.1", @@ -34,7 +34,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~6.0.0-rc.3", + "@abp/ng.schematics": "~6.0.0-rc.4", "@angular-devkit/build-angular": "~13.1.2", "@angular-eslint/builder": "~13.0.1", "@angular-eslint/eslint-plugin": "~13.0.1", diff --git a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.abppkg.json similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.abppkg.json rename to modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.abppkg.json diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.analyze.json b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.analyze.json new file mode 100644 index 0000000000..deea8cbf36 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.analyze.json @@ -0,0 +1,11 @@ +{ + "name": "Volo.Abp.OpenIddict.Domain.Shared", + "hash": "bc60e65998f3b40d6651cf0a0a08a84c", + "contents": [ + { + "namespace": "Volo.Abp.OpenIddict", + "contentType": "abpModule", + "name": "AbpOpenIddictDomainSharedModule" + } + ] +} \ No newline at end of file diff --git a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo.Abp.Studio.Domain.Shared.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.json similarity index 100% rename from studio/src/Volo.Abp.Studio.Domain.Shared/Volo.Abp.Studio.Domain.Shared.abppkg.json rename to modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.json diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.analyze.json b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.analyze.json new file mode 100644 index 0000000000..7b671211bd --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.analyze.json @@ -0,0 +1,107 @@ +{ + "name": "Volo.Abp.OpenIddict.Domain", + "hash": "8822f98b8a1deca68b33f69126bbc669", + "contents": [ + { + "namespace": "Volo.Abp.OpenIddict", + "contentType": "abpModule", + "name": "AbpOpenIddictDomainModule" + }, + { + "namespace": "Volo.Abp.OpenIddict.Tokens", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "aggregateRoot", + "name": "OpenIddictToken" + }, + { + "namespace": "Volo.Abp.OpenIddict.Scopes", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "aggregateRoot", + "name": "OpenIddictScope" + }, + { + "namespace": "Volo.Abp.OpenIddict.Authorizations", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "aggregateRoot", + "name": "OpenIddictAuthorization" + }, + { + "namespace": "Volo.Abp.OpenIddict.Applications", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "aggregateRoot", + "name": "OpenIddictApplication" + }, + { + "namespace": "Volo.Abp.OpenIddict.Tokens", + "summary": null, + "entityAnalyzeModel": { + "namespace": "Volo.Abp.OpenIddict.Tokens", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "entity", + "name": "OpenIddictToken" + }, + "contentType": "repositoryInterface", + "name": "IOpenIddictTokenRepository" + }, + { + "namespace": "Volo.Abp.OpenIddict.Scopes", + "summary": null, + "entityAnalyzeModel": { + "namespace": "Volo.Abp.OpenIddict.Scopes", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "entity", + "name": "OpenIddictScope" + }, + "contentType": "repositoryInterface", + "name": "IOpenIddictScopeRepository" + }, + { + "namespace": "Volo.Abp.OpenIddict.Authorizations", + "summary": null, + "entityAnalyzeModel": { + "namespace": "Volo.Abp.OpenIddict.Authorizations", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "entity", + "name": "OpenIddictAuthorization" + }, + "contentType": "repositoryInterface", + "name": "IOpenIddictAuthorizationRepository" + }, + { + "namespace": "Volo.Abp.OpenIddict.Applications", + "summary": null, + "entityAnalyzeModel": { + "namespace": "Volo.Abp.OpenIddict.Applications", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "entity", + "name": "OpenIddictApplication" + }, + "contentType": "repositoryInterface", + "name": "IOpenIddictApplicationRepository" + } + ] +} \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.json new file mode 100644 index 0000000000..1d574efe45 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.domain" +} \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.analyze.json b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.analyze.json new file mode 100644 index 0000000000..a769a2edd2 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.analyze.json @@ -0,0 +1,39 @@ +{ + "name": "Volo.Abp.OpenIddict.EntityFrameworkCore", + "hash": "437e716bcba4d2364e711dac86cda9f6", + "contents": [ + { + "namespace": "Volo.Abp.OpenIddict.EntityFrameworkCore", + "contentType": "abpModule", + "name": "AbpOpenIddictEntityFrameworkCoreModule" + }, + { + "namespace": "Volo.Abp.OpenIddict.EntityFrameworkCore", + "connectionStringName": "AbpOpenIddict", + "databaseTables": [ + { + "entityFullName": "Volo.Abp.OpenIddict.Applications.OpenIddictApplication", + "contentType": "databaseTable", + "name": "OpenIddictApplications" + }, + { + "entityFullName": "Volo.Abp.OpenIddict.Authorizations.OpenIddictAuthorization", + "contentType": "databaseTable", + "name": "OpenIddictAuthorizations" + }, + { + "entityFullName": "Volo.Abp.OpenIddict.Scopes.OpenIddictScope", + "contentType": "databaseTable", + "name": "OpenIddictScopes" + }, + { + "entityFullName": "Volo.Abp.OpenIddict.Tokens.OpenIddictToken", + "contentType": "databaseTable", + "name": "OpenIddictTokens" + } + ], + "contentType": "efCoreDbContext", + "name": "OpenIddictDbContext" + } + ] +} \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.json new file mode 100644 index 0000000000..e1c64f0175 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.ef" +} \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/FodyWeavers.xml b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/FodyWeavers.xml new file mode 100644 index 0000000000..00e1d9a1c1 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/FodyWeavers.xsd b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj new file mode 100644 index 0000000000..d2cdd84b53 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj @@ -0,0 +1,24 @@ + + + + + + + net6.0 + true + + + + + + + + + + + + + + + + diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/AbpOpenIddictInstallerModule.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/AbpOpenIddictInstallerModule.cs new file mode 100644 index 0000000000..13a8a4c702 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/AbpOpenIddictInstallerModule.cs @@ -0,0 +1,18 @@ +using Volo.Abp.Modularity; +using Volo.Abp.VirtualFileSystem; + +namespace Volo.Abp.OpenIddict; + +[DependsOn( + typeof(AbpVirtualFileSystemModule) +)] +public class AbpOpenIddictInstallerModule : AbpModule +{ + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.FileSets.AddEmbedded(); + }); + } +} diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.analyze.json b/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.analyze.json new file mode 100644 index 0000000000..f88d27215e --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.analyze.json @@ -0,0 +1,39 @@ +{ + "name": "Volo.Abp.OpenIddict.MongoDB", + "hash": "9306b0570c535c0a4124afc3181e8313", + "contents": [ + { + "namespace": "Volo.Abp.OpenIddict.MongoDB", + "contentType": "abpModule", + "name": "AbpOpenIddictMongoDbModule" + }, + { + "namespace": "Volo.Abp.OpenIddict.MongoDB", + "connectionStringName": "AbpOpenIddict", + "databaseCollections": [ + { + "entityFullName": "Volo.Abp.OpenIddict.Authorizations.OpenIddictAuthorization", + "contentType": "databaseCollection", + "name": "OpenIddictAuthorizations" + }, + { + "entityFullName": "Volo.Abp.OpenIddict.Applications.OpenIddictApplication", + "contentType": "databaseCollection", + "name": "OpenIddictApplications" + }, + { + "entityFullName": "Volo.Abp.OpenIddict.Tokens.OpenIddictToken", + "contentType": "databaseCollection", + "name": "OpenIddictTokens" + }, + { + "entityFullName": "Volo.Abp.OpenIddict.Scopes.OpenIddictScope", + "contentType": "databaseCollection", + "name": "OpenIddictScopes" + } + ], + "contentType": "mongoDbContext", + "name": "OpenIddictMongoDbContext" + } + ] +} \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.json new file mode 100644 index 0000000000..8b23fd1e69 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.mongodb" +} \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.abppkg.json b/modules/openiddict/src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo.Abp.PermissionManagement.Domain.OpenIddict.abppkg.json similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.abppkg.json rename to modules/openiddict/src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo.Abp.PermissionManagement.Domain.OpenIddict.abppkg.json diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg.json b/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg.json new file mode 100644 index 0000000000..a686451fbc --- /dev/null +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.test" +} \ No newline at end of file diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg.json b/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg.json new file mode 100644 index 0000000000..a686451fbc --- /dev/null +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.test" +} \ No newline at end of file diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg.json b/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg.json new file mode 100644 index 0000000000..a686451fbc --- /dev/null +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.test" +} \ No newline at end of file diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg.json b/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg.json new file mode 100644 index 0000000000..a686451fbc --- /dev/null +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.test" +} \ No newline at end of file diff --git a/modules/permission-management/Volo.Abp.PermissionManagement.abpmdl.json b/modules/permission-management/Volo.Abp.PermissionManagement.abpmdl.json index f40c2e27de..82dc87dade 100644 --- a/modules/permission-management/Volo.Abp.PermissionManagement.abpmdl.json +++ b/modules/permission-management/Volo.Abp.PermissionManagement.abpmdl.json @@ -73,10 +73,6 @@ "Volo.Abp.PermissionManagement.Blazor.WebAssembly": { "path": "src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.abppkg.json", "folder": "src" - }, - "Volo.Abp.PermissionManagement.Installer": { - "path": "src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg.analyze.json index 290e84f392..1d93fdf421 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.Application.Contracts", - "hash": "c71030d581b91d275b3dd93009c2185f", + "hash": "761a407cfc112e2c648d5c5cf50064e4", "contents": [ { "namespace": "Volo.Abp.PermissionManagement", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg.analyze.json index 8e54490907..bb0296b33c 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.Application", - "hash": "111aa17278856d07dcb113e05766b739", + "hash": "f51dd864d1a9bdb42aef9b7a4220b63a", "contents": [ { "namespace": "Volo.Abp.PermissionManagement", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg.analyze.json index 273ebd4974..f0ad0cedd4 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.Domain.Shared", - "hash": "94944d94fded88942ce31c2f803b9577", + "hash": "ef0b0405da04433da55a8a4bb09bcfc6", "contents": [ { "namespace": "Volo.Abp.PermissionManagement", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hans.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hans.json index e4d4edbf0a..9cd430ef99 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hans.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hans.json @@ -1,10 +1,11 @@ { - "culture": "zh-Hans", - "texts": { - "Permissions": "权限", - "OnlyProviderPermissons": "只有这个提供商", - "All": "所有", - "SelectAllInAllTabs": "授予所有权限", - "SelectAllInThisTab": "全选" - } + "culture": "zh-Hans", + "texts": { + "Permissions": "权限", + "OnlyProviderPermissons": "只有这个提供商", + "All": "所有", + "SelectAllInAllTabs": "授予所有权限", + "SelectAllInThisTab": "全选", + "SaveWithoutAnyPermissionsWarningMessage": "你确定要保存没有任何权限吗？" + } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg.analyze.json index dd22c93d75..297803927a 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.Domain", - "hash": "6aed5a285610c53b3714ba717d73d675", + "hash": "db626b114b15f02f09d50652c81d3bb8", "contents": [ { "namespace": "Volo.Abp.PermissionManagement", @@ -10,7 +10,7 @@ { "namespace": "Volo.Abp.PermissionManagement", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.PermissionManagement", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg.analyze.json index d23a7ad2aa..caf446b3f3 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.EntityFrameworkCore", - "hash": "f8289209c0d9289ce4320a5a163ce631", + "hash": "9135b32df96ebabe2b2ab7710c087a20", "contents": [ { "namespace": "Volo.Abp.PermissionManagement.EntityFrameworkCore", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg.analyze.json index d4fd903ed2..38e0e9e284 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.HttpApi.Client", - "hash": "7000b975c242b79c82d95da010220d50", + "hash": "1b9f52d21ca5d9c7e6f7662ccc27b7c3", "contents": [ { "namespace": "Volo.Abp.PermissionManagement", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg.analyze.json index eb48bb597b..083e081b61 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.HttpApi", - "hash": "378c3d034d1c15192395da445181ef87", + "hash": "2eac8fbb963e8043e3a860f91b2299d9", "contents": [ { "namespace": "Volo.Abp.PermissionManagement.HttpApi", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj index c1fa844501..c98cf37a80 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/AbpPermissionManagementInstallerModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/AbpPermissionManagementInstallerModule.cs index e9ac5c3ada..fee5e242ba 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/AbpPermissionManagementInstallerModule.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/AbpPermissionManagementInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.PermissionManagement; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpPermissionManagementInstallerModule : AbpModule diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/PermissionManagementInstallerPipelineBuilder.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/PermissionManagementInstallerPipelineBuilder.cs deleted file mode 100644 index 97bd5706a0..0000000000 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/PermissionManagementInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.PermissionManagement; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class PermissionManagementInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.PermissionManagement.EntityFrameworkCore", - "ConfigurePermissionManagement" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg.analyze.json index ec315eb7f1..716bb1da98 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.MongoDB", - "hash": "56f2712fd206ad7dee9f2a2116935af1", + "hash": "7baac61b4f919f381459d4d7e606c7b9", "contents": [ { "namespace": "Volo.Abp.PermissionManagement.MongoDB", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg.analyze.json index 571f627742..964e43381c 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.Web", - "hash": "d92eb24e5e657f77bec981e6bb49b22c", + "hash": "ba550bdb16d700b630bdc042b35b084d", "contents": [ { "namespace": "Volo.Abp.PermissionManagement.Web", diff --git a/modules/setting-management/Volo.Abp.SettingManagement.abpmdl.json b/modules/setting-management/Volo.Abp.SettingManagement.abpmdl.json index ba8523c1ac..899d1a00ed 100644 --- a/modules/setting-management/Volo.Abp.SettingManagement.abpmdl.json +++ b/modules/setting-management/Volo.Abp.SettingManagement.abpmdl.json @@ -74,10 +74,6 @@ "Volo.Abp.SettingManagement.Blazor.WebAssembly": { "path": "src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.abppkg.json", "folder": "src" - }, - "Volo.Abp.SettingManagement.Installer": { - "path": "src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json index 1a827c57d9..3878b0045a 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json @@ -3,6 +3,6 @@ "name": "demo-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.4" } } diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock index 054a811ce7..e7ce3574f0 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.3.tgz#b95266387e562c635de795442f90470f8e9e6318" - integrity sha512-vVkEpotDST455E3rynvRQpBKPcNNJ2m1wLkz/B9dQNdUjvm8L4F6s0ls0XFlKUNvQfCVfedkRtGayuvNje/Oxg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.3.tgz#664ca2ee712b7d9e66103c00beb41eb9648a6075" - integrity sha512-KxCsGuoUWKaDo7Oo9aKp51pli2m0DZ2tG8m+zK+m4M9U7g96uC+DOFy3gc7MdPlszvrw32Wwm7I0AughstByNA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.3" - "@abp/bootstrap" "~6.0.0-rc.3" - "@abp/bootstrap-datepicker" "~6.0.0-rc.3" - "@abp/datatables.net-bs5" "~6.0.0-rc.3" - "@abp/font-awesome" "~6.0.0-rc.3" - "@abp/jquery-form" "~6.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.3" - "@abp/lodash" "~6.0.0-rc.3" - "@abp/luxon" "~6.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.3" - "@abp/select2" "~6.0.0-rc.3" - "@abp/sweetalert2" "~6.0.0-rc.3" - "@abp/timeago" "~6.0.0-rc.3" - "@abp/toastr" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.3.tgz#47c23b57ed3908bd78a232230e53d1f3cba2de41" - integrity sha512-7eJZy2JUGQP94Tz3JJWXRHRmDfTcPZ/lS1/VNbU8B4qvgl5ChIXklVEJLR1fwrBhKXZV8fGVmqT1XlGTGFvFJA== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.4.tgz#f57efa6f3cabb48e40a44e79adb31de58145bf89" + integrity sha512-JcoXch+j+T9V3Lfu9Of9Tbcw5sNBpSbe42SjzUcXLqdVijV/DBWKMg/9OPH8KZ4PZwl4sl9DSAmGWXHdipLxzA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.4.tgz#a0fd1e9f6f05d854d6f2119ed551a1cef485c929" + integrity sha512-QsrV+N6YFuMo/q73Bd1P0qDyG0Ua5JmQFgKzA94eMXDyYgpRrT5RyKh0CNV81Q/AX9V5c6APrtcQ31tYzmWwbQ== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.4" + "@abp/bootstrap" "~6.0.0-rc.4" + "@abp/bootstrap-datepicker" "~6.0.0-rc.4" + "@abp/datatables.net-bs5" "~6.0.0-rc.4" + "@abp/font-awesome" "~6.0.0-rc.4" + "@abp/jquery-form" "~6.0.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.4" + "@abp/lodash" "~6.0.0-rc.4" + "@abp/luxon" "~6.0.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.4" + "@abp/select2" "~6.0.0-rc.4" + "@abp/sweetalert2" "~6.0.0-rc.4" + "@abp/timeago" "~6.0.0-rc.4" + "@abp/toastr" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.4.tgz#de70d53a900db2f5c74719b7c4e406e0de4c2662" + integrity sha512-8GUoTG4B3Tz2Xd/cFaw9EAjOUoEfMG95VkjNqdfcvPPrtFML/W3fcMUwbjOvQ/lEnAMTSGREU3w9y7Y+GIv9qA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.3.tgz#89198b863dbfccf5f07ac3c4b20ce6199adcb17a" - integrity sha512-NLoUjcR66mqwSWuVftu2yFH4/j6QP+FiElRfZQ9OYmO8DQx2Ue5UZzjrFTrZ1DBBCfzhr2Bffj80dirGvGDyvg== +"@abp/bootstrap-datepicker@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.4.tgz#2dbc9f8f9816689b6db84948046a964ceb1bab17" + integrity sha512-tWPA3ehtU+QPKbxdLDzKk4p2wMNGo/R4CjCQydD1i9BIpkBUlA5sBtbNrLTvZ5/KM1RYecFGFrHTVVOzGsUKrA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.3.tgz#4574bf574cc3484869e8ff8bc592f6212d20a969" - integrity sha512-Q5v7WRkGhGcjRg267HXtqs1oU7ts9UXPyCXmg5y2y5qMOyioD+m4MKV4iv67DgoQjabudp8X2egTKxkej6Lzkw== +"@abp/bootstrap@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.4.tgz#f360f86b00f474236ad182cd792df24f9ecbfc47" + integrity sha512-JjHJNPkTJRYwQvRnzTvcYIbxs2TD6n+LVtCd5ItYNbg8bMyd9yMugThxtgZGE3awVQqjLxZ4fwv+CRnf70JdrQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" bootstrap "^5.1.3" -"@abp/core@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.3.tgz#5662ce813d449d97d9fb7ea2552b2774c8df7825" - integrity sha512-X/VRdk5SGNYc5gQzPcBEPAvwcuD9WXsI4YIdrqjnes0s8u2/XmfrTixojh8Y5EYUoOblEE3Soj5hBhY1cVwcbQ== +"@abp/core@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.4.tgz#d164e1ca3546dc710c569ea7ae0145e1b713658e" + integrity sha512-mH3+BCU8Wbe0mieDHd5Awvhd09X7iJKRLBQBIINcDeIIOCJ9x4v8grynvndzlaS7J2AlWZba0XJU6sZ+YpuP2w== dependencies: - "@abp/utils" "~6.0.0-rc.3" + "@abp/utils" "~6.0.0-rc.4" -"@abp/datatables.net-bs5@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.3.tgz#22865c7e621de720b71af6265b3193f6c78695bd" - integrity sha512-T+mhLc6uSzWmxDQogVwnJ6VxI4845gmF68/i9TmVKNlCtpa3EEfyuF/hgWT1hYfCb4XOsvd/CWrunbkC3fsmtg== +"@abp/datatables.net-bs5@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.4.tgz#fc3c43fb9ba8154b4b960ed0799948f5df738f7e" + integrity sha512-QtII4mFFFjvToM2LDqZugVh6/HwKbIdKYqHCxJKprZ1aVmyBeiMHi89z0G4eChAYdTpjHQstoDddYje53DkWOw== dependencies: - "@abp/datatables.net" "~6.0.0-rc.3" + "@abp/datatables.net" "~6.0.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.3.tgz#d036defe6ad7fc989dffa020ae579362ee3150d1" - integrity sha512-4cUU8/Tn0Vz9bx7jjMOD/0Viyr29fcwoQAAkxaaYZp6qiQbENgz46/xpQf2oBCoudk8CLdzpmNa7jWte7PcJJw== +"@abp/datatables.net@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.4.tgz#f6916ba9a8089b573faddcc38e6a76e38a0dce16" + integrity sha512-9zhIvAO4AX6YIUELodEUz2hsDj+RITGoxWaav90jUJEqK/jVsDfs2mbrWcLzQDMLpZVElZA0p8tUyWS8yMsjaA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.3.tgz#803569d1a7e25f8a1c2be018312449c23fb78217" - integrity sha512-lYdh38UCTSkzzw0B/mpPEo7iFXzSKHCNbBOIHe6dd6O/Qli7wYukTtUOFn5Sh+yoydLY1as92HtiGL1ckSdu1g== +"@abp/font-awesome@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.4.tgz#a3e1664cbebdbc1aa4d2dd1ac48f022b3ce100ad" + integrity sha512-tlBekvBQ/wEkx1Z2sX8cPp/JKzxmTsMSUSbnAc/Uz+De/fxhyepUACb35zFSv2VmLPz1M1xqLvLUCJmciZhINQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.3.tgz#4ec503c07e2194148c3a7e7cf7ddef2871679e6a" - integrity sha512-Q3uEpflntqrSkYakcdsBnnYYfxJWXD/CDjMiwjbb6gIc8s4qkbIYxVxvYvlEezoIDYQkMSXOn7BS4clWsesiJg== +"@abp/jquery-form@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.4.tgz#4dfbef35e4d7dc80534e0f33644142a9ccd54cb4" + integrity sha512-/21ibf99c8q7ygbj2QF7GAGCW1MaalAurueffndTGZPRRSKrCVTPINtBih7NGgh1zcavhog+GBA3INJ3etQIWQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.3.tgz#01da2a59663d373ff1c69022f4c9c66ad0b29403" - integrity sha512-ij1ML2D9rYF3pJthWO6mGQajsJhbDCtOoBvnh9yCZccuwOYkXP22PqfUxjjxtqL4HqFI31KRpFg0ANMGSzEEBg== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.4.tgz#6a498b76076683bbc77d7a73fcf893863aecb59f" + integrity sha512-+9RAPaFYsuSZ05RtJJNeHl1PkyHm9Mv3WKAw+QrKHzaK34zpjD/cZdiijcAWM3DrNPiCCuaaUgMMIMn223MIEA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.3" + "@abp/jquery-validation" "~6.0.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.3.tgz#724aea9572dcb2faccf8c6355332b0b2a4df9260" - integrity sha512-rTK5oHaMtycvWxunNwzbE/MbsXXIr6qDnOY3rVUmjTHjqUOHYz591t/XeQfjnSXPp4k/SZUjG6viTC3J2jzC1A== +"@abp/jquery-validation@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.4.tgz#2f79457d2c83795449eb6d3c82942568b0e6f273" + integrity sha512-a3v0QDWm2kqrr5r4Nim8unT7p5xHt8KR/TGmGiS6CNMRXVtd6SLMDg36D1d5AcBemFW5evlySiqAl2D7v+g0/g== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.3.tgz#ba19cc8b802c46490277939e6c674811127d8016" - integrity sha512-MbD38iInyag7/j5k42cvMT4jLZMtXH4lUK0rjvqUDVaxKEks46Ix/90uczQ9XajYONgx0CJKFj2urgM830+CCA== +"@abp/jquery@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.4.tgz#992222c2e233840ce7bf573b8bb15b0c9c15adde" + integrity sha512-JRf9NltPP++RAfPRvWFoYNgs2i/ydyROjtLSnCGdmO4UwAQZ21YuDY7x0Ia7VSj0a6cFg8d7M2PGIeJlcaXIsg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.3.tgz#8a5bab02353e5cab4ca06ab82f6dbe6285faa95a" - integrity sha512-c8yhcapzPsXyeiFjeOC+2a4bn5wFjW5gUoN+p/p+tE+FIcH37yEgyw/tAr6aZPCmR770MqQXct4t7S4Czbbk+A== +"@abp/lodash@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.4.tgz#2c88a9274e6c27334f277404280d43b2fbae6552" + integrity sha512-yOEe3SVvh5IuFMujSgC4waG0JzWzRQj907KUYzjcjfx35J5Q0Mwvu6/9wRYJx1av40YQdnzMrRoqXKDPAKdV6A== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.3.tgz#ba515e122c61918d481467d5be39f08a363822f6" - integrity sha512-2lRSSC0DYShlnKdbJ/Pmha/azjt09ZRPx57NQ01dc7ungChPry5EJL6pC3kXWnJrCkrPCF0V5+A3+taut9+l3A== +"@abp/luxon@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.4.tgz#95ae8f70d9b5d8cd753cc7d918c611692d5bf218" + integrity sha512-OFs4Uv82YienRwiiVV78hdWSanS19lvjoBBskPF5s6LK/5mzLMrtbHBRf18wcc/AfBMOxot1BX2q1v4wb2u3qw== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.3.tgz#0798e37ec6a852748118692a5fbd30c99d9745db" - integrity sha512-FlyShmRxG3wGk1OJCjHIZAdi2/Y2FJPkVxaE72CVIceQSmg0nebGTv3a7bhd4QzKkDsSA3+t6gHjnuKlTlDFLA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.4.tgz#f40968c7f64eb6b36ff2bf06b4be8661308abd12" + integrity sha512-lcOskhl+NbPqKBxg+GABYBBrMtHYw2qZ/srFix7DgGUdNlFbXRP/AtTz0Wiav0PNGZgivniRLqvqcLCiCkrBrg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.3.tgz#deb8332bfce2102a562004893321a48d5194bf53" - integrity sha512-rb0qElmmhiP09xX8ZbjzNLF6ygFBwErysGWt6Bbgzz5waX2sGe575Cgoz53FaMQ4JaRBg1N0/nCejKyDtiINRA== +"@abp/select2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.4.tgz#c7cf0f910fa6a9f97845a0659178ac02cfa022bc" + integrity sha512-NcXMZYiLDSVnjtRgvPwm9RB1M7qZnRyyyM+htdH5laEvDDGCcOLFS8iK6WI4Irmvw6MhBkDTHaH9ssJNbF7pvQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.3.tgz#e61fc6c1bed1316c1d44ca5c92f590e422db24d4" - integrity sha512-+SNpBb4XrQlWzRQK9lfdJqA9IfJrlgoqmHwPDgf3Q+P922MzO33TgDlZWbeE7MzVj2y2WmNsPuCKwhjSjSL2rw== +"@abp/sweetalert2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.4.tgz#a1a2a1a5d7e1fb83680cc35ca477cee1f2f2463b" + integrity sha512-dvslRK2oc06JjI6aV1dj1LzWbOb50BfwbHxcmOenl8Q4XMP389bFbaOiVezjk+d3YLsspCMDxxu2NTqaq67Z6g== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.3.tgz#0ef8c4801bfd4623e6895b1d047b1437063bda53" - integrity sha512-P3YRDVKjR5/Fz+cXiPg3IiUr7XGbNh7mgmJ1ywRXmKVmVMJmhQ2RsKmmtkGJn4TfVHu/l5iJXe4rqgL21/yX/g== +"@abp/timeago@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.4.tgz#3a93a65ee6b8260f7e80bb862b60623e967e08a2" + integrity sha512-/ZZy5E3PHtvmkjg+s9BvgO344DOs0jiifimDntp5jZPQPrsQ5WPC9o9hrlGb40tTw5P0wAnznjGvHnZjBiflvA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.3.tgz#6010d4247937531ebf7c8659d6254cd3db6c4855" - integrity sha512-sC9eCzYVgDrLSFIhJGe9hshzfwA1BkZNah4NQhyq+V6HQ8YF7goMS79N+/XmSoLQ9zzRhusqnPFnb+4FHjr7iA== +"@abp/toastr@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.4.tgz#3bf6abc79baf7a2b7de9840e55caf839018ab96e" + integrity sha512-zesojzXYsFd57m7XBgxLwKeAs8HRe25iNKRGC0YR7MK2HP1770jc+dEjnQ0pnqhMHouZejFJZcpqdHGr85ZUgQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.3.tgz#6d3515694314175218606e9518618ce335b4b360" - integrity sha512-K2geJ9P1ztk4Ehzb9YG3CqqLOi+z8/4iBLUzooNZLQqS+KdlUhCmqfuCoI/A5Aq9DGbTYesalp+Fwoh3S2Dl8A== +"@abp/utils@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.4.tgz#e18ef1557a2600fa153db13162e1ed097bc6f15a" + integrity sha512-eT6RVfFsyB8uAdMHDdG4M2Erg3RrvkG7Z5Xa0ko7JIhEz5VwsRcXGwTAORYHsu0M1hpewZljdD5OmQRods13LA== dependencies: just-compare "^1.3.0" diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg.analyze.json index 37dd6381d0..059e069ce5 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.Application", - "hash": "90ab6555763837d82c6afbfb2ffff2b4", + "hash": "856b1289bcadda8c3e707216f30eb28d", "contents": [ { "namespace": "Volo.Abp.SettingManagement", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.analyze.json index f8fae91f28..cd87f53194 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.Domain.Shared", - "hash": "53d686ce13a1571ce5f87cbc6b6ac477", + "hash": "02864f881f165fef01949fce1324f4ea", "contents": [ { "namespace": "Volo.Abp.SettingManagement", @@ -20,12 +20,12 @@ { "valueType": "ToggleStringValueType", "defaultValue": "false", - "displayName": "Allow tenants to change email settings.", - "description": "AllowChangingEmailSettingsDescription", + "displayName": "Allow changing email settings.", + "description": null, "isAvailableToHost": false, "isVisibleToClients": true, "contentType": "feature", "name": "SettingManagement.AllowChangingEmailSettings" } ] -} +} \ No newline at end of file diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg.analyze.json index 476a33fd6d..26a1d8a77c 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.Domain", - "hash": "ab6abd0e7049113520283a287695c165", + "hash": "37b9125f574cfb3109d423800162a2c1", "contents": [ { "namespace": "Volo.Abp.SettingManagement", @@ -19,7 +19,7 @@ { "namespace": "Volo.Abp.SettingManagement", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.SettingManagement", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg.analyze.json index 75ede070e6..e119700c43 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.EntityFrameworkCore", - "hash": "5e5a522b88d7e38c08d7b2d24177c044", + "hash": "281c5814d423133456b6d0dc1b0b15f6", "contents": [ { "namespace": "Volo.Abp.SettingManagement.EntityFrameworkCore", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg.analyze.json index 8e2dd17e17..685d83a4e2 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.HttpApi.Client", - "hash": "ca14518fa6993b7549f98795d0814d4d", + "hash": "f10d64544023c35d3226a2306af07da9", "contents": [ { "namespace": "Volo.Abp.SettingManagement", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg.analyze.json index d20310027c..83d896dbf5 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.HttpApi", - "hash": "044618bbf045094718f03b1e0c259d2b", + "hash": "59743dcbb13f1d2f74de5cd7b8c7a201", "contents": [ { "namespace": "Volo.Abp.SettingManagement", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj index dd3daf7500..80d67a675e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/AbpSettingManagementInstallerModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/AbpSettingManagementInstallerModule.cs index 70ac2de81f..0b96079e3d 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/AbpSettingManagementInstallerModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/AbpSettingManagementInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.SettingManagement; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpSettingManagementInstallerModule : AbpModule diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/SettingManagementInstallerPipelineBuilder.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/SettingManagementInstallerPipelineBuilder.cs deleted file mode 100644 index d4b68fc61f..0000000000 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/SettingManagementInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.SettingManagement; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class SettingManagementInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.SettingManagement.EntityFrameworkCore", - "ConfigureSettingManagement" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg.analyze.json index dae06ad7b7..f39b527779 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.MongoDB", - "hash": "3a6a752156846daef4c4439fd353a66d", + "hash": "3076173a94ee80efbd13cc883cc6a156", "contents": [ { "namespace": "Volo.Abp.SettingManagement.MongoDB", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml index 0ff8e7d0ac..7fa674f4be 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml @@ -29,7 +29,7 @@ var group = Model.SettingPageCreationContext.Groups[i]; var active = i == 0 ? "active" : string.Empty;
  • - @group.DisplayName + @group.DisplayName
    • } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg.analyze.json index d762d873e6..ed7adadfb8 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.Web", - "hash": "d15735d7c144ce17f981b8ec57f4c12c", + "hash": "b9a83b6936769cdbfb1b0fed8653d0d2", "contents": [ { "namespace": "Volo.Abp.SettingManagement.Web", diff --git a/modules/tenant-management/Volo.Abp.TenantManagement.abpmdl.json b/modules/tenant-management/Volo.Abp.TenantManagement.abpmdl.json index 59d9142d58..f9094439d8 100644 --- a/modules/tenant-management/Volo.Abp.TenantManagement.abpmdl.json +++ b/modules/tenant-management/Volo.Abp.TenantManagement.abpmdl.json @@ -73,10 +73,6 @@ "Volo.Abp.TenantManagement.Blazor.Server": { "path": "src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.abppkg.json", "folder": "src" - }, - "Volo.Abp.TenantManagement.Installer": { - "path": "src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg.analyze.json index aafa40ff93..dbd0c8310e 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.Application", - "hash": "f22443bf5a086ca029a9ed79168d496b", + "hash": "e3fb4eb7a1c4736363c87e8d2a4ae3ad", "contents": [ { "namespace": "Volo.Abp.TenantManagement", @@ -12,12 +12,12 @@ "summary": null, "implementingInterfaces": [ "Volo.Abp.TenantManagement.ITenantAppService", - "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.TenantManagement.GetTenantsInput, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.TenantManagement.GetTenantsInput, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.TenantManagement.GetTenantsInput, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.TenantManagement.GetTenantsInput, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.TenantManagement.GetTenantsInput, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.TenantManagement.GetTenantsInput, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", "Volo.Abp.Application.Services.IDeleteAppService`1[[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]" ], "contentType": "applicationService", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg.analyze.json index 00d40e3ca1..90d191d05b 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.Domain.Shared", - "hash": "e1a3dc97dda872a01da2654848372f27", + "hash": "321266e827d59b7f3da4d631cc7f1b35", "contents": [ { "namespace": "Volo.Abp.TenantManagement", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg.analyze.json index edfcf848b4..015339fb54 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.Domain", - "hash": "d955af240e89637de32065b2e7512ba6", + "hash": "544cd2646fa5aefb1b053044cb6f05ac", "contents": [ { "namespace": "Volo.Abp.TenantManagement", @@ -27,7 +27,7 @@ { "namespace": "Volo.Abp.TenantManagement", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.TenantManagement", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg.analyze.json index bdc0849d32..9dcd2ceb40 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.EntityFrameworkCore", - "hash": "fc2ab48e90129aee164949aa4a911c12", + "hash": "cc176b58ce26ec8ca281d7db5f8b55df", "contents": [ { "namespace": "Volo.Abp.TenantManagement.EntityFrameworkCore", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg.analyze.json index c46bb08a84..d0b1726536 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.HttpApi.Client", - "hash": "623748194a73757a698843974e2631dd", + "hash": "2fb37e3d0c9d07bcced213c49fd19560", "contents": [ { "namespace": "Volo.Abp.TenantManagement", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg.analyze.json index c09e5df449..3ad61aca51 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.HttpApi", - "hash": "0c2fe9349a905f12458f6fea6d44a5fc", + "hash": "c34255a325178f08298699fad7f58a4a", "contents": [ { "namespace": "Volo.Abp.TenantManagement", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj index 13fa3e195f..639761f65b 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/AbpTenantManagementInstallerModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/AbpTenantManagementInstallerModule.cs index 9da8db98a5..2ac855ddc3 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/AbpTenantManagementInstallerModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/AbpTenantManagementInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.TenantManagement; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpTenantManagementInstallerModule : AbpModule diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/TenantManagementInstallerPipelineBuilder.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/TenantManagementInstallerPipelineBuilder.cs deleted file mode 100644 index f5ce7d6a91..0000000000 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/TenantManagementInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.TenantManagement; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class AuditLoggingInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.TenantManagement.EntityFrameworkCore", - "ConfigureTenantManagement" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg.analyze.json index 64353bbb7f..0a6d272621 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.MongoDB", - "hash": "d6e949817650dd34e2adbf7504c0817a", + "hash": "3f9b80d90eb20c165b93c0d785a4430f", "contents": [ { "namespace": "Volo.Abp.TenantManagement.MongoDB", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg.analyze.json index 1ba20f8a2f..ec7ac9a62a 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.Web", - "hash": "20bd21bec310cf2c54ecddc579017ce8", + "hash": "18a4ed544c2a6b718b3aa7c14c83bc43", "contents": [ { "namespace": "Volo.Abp.TenantManagement.Web", diff --git a/modules/users/Volo.Abp.Users.abpmdl.json b/modules/users/Volo.Abp.Users.abpmdl.json index b268bc96b5..f2b03eef4f 100644 --- a/modules/users/Volo.Abp.Users.abpmdl.json +++ b/modules/users/Volo.Abp.Users.abpmdl.json @@ -24,10 +24,6 @@ "Volo.Abp.Users.MongoDB": { "path": "src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.json", "folder": "src" - }, - "Volo.Abp.Users.Installer": { - "path": "src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/users/src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg.analyze.json b/modules/users/src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg.analyze.json index 30990c83bf..a2bca85a49 100644 --- a/modules/users/src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg.analyze.json +++ b/modules/users/src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Users.Domain.Shared", - "hash": "598479cfdcd34503a37627c3757211ce", + "hash": "68c5010aeda2e991d673468d958ef31b", "contents": [ { "namespace": "Volo.Abp.Users", diff --git a/modules/users/src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg.analyze.json b/modules/users/src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg.analyze.json index 2cfb2d0c1e..1c71e9536a 100644 --- a/modules/users/src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg.analyze.json +++ b/modules/users/src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Users.Domain", - "hash": "97a2a74c722bc59336bb9c6f75049e99", + "hash": "0feb223ab7c2b06a1a66bbc81a3153c0", "contents": [ { "namespace": "Volo.Abp.Users", diff --git a/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg.analyze.json b/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg.analyze.json index 1e0ccb67b5..a8207b3b16 100644 --- a/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Users.EntityFrameworkCore", - "hash": "edd7cc214a1b8f121f773be7b88957ff", + "hash": "70a6a4e034d1b9632e7be15cb72e627b", "contents": [ { "namespace": "Volo.Abp.Users.EntityFrameworkCore", diff --git a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.abppkg.json b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj index e39f1e5b6e..fbce82ad48 100644 --- a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj +++ b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/AbpUsersInstallerModule.cs b/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/AbpUsersInstallerModule.cs index 28e3a70bf2..6715e7a930 100644 --- a/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/AbpUsersInstallerModule.cs +++ b/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/AbpUsersInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.Users; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpUsersInstallerModule : AbpModule diff --git a/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/UsersInstallerPipelineBuilder.cs b/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/UsersInstallerPipelineBuilder.cs deleted file mode 100644 index 27ea46c7bc..0000000000 --- a/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/UsersInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.Users; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class UsersInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.Users.EntityFrameworkCore", - "ConfigureAbpUser" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/users/src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.analyze.json b/modules/users/src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.analyze.json index e7ed443321..3b269e2be6 100644 --- a/modules/users/src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.analyze.json +++ b/modules/users/src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Users.MongoDB", - "hash": "827e73e5cc91bc0e666d7fc131009cb9", + "hash": "6a1684883b9a06ea9ebb22412c76f108", "contents": [ { "namespace": "Volo.Abp.Users.MongoDB", diff --git a/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl.json b/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl.json index 26c00ec557..dbb8cc5c4e 100644 --- a/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl.json +++ b/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl.json @@ -13,10 +13,6 @@ "Volo.Abp.VirtualFileExplorer.DemoApp": { "path": "app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.abppkg.json", "folder": "app" - }, - "Volo.Abp.VirtualFileExplorer.Installer": { - "path": "src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json index 700507c0ba..05bd510fd4 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.3", - "@abp/virtual-file-explorer": "^6.0.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.4", + "@abp/virtual-file-explorer": "^6.0.0-rc.4" } } diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock index c34f1850f9..abd2abcac3 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.3.tgz#b95266387e562c635de795442f90470f8e9e6318" - integrity sha512-vVkEpotDST455E3rynvRQpBKPcNNJ2m1wLkz/B9dQNdUjvm8L4F6s0ls0XFlKUNvQfCVfedkRtGayuvNje/Oxg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.3.tgz#664ca2ee712b7d9e66103c00beb41eb9648a6075" - integrity sha512-KxCsGuoUWKaDo7Oo9aKp51pli2m0DZ2tG8m+zK+m4M9U7g96uC+DOFy3gc7MdPlszvrw32Wwm7I0AughstByNA== - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.3" - "@abp/bootstrap" "~6.0.0-rc.3" - "@abp/bootstrap-datepicker" "~6.0.0-rc.3" - "@abp/datatables.net-bs5" "~6.0.0-rc.3" - "@abp/font-awesome" "~6.0.0-rc.3" - "@abp/jquery-form" "~6.0.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.3" - "@abp/lodash" "~6.0.0-rc.3" - "@abp/luxon" "~6.0.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.3" - "@abp/select2" "~6.0.0-rc.3" - "@abp/sweetalert2" "~6.0.0-rc.3" - "@abp/timeago" "~6.0.0-rc.3" - "@abp/toastr" "~6.0.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.3.tgz#47c23b57ed3908bd78a232230e53d1f3cba2de41" - integrity sha512-7eJZy2JUGQP94Tz3JJWXRHRmDfTcPZ/lS1/VNbU8B4qvgl5ChIXklVEJLR1fwrBhKXZV8fGVmqT1XlGTGFvFJA== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.4.tgz#f57efa6f3cabb48e40a44e79adb31de58145bf89" + integrity sha512-JcoXch+j+T9V3Lfu9Of9Tbcw5sNBpSbe42SjzUcXLqdVijV/DBWKMg/9OPH8KZ4PZwl4sl9DSAmGWXHdipLxzA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.4.tgz#a0fd1e9f6f05d854d6f2119ed551a1cef485c929" + integrity sha512-QsrV+N6YFuMo/q73Bd1P0qDyG0Ua5JmQFgKzA94eMXDyYgpRrT5RyKh0CNV81Q/AX9V5c6APrtcQ31tYzmWwbQ== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.4" + "@abp/bootstrap" "~6.0.0-rc.4" + "@abp/bootstrap-datepicker" "~6.0.0-rc.4" + "@abp/datatables.net-bs5" "~6.0.0-rc.4" + "@abp/font-awesome" "~6.0.0-rc.4" + "@abp/jquery-form" "~6.0.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.4" + "@abp/lodash" "~6.0.0-rc.4" + "@abp/luxon" "~6.0.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.4" + "@abp/select2" "~6.0.0-rc.4" + "@abp/sweetalert2" "~6.0.0-rc.4" + "@abp/timeago" "~6.0.0-rc.4" + "@abp/toastr" "~6.0.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.4.tgz#de70d53a900db2f5c74719b7c4e406e0de4c2662" + integrity sha512-8GUoTG4B3Tz2Xd/cFaw9EAjOUoEfMG95VkjNqdfcvPPrtFML/W3fcMUwbjOvQ/lEnAMTSGREU3w9y7Y+GIv9qA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,171 +41,171 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.3.tgz#89198b863dbfccf5f07ac3c4b20ce6199adcb17a" - integrity sha512-NLoUjcR66mqwSWuVftu2yFH4/j6QP+FiElRfZQ9OYmO8DQx2Ue5UZzjrFTrZ1DBBCfzhr2Bffj80dirGvGDyvg== +"@abp/bootstrap-datepicker@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.4.tgz#2dbc9f8f9816689b6db84948046a964ceb1bab17" + integrity sha512-tWPA3ehtU+QPKbxdLDzKk4p2wMNGo/R4CjCQydD1i9BIpkBUlA5sBtbNrLTvZ5/KM1RYecFGFrHTVVOzGsUKrA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.3.tgz#4574bf574cc3484869e8ff8bc592f6212d20a969" - integrity sha512-Q5v7WRkGhGcjRg267HXtqs1oU7ts9UXPyCXmg5y2y5qMOyioD+m4MKV4iv67DgoQjabudp8X2egTKxkej6Lzkw== +"@abp/bootstrap@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.4.tgz#f360f86b00f474236ad182cd792df24f9ecbfc47" + integrity sha512-JjHJNPkTJRYwQvRnzTvcYIbxs2TD6n+LVtCd5ItYNbg8bMyd9yMugThxtgZGE3awVQqjLxZ4fwv+CRnf70JdrQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" bootstrap "^5.1.3" -"@abp/clipboard@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.3.tgz#ee3a586b491d89442eefff08aaebbf9d38cb46d4" - integrity sha512-01svpp3mR29z1FTM+2Qe+MUNLPbl95bWlOXY5zz2hvNSbdD45lGud+BiOHfeZwlDk5jjr3FqLel+hxx2ByBvOA== +"@abp/clipboard@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.4.tgz#a1f08eb23ebe7fcac0521aa992c6cebb9753c004" + integrity sha512-dX8l7Akyv5ecx7+Op8Cp/q4JslnhA9G0Eok4iPcnYwHh9NfSLnusack9x4u370Y+eShRxFiiBDq44ZsCN66h/Q== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" clipboard "^2.0.8" -"@abp/core@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.3.tgz#5662ce813d449d97d9fb7ea2552b2774c8df7825" - integrity sha512-X/VRdk5SGNYc5gQzPcBEPAvwcuD9WXsI4YIdrqjnes0s8u2/XmfrTixojh8Y5EYUoOblEE3Soj5hBhY1cVwcbQ== +"@abp/core@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.4.tgz#d164e1ca3546dc710c569ea7ae0145e1b713658e" + integrity sha512-mH3+BCU8Wbe0mieDHd5Awvhd09X7iJKRLBQBIINcDeIIOCJ9x4v8grynvndzlaS7J2AlWZba0XJU6sZ+YpuP2w== dependencies: - "@abp/utils" "~6.0.0-rc.3" + "@abp/utils" "~6.0.0-rc.4" -"@abp/datatables.net-bs5@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.3.tgz#22865c7e621de720b71af6265b3193f6c78695bd" - integrity sha512-T+mhLc6uSzWmxDQogVwnJ6VxI4845gmF68/i9TmVKNlCtpa3EEfyuF/hgWT1hYfCb4XOsvd/CWrunbkC3fsmtg== +"@abp/datatables.net-bs5@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.4.tgz#fc3c43fb9ba8154b4b960ed0799948f5df738f7e" + integrity sha512-QtII4mFFFjvToM2LDqZugVh6/HwKbIdKYqHCxJKprZ1aVmyBeiMHi89z0G4eChAYdTpjHQstoDddYje53DkWOw== dependencies: - "@abp/datatables.net" "~6.0.0-rc.3" + "@abp/datatables.net" "~6.0.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.3.tgz#d036defe6ad7fc989dffa020ae579362ee3150d1" - integrity sha512-4cUU8/Tn0Vz9bx7jjMOD/0Viyr29fcwoQAAkxaaYZp6qiQbENgz46/xpQf2oBCoudk8CLdzpmNa7jWte7PcJJw== +"@abp/datatables.net@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.4.tgz#f6916ba9a8089b573faddcc38e6a76e38a0dce16" + integrity sha512-9zhIvAO4AX6YIUELodEUz2hsDj+RITGoxWaav90jUJEqK/jVsDfs2mbrWcLzQDMLpZVElZA0p8tUyWS8yMsjaA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.3.tgz#803569d1a7e25f8a1c2be018312449c23fb78217" - integrity sha512-lYdh38UCTSkzzw0B/mpPEo7iFXzSKHCNbBOIHe6dd6O/Qli7wYukTtUOFn5Sh+yoydLY1as92HtiGL1ckSdu1g== +"@abp/font-awesome@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.4.tgz#a3e1664cbebdbc1aa4d2dd1ac48f022b3ce100ad" + integrity sha512-tlBekvBQ/wEkx1Z2sX8cPp/JKzxmTsMSUSbnAc/Uz+De/fxhyepUACb35zFSv2VmLPz1M1xqLvLUCJmciZhINQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.3.tgz#4ec503c07e2194148c3a7e7cf7ddef2871679e6a" - integrity sha512-Q3uEpflntqrSkYakcdsBnnYYfxJWXD/CDjMiwjbb6gIc8s4qkbIYxVxvYvlEezoIDYQkMSXOn7BS4clWsesiJg== +"@abp/jquery-form@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.4.tgz#4dfbef35e4d7dc80534e0f33644142a9ccd54cb4" + integrity sha512-/21ibf99c8q7ygbj2QF7GAGCW1MaalAurueffndTGZPRRSKrCVTPINtBih7NGgh1zcavhog+GBA3INJ3etQIWQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.3.tgz#01da2a59663d373ff1c69022f4c9c66ad0b29403" - integrity sha512-ij1ML2D9rYF3pJthWO6mGQajsJhbDCtOoBvnh9yCZccuwOYkXP22PqfUxjjxtqL4HqFI31KRpFg0ANMGSzEEBg== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.4.tgz#6a498b76076683bbc77d7a73fcf893863aecb59f" + integrity sha512-+9RAPaFYsuSZ05RtJJNeHl1PkyHm9Mv3WKAw+QrKHzaK34zpjD/cZdiijcAWM3DrNPiCCuaaUgMMIMn223MIEA== dependencies: - "@abp/jquery-validation" "~6.0.0-rc.3" + "@abp/jquery-validation" "~6.0.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.3.tgz#724aea9572dcb2faccf8c6355332b0b2a4df9260" - integrity sha512-rTK5oHaMtycvWxunNwzbE/MbsXXIr6qDnOY3rVUmjTHjqUOHYz591t/XeQfjnSXPp4k/SZUjG6viTC3J2jzC1A== +"@abp/jquery-validation@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.4.tgz#2f79457d2c83795449eb6d3c82942568b0e6f273" + integrity sha512-a3v0QDWm2kqrr5r4Nim8unT7p5xHt8KR/TGmGiS6CNMRXVtd6SLMDg36D1d5AcBemFW5evlySiqAl2D7v+g0/g== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.3.tgz#ba19cc8b802c46490277939e6c674811127d8016" - integrity sha512-MbD38iInyag7/j5k42cvMT4jLZMtXH4lUK0rjvqUDVaxKEks46Ix/90uczQ9XajYONgx0CJKFj2urgM830+CCA== +"@abp/jquery@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.4.tgz#992222c2e233840ce7bf573b8bb15b0c9c15adde" + integrity sha512-JRf9NltPP++RAfPRvWFoYNgs2i/ydyROjtLSnCGdmO4UwAQZ21YuDY7x0Ia7VSj0a6cFg8d7M2PGIeJlcaXIsg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.3.tgz#8a5bab02353e5cab4ca06ab82f6dbe6285faa95a" - integrity sha512-c8yhcapzPsXyeiFjeOC+2a4bn5wFjW5gUoN+p/p+tE+FIcH37yEgyw/tAr6aZPCmR770MqQXct4t7S4Czbbk+A== +"@abp/lodash@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.4.tgz#2c88a9274e6c27334f277404280d43b2fbae6552" + integrity sha512-yOEe3SVvh5IuFMujSgC4waG0JzWzRQj907KUYzjcjfx35J5Q0Mwvu6/9wRYJx1av40YQdnzMrRoqXKDPAKdV6A== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.3.tgz#ba515e122c61918d481467d5be39f08a363822f6" - integrity sha512-2lRSSC0DYShlnKdbJ/Pmha/azjt09ZRPx57NQ01dc7ungChPry5EJL6pC3kXWnJrCkrPCF0V5+A3+taut9+l3A== +"@abp/luxon@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.4.tgz#95ae8f70d9b5d8cd753cc7d918c611692d5bf218" + integrity sha512-OFs4Uv82YienRwiiVV78hdWSanS19lvjoBBskPF5s6LK/5mzLMrtbHBRf18wcc/AfBMOxot1BX2q1v4wb2u3qw== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.3.tgz#0798e37ec6a852748118692a5fbd30c99d9745db" - integrity sha512-FlyShmRxG3wGk1OJCjHIZAdi2/Y2FJPkVxaE72CVIceQSmg0nebGTv3a7bhd4QzKkDsSA3+t6gHjnuKlTlDFLA== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.4.tgz#f40968c7f64eb6b36ff2bf06b4be8661308abd12" + integrity sha512-lcOskhl+NbPqKBxg+GABYBBrMtHYw2qZ/srFix7DgGUdNlFbXRP/AtTz0Wiav0PNGZgivniRLqvqcLCiCkrBrg== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.3.tgz#e4faf595e29db81c5a66030e59b0e09f09759bfd" - integrity sha512-zzd3iw/Im0M9FUmTviwkTCr4slkoZJExtK+qB1FmLxRY59+hyU9wxd6hwzic/QwhXxFQoYILJ3S3FNxsPIm76A== +"@abp/prismjs@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.4.tgz#9338018487dde7ddc5384cdfbdc35c655a8fd444" + integrity sha512-F1t7ySbj+M6LDmgbvvcY2bFl0heEj1vz14YOnmwMNUhJcaLQXamgyKsWBu5UkEHUJ11DQyjIu5gjoRXbraucdA== dependencies: - "@abp/clipboard" "~6.0.0-rc.3" - "@abp/core" "~6.0.0-rc.3" + "@abp/clipboard" "~6.0.0-rc.4" + "@abp/core" "~6.0.0-rc.4" prismjs "^1.26.0" -"@abp/select2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.3.tgz#deb8332bfce2102a562004893321a48d5194bf53" - integrity sha512-rb0qElmmhiP09xX8ZbjzNLF6ygFBwErysGWt6Bbgzz5waX2sGe575Cgoz53FaMQ4JaRBg1N0/nCejKyDtiINRA== +"@abp/select2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.4.tgz#c7cf0f910fa6a9f97845a0659178ac02cfa022bc" + integrity sha512-NcXMZYiLDSVnjtRgvPwm9RB1M7qZnRyyyM+htdH5laEvDDGCcOLFS8iK6WI4Irmvw6MhBkDTHaH9ssJNbF7pvQ== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.3.tgz#e61fc6c1bed1316c1d44ca5c92f590e422db24d4" - integrity sha512-+SNpBb4XrQlWzRQK9lfdJqA9IfJrlgoqmHwPDgf3Q+P922MzO33TgDlZWbeE7MzVj2y2WmNsPuCKwhjSjSL2rw== +"@abp/sweetalert2@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.4.tgz#a1a2a1a5d7e1fb83680cc35ca477cee1f2f2463b" + integrity sha512-dvslRK2oc06JjI6aV1dj1LzWbOb50BfwbHxcmOenl8Q4XMP389bFbaOiVezjk+d3YLsspCMDxxu2NTqaq67Z6g== dependencies: - "@abp/core" "~6.0.0-rc.3" + "@abp/core" "~6.0.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.3.tgz#0ef8c4801bfd4623e6895b1d047b1437063bda53" - integrity sha512-P3YRDVKjR5/Fz+cXiPg3IiUr7XGbNh7mgmJ1ywRXmKVmVMJmhQ2RsKmmtkGJn4TfVHu/l5iJXe4rqgL21/yX/g== +"@abp/timeago@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.4.tgz#3a93a65ee6b8260f7e80bb862b60623e967e08a2" + integrity sha512-/ZZy5E3PHtvmkjg+s9BvgO344DOs0jiifimDntp5jZPQPrsQ5WPC9o9hrlGb40tTw5P0wAnznjGvHnZjBiflvA== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.3.tgz#6010d4247937531ebf7c8659d6254cd3db6c4855" - integrity sha512-sC9eCzYVgDrLSFIhJGe9hshzfwA1BkZNah4NQhyq+V6HQ8YF7goMS79N+/XmSoLQ9zzRhusqnPFnb+4FHjr7iA== +"@abp/toastr@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.4.tgz#3bf6abc79baf7a2b7de9840e55caf839018ab96e" + integrity sha512-zesojzXYsFd57m7XBgxLwKeAs8HRe25iNKRGC0YR7MK2HP1770jc+dEjnQ0pnqhMHouZejFJZcpqdHGr85ZUgQ== dependencies: - "@abp/jquery" "~6.0.0-rc.3" + "@abp/jquery" "~6.0.0-rc.4" toastr "^2.1.4" -"@abp/utils@~6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.3.tgz#6d3515694314175218606e9518618ce335b4b360" - integrity sha512-K2geJ9P1ztk4Ehzb9YG3CqqLOi+z8/4iBLUzooNZLQqS+KdlUhCmqfuCoI/A5Aq9DGbTYesalp+Fwoh3S2Dl8A== +"@abp/utils@~6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.4.tgz#e18ef1557a2600fa153db13162e1ed097bc6f15a" + integrity sha512-eT6RVfFsyB8uAdMHDdG4M2Erg3RrvkG7Z5Xa0ko7JIhEz5VwsRcXGwTAORYHsu0M1hpewZljdD5OmQRods13LA== dependencies: just-compare "^1.3.0" -"@abp/virtual-file-explorer@^6.0.0-rc.3": - version "6.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-6.0.0-rc.3.tgz#92de34df581cf85d23282484b1686306cbb880b6" - integrity sha512-PrZw+CH7Uwc/SPkhDdU3P9ixhUAX35k1ucXy6/AaMdms9cppKYw5C7O3nkj3UIN+PliLy+etc2nox1Y2WafSzQ== +"@abp/virtual-file-explorer@^6.0.0-rc.4": + version "6.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-6.0.0-rc.4.tgz#310fcaf7db76a0c059aba7d1abec9cffec7838ad" + integrity sha512-coUsXI43oqJRQ+yWCZbaxcWnf2H3y08cYBc9uzQLGuhF74SHQXxIx1HtAdMGsNx/6U0RCKMI54ziBx5gvuxS2A== dependencies: - "@abp/clipboard" "~6.0.0-rc.3" - "@abp/prismjs" "~6.0.0-rc.3" + "@abp/clipboard" "~6.0.0-rc.4" + "@abp/prismjs" "~6.0.0-rc.4" "@fortawesome/fontawesome-free@^5.15.4": version "5.15.4" diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.abppkg.json b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj index 6a82e34326..330816a049 100644 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj +++ b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/AbpVirtualFileExplorerInstallerModule.cs b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/AbpVirtualFileExplorerInstallerModule.cs index 74ffdeb7f4..e8de080477 100644 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/AbpVirtualFileExplorerInstallerModule.cs +++ b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/AbpVirtualFileExplorerInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.VirtualFileExplorer; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpVirtualFileExplorerInstallerModule : AbpModule diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/VirtualFileExplorerInstallerPipelineBuilder.cs b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/VirtualFileExplorerInstallerPipelineBuilder.cs deleted file mode 100644 index 6d403dd6ab..0000000000 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/VirtualFileExplorerInstallerPipelineBuilder.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.VirtualFileExplorer; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class VirtualFileExplorerInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - return GetBasePipeline(context); - } -} diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.abppkg.analyze.json b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.abppkg.analyze.json new file mode 100644 index 0000000000..a6340b74ff --- /dev/null +++ b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.abppkg.analyze.json @@ -0,0 +1,11 @@ +{ + "name": "Volo.Abp.VirtualFileExplorer.Web", + "hash": "f553dc666ba87cc5e2fdc5c22546b095", + "contents": [ + { + "namespace": "Volo.Abp.VirtualFileExplorer.Web", + "contentType": "abpModule", + "name": "AbpVirtualFileExplorerWebModule" + } + ] +} \ No newline at end of file diff --git a/npm/lerna.json b/npm/lerna.json index 5ec9d9121f..fb8286a304 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "packages": [ "packs/*" ], diff --git a/npm/ng-packs/lerna.version.json b/npm/ng-packs/lerna.version.json index fdf16d3f37..3eeba165f6 100644 --- a/npm/ng-packs/lerna.version.json +++ b/npm/ng-packs/lerna.version.json @@ -1,5 +1,5 @@ { - "version": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "packages": [ "packages/*" ], diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 8b0fe3f95b..952dd33a85 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -40,18 +40,7 @@ }, "private": true, "devDependencies": { - "@abp/ng.account": "~6.0.0-rc.3", - "@abp/ng.account.core": "~6.0.0-rc.3", - "@abp/ng.core": "~6.0.0-rc.3", - "@abp/ng.feature-management": "~6.0.0-rc.3", - "@abp/ng.identity": "~6.0.0-rc.3", - "@abp/ng.permission-management": "~6.0.0-rc.3", - "@abp/ng.schematics": "~6.0.0-rc.3", - "@abp/ng.setting-management": "~6.0.0-rc.3", - "@abp/ng.tenant-management": "~6.0.0-rc.3", - "@abp/ng.theme.basic": "~6.0.0-rc.3", - "@abp/ng.theme.shared": "~6.0.0-rc.3", - "@abp/utils": "~6.0.0-rc.3", + "@abp/utils": "~6.0.0-rc.4", "@angular-devkit/build-angular": "14.2.2", "@angular-devkit/build-ng-packagr": "^0.1002.0", "@angular-devkit/schematics-cli": "~12.2.0", @@ -70,6 +59,17 @@ "@angular/platform-browser": "14.2.1", "@angular/platform-browser-dynamic": "14.2.1", "@angular/router": "14.2.1", + "@abp/ng.account": "~6.0.0-rc.4", + "@abp/ng.account.core": "~6.0.0-rc.4", + "@abp/ng.core": "~6.0.0-rc.4", + "@abp/ng.feature-management": "~6.0.0-rc.4", + "@abp/ng.identity": "~6.0.0-rc.4", + "@abp/ng.permission-management": "~6.0.0-rc.4", + "@abp/ng.schematics": "~6.0.0-rc.4", + "@abp/ng.setting-management": "~6.0.0-rc.4", + "@abp/ng.tenant-management": "~6.0.0-rc.4", + "@abp/ng.theme.basic": "~6.0.0-rc.4", + "@abp/ng.theme.shared": "~6.0.0-rc.4", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "~13.0.0", "@ngneat/spectator": "^10.0.0", diff --git a/npm/ng-packs/packages/account-core/package.json b/npm/ng-packs/packages/account-core/package.json index 8ea2bb186b..7514ab82ac 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": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": "~6.0.0-rc.3", - "@abp/ng.theme.shared": "~6.0.0-rc.3", + "@abp/ng.core": "~6.0.0-rc.4", + "@abp/ng.theme.shared": "~6.0.0-rc.4", "@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 7f6c87ac3f..8e6847d0ba 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": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~6.0.0-rc.3", - "@abp/ng.theme.shared": "~6.0.0-rc.3", + "@abp/ng.account.core": "~6.0.0-rc.4", + "@abp/ng.theme.shared": "~6.0.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index a9e1f03d0b..399e79dbaa 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.components", - "version": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": ">=6.0.0-rc.3", - "@abp/ng.theme.shared": ">=6.0.0-rc.3", + "@abp/ng.core": ">=6.0.0-rc.4", + "@abp/ng.theme.shared": ">=6.0.0-rc.4", "@ng-bootstrap/ng-bootstrap": ">=10.0.0" }, "dependencies": { diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index d0e36c50c6..be99579004 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": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "~6.0.0-rc.3", + "@abp/utils": "~6.0.0-rc.4", "angular-oauth2-oidc": "^13.0.1", "just-clone": "^3.2.1", "just-compare": "^1.4.0", diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index a115426e23..f764e6673d 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": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~6.0.0-rc.3", + "@abp/ng.theme.shared": "~6.0.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index f8baa00c38..5ff55b39bc 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.identity", - "version": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.permission-management": "~6.0.0-rc.3", - "@abp/ng.theme.shared": "~6.0.0-rc.3", + "@abp/ng.permission-management": "~6.0.0-rc.4", + "@abp/ng.theme.shared": "~6.0.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts index 28c73b4320..232785249d 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts +++ b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts @@ -1,9 +1,7 @@ import { IdentityUserDto } from '@abp/ng.identity/proxy'; import { getPasswordValidators } from '@abp/ng.theme.shared'; import { ePropType, FormProp } from '@abp/ng.theme.shared/extensions'; -import { Validators } from '@angular/forms' -import { AbpValidators } from '@abp/ng.core'; - +import { Validators } from '@angular/forms'; export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany([ { @@ -11,7 +9,7 @@ export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany [Validators.required, Validators.maxLength(256), AbpValidators.username()], + validators: () => [Validators.required, Validators.maxLength(256)], }, { type: ePropType.Password, diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index 40cd9d9444..234917d9c0 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": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~6.0.0-rc.3", + "@abp/ng.theme.shared": "~6.0.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts index 496b3bb989..34c12bc99c 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts @@ -160,8 +160,14 @@ export class PermissionManagementComponent } return per; + }).map((per,index,permissions) => { + const childrens = permissions + .filter(p => p.parentName === per.name); + if(childrens.length > 0 && childrens.every(x => !x.isGranted)){ + return { ...per, isGranted: false }; + } + return per }); - this.setTabCheckboxState(); this.setGrantCheckboxState(); }, 0); diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index 0ea70ed553..ea735d1208 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": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "description": "Schematics that works with ABP Backend", "keywords": [ "schematics" @@ -9,12 +9,12 @@ "license": "MIT", "schematics": "./collection.json", "dependencies": { - "@angular-devkit/core": "~11.0.2", - "@angular-devkit/schematics": "~11.0.2", + "@angular-devkit/core": "~13.3.9", + "@angular-devkit/schematics": "~13.3.9", "got": "^11.5.2", "jsonc-parser": "^2.3.0", "should-quote": "^1.0.0", - "typescript": "~3.9.2" + "typescript": "~4.6.4" }, "devDependencies": { "@schematics/angular": "~11.0.2", diff --git a/npm/ng-packs/packages/schematics/src/collection.json b/npm/ng-packs/packages/schematics/src/collection.json index 0b1b738e08..8441a786b0 100644 --- a/npm/ng-packs/packages/schematics/src/collection.json +++ b/npm/ng-packs/packages/schematics/src/collection.json @@ -24,6 +24,11 @@ "description": "ABP API Generator Schematics", "factory": "./commands/api", "schema": "./commands/api/schema.json" + }, + "create-lib": { + "description": "ABP Create Library Schematics", + "factory": "./commands/create-lib", + "schema": "./commands/create-lib/schema.json" } } } diff --git a/npm/ng-packs/packages/schematics/src/commands/api/index.ts b/npm/ng-packs/packages/schematics/src/commands/api/index.ts index 2f2f52a50c..bc97d8031b 100644 --- a/npm/ng-packs/packages/schematics/src/commands/api/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/api/index.ts @@ -13,7 +13,7 @@ import { Exception } from '../../enums'; import { GenerateProxySchema, ServiceGeneratorParams } from '../../models'; import { applyWithOverwrite, - buildDefaultPath, + buildTargetPath, createControllerToServiceMapper, createImportRefsToModelReducer, createImportRefToEnumMapper, @@ -42,7 +42,7 @@ export default function (schema: GenerateProxySchema) { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion const target = await resolveProject(tree, params.target!); - const targetPath = buildDefaultPath(target.definition); + const targetPath = buildTargetPath(target.definition, params.entryPoint); const readProxyConfig = createProxyConfigReader(targetPath); const createProxyConfigWriter = createProxyConfigWriterCreator(targetPath); const data = readProxyConfig(tree); diff --git a/npm/ng-packs/packages/schematics/src/commands/api/schema.json b/npm/ng-packs/packages/schematics/src/commands/api/schema.json index 11ca6845ae..ddaf06f001 100644 --- a/npm/ng-packs/packages/schematics/src/commands/api/schema.json +++ b/npm/ng-packs/packages/schematics/src/commands/api/schema.json @@ -39,6 +39,15 @@ "index": 3 }, "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")" + }, + "entryPoint": { + "description": "Target Angular project to place the generated code", + "type": "string", + "$default": { + "$source": "argv", + "index": 5 + }, + "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")" } }, "required": [] diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/.eslintrc.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/.eslintrc.json.template new file mode 100644 index 0000000000..de84cad019 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/.eslintrc.json.template @@ -0,0 +1,44 @@ +{ + "extends": "../../.eslintrc.json", + "ignorePatterns": [ + "!**/*" + ], + "overrides": [ + { + "files": [ + "*.ts" + ], + "parserOptions": { + "project": [ + "projects/<%= kebab(libraryName) %>/tsconfig.lib.json", + "projects/<%= kebab(libraryName) %>/tsconfig.spec.json" + ], + "createDefaultProgram": true + }, + "rules": { + "@angular-eslint/directive-selector": [ + "error", + { + "type": "attribute", + "prefix": "lib", + "style": "camelCase" + } + ], + "@angular-eslint/component-selector": [ + "error", + { + "type": "element", + "prefix": "lib", + "style": "kebab-case" + } + ] + } + }, + { + "files": [ + "*.html" + ], + "rules": {} + } + ] +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/ng-package.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/ng-package.json.template new file mode 100644 index 0000000000..2e7019c90e --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/ng-package.json.template @@ -0,0 +1,7 @@ +{ + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../dist/<%= kebab(libraryName) %>/config", + "lib": { + "entryFile": "src/public-api.ts" + } +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/__libraryName@kebab__-config.module.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/__libraryName@kebab__-config.module.ts.template new file mode 100644 index 0000000000..c39b4582b9 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/__libraryName@kebab__-config.module.ts.template @@ -0,0 +1,12 @@ +import { ModuleWithProviders, NgModule } from '@angular/core'; +import { <%= macro(libraryName) %>_ROUTE_PROVIDERS } from './providers/route.provider'; + +@NgModule() +export class <%= pascal(libraryName) %>ConfigModule { + static forRoot(): ModuleWithProviders<<%= pascal(libraryName) %>ConfigModule> { + return { + ngModule: <%= pascal(libraryName) %>ConfigModule, + providers: [<%= macro(libraryName) %>_ROUTE_PROVIDERS], + }; + } +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/enums/index.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/enums/index.ts.template new file mode 100644 index 0000000000..3bda94b078 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/enums/index.ts.template @@ -0,0 +1 @@ +export * from './route-names'; diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/enums/route-names.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/enums/route-names.ts.template new file mode 100644 index 0000000000..3bbb75be52 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/enums/route-names.ts.template @@ -0,0 +1,3 @@ +export const enum e<%= pascal(libraryName) %>RouteNames { + <%= pascal(libraryName) %> = '<%= pascal(libraryName) %>', +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/providers/index.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/providers/index.ts.template new file mode 100644 index 0000000000..fe08efba8c --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/providers/index.ts.template @@ -0,0 +1 @@ +export * from './route.provider'; diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/providers/route.provider.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/providers/route.provider.ts.template new file mode 100644 index 0000000000..5db50f7eaa --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/providers/route.provider.ts.template @@ -0,0 +1,26 @@ +import { eLayoutType, RoutesService } from '@abp/ng.core'; +import { APP_INITIALIZER } from '@angular/core'; +import { e<%= pascal(libraryName) %>RouteNames } from '../enums/route-names'; + +export const <%= macro(libraryName) %>_ROUTE_PROVIDERS = [ + { + provide: APP_INITIALIZER, + useFactory: configureRoutes, + deps: [RoutesService], + multi: true, + }, +]; + +export function configureRoutes(routesService: RoutesService) { + return () => { + routesService.add([ + { + path: '/<%= kebab(libraryName) %>', + name: e<%= pascal(libraryName) %>RouteNames.<%= pascal(libraryName) %>, + iconClass: 'fas fa-book', + layout: eLayoutType.application, + order: 3, + }, + ]); + }; +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/public-api.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/public-api.ts.template new file mode 100644 index 0000000000..6a8953bca8 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/src/public-api.ts.template @@ -0,0 +1,3 @@ +export * from './enums'; +export * from './<%= kebab(libraryName) %>-config.module'; +export * from './providers'; diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/karma.conf.js.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/karma.conf.js.template new file mode 100644 index 0000000000..a56984ac5b --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/karma.conf.js.template @@ -0,0 +1,44 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/1.0/config/configuration-file.html + +module.exports = function (config) { + config.set({ + basePath: '', + frameworks: ['jasmine', '@angular-devkit/build-angular'], + plugins: [ + require('karma-jasmine'), + require('karma-chrome-launcher'), + require('karma-jasmine-html-reporter'), + require('karma-coverage'), + require('@angular-devkit/build-angular/plugins/karma') + ], + client: { + jasmine: { + // you can add configuration options for Jasmine here + // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html + // for example, you can disable the random execution with `random: false` + // or set a specific seed with `seed: 4321` + }, + clearContext: false // leave Jasmine Spec Runner output visible in browser + }, + jasmineHtmlReporter: { + suppressAll: true // removes the duplicated traces + }, + coverageReporter: { + dir: require('path').join(__dirname, '../../coverage/my-project-name'), + subdir: '.', + reporters: [ + { type: 'html' }, + { type: 'text-summary' } + ] + }, + reporters: ['progress', 'kjhtml'], + port: 9876, + colors: true, + logLevel: config.LOG_INFO, + autoWatch: true, + browsers: ['Chrome'], + singleRun: false, + restartOnFileChange: true + }); +}; diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/ng-package.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/ng-package.json.template new file mode 100644 index 0000000000..fd8e55d798 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/ng-package.json.template @@ -0,0 +1,7 @@ +{ + "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../dist/<%= kebab(libraryName) %>", + "lib": { + "entryFile": "src/public-api.ts" + } +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/package.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/package.json.template new file mode 100644 index 0000000000..c4d36a8576 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/package.json.template @@ -0,0 +1,11 @@ +{ + "name": "@<%= kebab(libraryName) %>/<%= kebab(libraryName) %>", + "version": "0.0.1", + "peerDependencies": { + "@abp/ng.core": "<%= abpVersion %>", + "@abp/ng.theme.shared": "<%= abpVersion %>" + }, + "dependencies": { + "tslib": "^2.1.0" + } +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template new file mode 100644 index 0000000000..4b9517b211 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { DynamicLayoutComponent } from '@abp/ng.core'; +import { Routes, RouterModule } from '@angular/router'; + +const routes: Routes = [ + { + path: '', + pathMatch: 'full', + component: DynamicLayoutComponent, + children: [], + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class <%= pascal(libraryName) %>RoutingModule {} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__.module.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__.module.ts.template new file mode 100644 index 0000000000..3d04aca7fb --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__.module.ts.template @@ -0,0 +1,22 @@ +import { NgModule, NgModuleFactory, ModuleWithProviders } from '@angular/core'; +import { CoreModule, LazyModuleFactory } from '@abp/ng.core'; +import { ThemeSharedModule } from '@abp/ng.theme.shared'; +import { <%= pascal(libraryName) %>RoutingModule } from './<%= kebab(libraryName) %>-routing.module'; + +@NgModule({ + declarations: [], + imports: [CoreModule, ThemeSharedModule, <%= pascal(libraryName) %>RoutingModule], + exports: [], +}) +export class <%= pascal(libraryName) %>Module { + static forChild(): ModuleWithProviders<<%= pascal(libraryName) %>Module> { + return { + ngModule: <%= pascal(libraryName) %>Module, + providers: [], + }; + } + + static forLazy(): NgModuleFactory<<%= pascal(libraryName) %>Module> { + return new LazyModuleFactory(<%= pascal(libraryName) %>Module.forChild()); + } +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/public-api.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/public-api.ts.template new file mode 100644 index 0000000000..c09585ae58 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/public-api.ts.template @@ -0,0 +1,4 @@ +/* + * Public API Surface of my-project-name + */ +export * from './lib/<%= kebab(libraryName) %>.module'; diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/test.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/test.ts.template new file mode 100644 index 0000000000..52e55168eb --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/test.ts.template @@ -0,0 +1,26 @@ +// This file is required by karma.conf.js and loads recursively all the .spec and framework files + +import 'zone.js'; +import 'zone.js/testing'; +import { getTestBed } from '@angular/core/testing'; +import { + BrowserDynamicTestingModule, + platformBrowserDynamicTesting +} from '@angular/platform-browser-dynamic/testing'; + +declare const require: { + context(path: string, deep?: boolean, filter?: RegExp): { + keys(): string[]; + (id: string): T; + }; +}; + +// First, initialize the Angular testing environment. +getTestBed().initTestEnvironment( + BrowserDynamicTestingModule, + platformBrowserDynamicTesting() +); +// Then we find all the tests. +const context = require.context('./', true, /\.spec\.ts$/); +// And load the modules. +context.keys().map(context); diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template new file mode 100644 index 0000000000..1407202dd0 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template @@ -0,0 +1,20 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "../../out-tsc/lib", + "target": "es2015", + "declaration": true, + "declarationMap": true, + "inlineSources": true, + "types": [], + "lib": [ + "dom", + "es2018" + ] + }, + "exclude": [ + "src/test.ts", + "**/*.spec.ts" + ] +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.prod.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.prod.json.template new file mode 100644 index 0000000000..06de549e10 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.prod.json.template @@ -0,0 +1,10 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "./tsconfig.lib.json", + "compilerOptions": { + "declarationMap": false + }, + "angularCompilerOptions": { + "compilationMode": "partial" + } +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.spec.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.spec.json.template new file mode 100644 index 0000000000..715dd0a5d2 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.spec.json.template @@ -0,0 +1,17 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "../../out-tsc/spec", + "types": [ + "jasmine" + ] + }, + "files": [ + "src/test.ts" + ], + "include": [ + "**/*.spec.ts", + "**/*.d.ts" + ] +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/ng-package.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/ng-package.json.template new file mode 100644 index 0000000000..4e2118d142 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/ng-package.json.template @@ -0,0 +1,7 @@ +{ + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../dist/<%= kebab(target) %>/<%= kebab(libraryName) %>", + "lib": { + "entryFile": "src/public-api.ts" + } +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/lib/__target@kebab__-__libraryName@kebab__.module.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/lib/__target@kebab__-__libraryName@kebab__.module.ts.template new file mode 100644 index 0000000000..1165afb970 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/lib/__target@kebab__-__libraryName@kebab__.module.ts.template @@ -0,0 +1,11 @@ +import { ModuleWithProviders, NgModule } from '@angular/core'; + +@NgModule() +export class <%= pascal(target) %><%= pascal(libraryName) %>Module { + static forRoot(): ModuleWithProviders<<%= pascal(target) %><%= pascal(libraryName) %>Module> { + return { + ngModule:<%= pascal(target) %><%= pascal(libraryName) %>Module, + providers: [] + } + } +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/lib/index.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/lib/index.ts.template new file mode 100644 index 0000000000..5631c60e6d --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/lib/index.ts.template @@ -0,0 +1 @@ +export * from './<%= kebab(target) %>-<%= kebab(libraryName) %>.module'; diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/public-api.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/public-api.ts.template new file mode 100644 index 0000000000..11aece60c4 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/public-api.ts.template @@ -0,0 +1 @@ +export * from './lib/index'; diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/index.ts b/npm/ng-packs/packages/schematics/src/commands/create-lib/index.ts new file mode 100644 index 0000000000..1bc4c7a905 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/index.ts @@ -0,0 +1,159 @@ +import { + applyTemplates, + chain, + move, + noop, + Rule, + SchematicContext, + SchematicsException, + Tree, + url, +} from '@angular-devkit/schematics'; +import { GenerateLibSchema } from './models/generate-lib-schema'; +import { + applyWithOverwrite, + getWorkspace, + interpolate, + isLibrary, + JSONFile, + kebab, + resolveProject, + updateWorkspace, +} from '../../utils'; +import * as cases from '../../utils/text'; +import { Exception } from '../../enums'; +import { join, normalize } from '@angular-devkit/core'; +import { + ProjectDefinition, + WorkspaceDefinition, +} from '@angular-devkit/core/src/workspace/definitions'; +import { addLibToWorkspaceFile } from '../../utils/angular-schematic/generate-lib'; + +export default function (schema: GenerateLibSchema) { + return async (tree: Tree) => { + if (schema.override || !(await checkLibExist(schema, tree))) { + return chain([createLibrary(schema)]); + } + }; +} + +async function checkLibExist(options: GenerateLibSchema, tree: Tree) { + const packageName = kebab(options.packageName); + if (options.isSecondaryEntrypoint) { + const lib = await resolveProject(tree, options.target); + const ngPackagePath = `${lib?.definition.root}/${packageName}/ng-package.json`; + const packageInfo = tree.read(ngPackagePath); + if (packageInfo) { + throw new SchematicsException( + interpolate(Exception.LibraryAlreadyExists, `${lib.name}/${packageName}`), + ); + } + return false; + } + + const target = await resolveProject(tree, options.packageName, null); + if (target) { + throw new SchematicsException(interpolate(Exception.LibraryAlreadyExists, packageName)); + } + return false; +} + +function createLibrary(options: GenerateLibSchema): Rule { + return async (tree: Tree, _context: SchematicContext) => { + const target = await resolveProject(tree, options.packageName, null); + if (!target || options.override) { + if (options.isModuleTemplate) { + return createLibFromModuleTemplate(tree, options); + } + if (options.isSecondaryEntrypoint) { + return createLibSecondaryEntry(tree, options); + } + } else { + throw new SchematicsException( + interpolate(Exception.LibraryAlreadyExists, options.packageName), + ); + } + }; +} +async function resolvePackagesDirFromAngularJson(host: Tree) { + const workspace = await getWorkspace(host); + const projectFolder = readFirstLibInAngularJson(workspace); + return projectFolder?.root?.split('/')?.[0] || 'projects'; +} + +function readFirstLibInAngularJson(workspace: WorkspaceDefinition): ProjectDefinition | undefined { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const [_, props] = + Array.from(workspace.projects.entries()).find(([_, value]) => isLibrary(value)) || []; + return props; +} + +async function createLibFromModuleTemplate(tree: Tree, options: GenerateLibSchema) { + const packagesDir = await resolvePackagesDirFromAngularJson(tree); + const packageJson = JSON.parse(tree.read('./package.json')!.toString()); + const abpVersion = packageJson.dependencies['@abp/ng.core']; + + return chain([ + applyWithOverwrite(url('./files-package'), [ + applyTemplates({ + ...cases, + libraryName: options.packageName, + abpVersion, + }), + move(normalize(packagesDir)), + ]), + addLibToWorkspaceIfNotExist(options.packageName, packagesDir), + ]); +} + +export function addLibToWorkspaceIfNotExist(name: string, packagesDir: string): Rule { + return async (tree: Tree, _: SchematicContext) => { + const workspace = await getWorkspace(tree); + const packageName = kebab(name); + const isProjectExist = workspace.projects.has(packageName); + + const projectRoot = join(normalize(packagesDir), packageName); + const pathImportLib = `${packagesDir}/${packageName}`; + + return chain([ + isProjectExist + ? updateWorkspace(w => { + w.projects.delete(packageName); + }) + : noop(), + addLibToWorkspaceFile(projectRoot, packageName), + updateTsConfig(packageName, pathImportLib), + ]); + }; +} + +export function updateTsConfig(packageName: string, path: string) { + return (host: Tree) => { + const files = ['tsconfig.json', 'tsconfig.app.json', 'tsconfig.base.json']; + const tsConfig = files.find(f => host.exists(f)); + if (!tsConfig) { + return host; + } + + const file = new JSONFile(host, tsConfig); + const jsonPath = ['compilerOptions', 'paths', packageName]; + file.modify(jsonPath, [`${path}/src/public-api.ts`]); + }; +} + +export async function createLibSecondaryEntry(tree: Tree, options: GenerateLibSchema) { + const targetLib = await resolveProject(tree, options.target); + const packageName = `${kebab(targetLib.name)}/${kebab(options.packageName)}`; + const importPath = `${targetLib.definition.root}/${kebab(options.packageName)}`; + return chain([ + applyWithOverwrite(url('./files-secondary-entrypoint'), [ + applyTemplates({ + ...cases, + libraryName: options.packageName, + target: targetLib.name, + }), + move(normalize(targetLib.definition.root)), + updateTsConfig(packageName, importPath), + ]), + ]); +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/models/generate-lib-schema.ts b/npm/ng-packs/packages/schematics/src/commands/create-lib/models/generate-lib-schema.ts new file mode 100644 index 0000000000..f3c6e5b97f --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/models/generate-lib-schema.ts @@ -0,0 +1,17 @@ +export interface GenerateLibSchema { + /** + * Angular package name will create + */ + packageName: string; + + /** + * İs the package a library or a library module + */ + isSecondaryEntrypoint: boolean; + + isModuleTemplate: boolean; + + override: boolean; + + target: string; +} diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/models/index.ts b/npm/ng-packs/packages/schematics/src/commands/create-lib/models/index.ts new file mode 100644 index 0000000000..e84ddcba49 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/models/index.ts @@ -0,0 +1 @@ +export * from './generate-lib-schema'; diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/schema.json b/npm/ng-packs/packages/schematics/src/commands/create-lib/schema.json new file mode 100644 index 0000000000..64d64c1d80 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/schema.json @@ -0,0 +1,36 @@ +{ + "$schema": "http://json-schema.org/schema", + "$id": "SchematicsABPModuleTemplateCreator", + "title": "ABP Module Template Generator API Schema", + "type": "object", + "properties": { + "packageName": { + "description": "The name of the package will create", + "type": "string", + "$default": { + "$source": "argv", + "index": 0 + }, + "x-prompt": "Please enter the package name will create" + }, + "isSecondaryEntrypoint": { + "description": "Is secondary entrypoint", + "type": "boolean", + "$default": false, + "x-prompt": "Is secondary entrypoint?" + }, + "isModuleTemplate": { + "description": "Is module template", + "type": "boolean", + "$default": true, + "x-prompt": "Is module template?" + }, + "override": { + "description": "Override existing files", + "type": "boolean", + "$default": false, + "x-prompt": "Override existing files?" + } + }, + "required": [] +} diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-add/index.ts b/npm/ng-packs/packages/schematics/src/commands/proxy-add/index.ts index 4a6b4cf92e..9ea893e1f8 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy-add/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/proxy-add/index.ts @@ -1,7 +1,7 @@ import { chain, SchematicContext, Tree } from '@angular-devkit/schematics'; import { GenerateProxySchema } from '../../models'; import { - buildDefaultPath, + buildTargetPath, createApiDefinitionGetter, createApisGenerator, createProxyClearer, @@ -21,7 +21,7 @@ export default function (schema: GenerateProxySchema) { return chain([ async (host: Tree, _context: SchematicContext) => { const target = await resolveProject(host, params.target!); - const targetPath = buildDefaultPath(target.definition); + const targetPath = buildTargetPath(target.definition, params.entryPoint); const readProxyConfig = createProxyConfigReader(targetPath); let generated: string[] = []; diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-add/schema.json b/npm/ng-packs/packages/schematics/src/commands/proxy-add/schema.json index 2c54f8f9fa..2cf27f9c33 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy-add/schema.json +++ b/npm/ng-packs/packages/schematics/src/commands/proxy-add/schema.json @@ -50,5 +50,14 @@ "x-prompt": "Please enter URL for API definition (default: API Name's url in environment file)" } }, + "entryPoint": { + "description": "Target Angular project to place the generated code", + "type": "string", + "$default": { + "$source": "argv", + "index": 5 + }, + "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")" + }, "required": [] } diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-index/index.ts b/npm/ng-packs/packages/schematics/src/commands/proxy-index/index.ts index 498428c154..473dbbe63e 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy-index/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/proxy-index/index.ts @@ -1,18 +1,18 @@ import { SchematicContext, Tree } from '@angular-devkit/schematics'; import { - buildDefaultPath, + buildTargetPath, createProxyIndexGenerator, removeDefaultPlaceholders, resolveProject, } from '../../utils'; -export default function (schema: { target?: string }) { +export default function (schema: { target?: string; entryPoint?: string }) { const params = removeDefaultPlaceholders(schema); return async (host: Tree, _context: SchematicContext) => { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion const target = await resolveProject(host, params.target!); - const targetPath = buildDefaultPath(target.definition); + const targetPath = buildTargetPath(target.definition, params.entryPoint); const generateIndex = createProxyIndexGenerator(targetPath); diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-index/schema.json b/npm/ng-packs/packages/schematics/src/commands/proxy-index/schema.json index a8173e63f4..545180954a 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy-index/schema.json +++ b/npm/ng-packs/packages/schematics/src/commands/proxy-index/schema.json @@ -12,6 +12,15 @@ "index": 0 }, "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")" + }, + "entryPoint": { + "description": "Target Angular project to place the generated code", + "type": "string", + "$default": { + "$source": "argv", + "index": 5 + }, + "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")" } }, "required": [] diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/index.ts b/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/index.ts index 9428b9ae4d..cf905738b4 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/index.ts @@ -1,7 +1,7 @@ import { chain, SchematicContext, Tree } from '@angular-devkit/schematics'; import { GenerateProxySchema } from '../../models'; import { - buildDefaultPath, + buildTargetPath, createApiDefinitionGetter, createApisGenerator, createProxyClearer, @@ -18,7 +18,7 @@ export default function (schema: GenerateProxySchema) { return async (host: Tree, _context: SchematicContext) => { const target = await resolveProject(host, params.target!); - const targetPath = buildDefaultPath(target.definition); + const targetPath = buildTargetPath(target.definition, params.entryPoint); const readProxyConfig = createProxyConfigReader(targetPath); const { generated } = readProxyConfig(host); diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/schema.json b/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/schema.json index ad0ba1599a..c5fd51f9b4 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/schema.json +++ b/npm/ng-packs/packages/schematics/src/commands/proxy-refresh/schema.json @@ -48,7 +48,17 @@ "index": 4 }, "x-prompt": "Please enter URL for api definition (default: API Name's url in environment file)" + }, + "entryPoint": { + "description": "Target Angular project to place the generated code", + "type": "string", + "$default": { + "$source": "argv", + "index": 5 + }, + "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")" } }, + "required": [] } diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-remove/index.ts b/npm/ng-packs/packages/schematics/src/commands/proxy-remove/index.ts index 900bd5f1a3..5e1980b3f7 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy-remove/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/proxy-remove/index.ts @@ -1,7 +1,7 @@ import { chain, SchematicContext, Tree } from '@angular-devkit/schematics'; import { GenerateProxySchema } from '../../models'; import { - buildDefaultPath, + buildTargetPath, createApiDefinitionGetter, createApisGenerator, createProxyClearer, @@ -20,7 +20,7 @@ export default function (schema: GenerateProxySchema) { return async (host: Tree, _context: SchematicContext) => { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion const target = await resolveProject(host, params.target!); - const targetPath = buildDefaultPath(target.definition); + const targetPath = buildTargetPath(target.definition, params.entryPoint); const readProxyConfig = createProxyConfigReader(targetPath); const { generated } = readProxyConfig(host); diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy-remove/schema.json b/npm/ng-packs/packages/schematics/src/commands/proxy-remove/schema.json index 2c54f8f9fa..253ac0b0c3 100644 --- a/npm/ng-packs/packages/schematics/src/commands/proxy-remove/schema.json +++ b/npm/ng-packs/packages/schematics/src/commands/proxy-remove/schema.json @@ -48,6 +48,15 @@ "index": 4 }, "x-prompt": "Please enter URL for API definition (default: API Name's url in environment file)" + }, + "entryPoint": { + "description": "Target Angular project to place the generated code", + "type": "string", + "$default": { + "$source": "argv", + "index": 5 + }, + "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")" } }, "required": [] diff --git a/npm/ng-packs/packages/schematics/src/constants/symbols.ts b/npm/ng-packs/packages/schematics/src/constants/symbols.ts new file mode 100644 index 0000000000..f8280b84c4 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/constants/symbols.ts @@ -0,0 +1 @@ +export const NOT_FOUND_VALUE = Symbol('NOT_FOUND_VALUE'); diff --git a/npm/ng-packs/packages/schematics/src/enums/exception.ts b/npm/ng-packs/packages/schematics/src/enums/exception.ts index b7b206cbf6..88f5d1862b 100644 --- a/npm/ng-packs/packages/schematics/src/enums/exception.ts +++ b/npm/ng-packs/packages/schematics/src/enums/exception.ts @@ -13,4 +13,5 @@ export const enum Exception { NoEnvironment = '[Environment Not Found] An environment file cannot be located in "{0}" project.', NoApiUrl = '[API URL Not Found] Cannot resolve API URL for "{1}" remote service name from "{0}" project.', NoRootNamespace = '[Root Namespace Not Found] Cannot resolve root namespace for "{1}" api from "{0}" project.', + LibraryAlreadyExists = '[Library Already Exists] "{0}" already exists. Use --override to override.', } diff --git a/npm/ng-packs/packages/schematics/src/models/generate-proxy-schema.ts b/npm/ng-packs/packages/schematics/src/models/generate-proxy-schema.ts index 7b0c3701a2..682cdda9fe 100644 --- a/npm/ng-packs/packages/schematics/src/models/generate-proxy-schema.ts +++ b/npm/ng-packs/packages/schematics/src/models/generate-proxy-schema.ts @@ -23,4 +23,9 @@ export interface GenerateProxySchema { * Url to API definition */ url?: string; + + /** + * Secondary entrypoint for proxy generation + */ + entryPoint?: string; } diff --git a/npm/ng-packs/packages/schematics/src/utils/angular-schematic/generate-lib.ts b/npm/ng-packs/packages/schematics/src/utils/angular-schematic/generate-lib.ts new file mode 100644 index 0000000000..f96b2b38ea --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/utils/angular-schematic/generate-lib.ts @@ -0,0 +1,52 @@ +import { Rule, Tree } from '@angular-devkit/schematics'; +import { Builders, JSONFile, ProjectType, updateWorkspace } from '../angular'; + +export function updateTsConfig(packageName: string, ...paths: string[]) { + return (host: Tree) => { + if (!host.exists('tsconfig.json')) { + return host; + } + + const file = new JSONFile(host, 'tsconfig.json'); + const jsonPath = ['compilerOptions', 'paths', packageName]; + const value = file.get(jsonPath); + file.modify(jsonPath, Array.isArray(value) ? [...value, ...paths] : paths); + }; +} + +export function addLibToWorkspaceFile(projectRoot: string, projectName: string): Rule { + return updateWorkspace(workspace => { + workspace.projects.add({ + name: projectName, + root: projectRoot, + sourceRoot: `${projectRoot}/src`, + projectType: ProjectType.Library, + prefix: 'lib', + targets: { + build: { + builder: Builders.NgPackagr, + defaultConfiguration: 'production', + options: { + project: `${projectRoot}/ng-package.json`, + }, + configurations: { + production: { + tsConfig: `${projectRoot}/tsconfig.lib.prod.json`, + }, + development: { + tsConfig: `${projectRoot}/tsconfig.lib.json`, + }, + }, + }, + test: { + builder: Builders.Karma, + options: { + main: `${projectRoot}/src/test.ts`, + tsConfig: `${projectRoot}/tsconfig.spec.json`, + karmaConfig: `${projectRoot}/karma.conf.js`, + }, + }, + }, + }); + }); +} diff --git a/npm/ng-packs/packages/schematics/src/utils/angular-schematic/index.ts b/npm/ng-packs/packages/schematics/src/utils/angular-schematic/index.ts new file mode 100644 index 0000000000..0d2dd109ca --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/utils/angular-schematic/index.ts @@ -0,0 +1 @@ +export * from './generate-lib'; diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/README.md b/npm/ng-packs/packages/schematics/src/utils/angular/README.md index 8d98f50e2d..2ee7484e2a 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/README.md +++ b/npm/ng-packs/packages/schematics/src/utils/angular/README.md @@ -1,5 +1,5 @@ **DISCLAIMER** -This directory is a direct copy of https://github.com/angular/angular-cli/tree/master/packages/schematics/angular/utility and is used under terms and permissions by the MIT license granted by Google, Inc. +This directory is a direct copy of https://github.com/angular/angular-cli/tree/d091bb0c7b76a73e1b7d4b5690c532c68452b1d6 and is used under terms and permissions by the MIT license granted by Google, Inc. All credits go to Angular team for building these utilities. diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/ast-utils.ts b/npm/ng-packs/packages/schematics/src/utils/angular/ast-utils.ts index 66c35a8113..86801032f6 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/ast-utils.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/ast-utils.ts @@ -1,10 +1,12 @@ /** * @license - * Copyright Google Inc. All Rights Reserved. + * Copyright Google LLC All Rights Reserved. * * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ + +import { tags } from '@angular-devkit/core'; import * as ts from 'typescript'; import { Change, InsertChange, NoopChange } from './change'; @@ -146,7 +148,7 @@ export function findNodes( } if (max > 0 && (recursive || !test(node))) { for (const child of node.getChildren()) { - findNodes(child, test, max).forEach(node => { + findNodes(child, test, max, recursive).forEach(node => { if (max > 0) { arr.push(node); } @@ -187,7 +189,6 @@ export function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[] { export function findNode(node: ts.Node, kind: ts.SyntaxKind, text: string): ts.Node | null { if (node.kind === kind && node.getText() === text) { - // throw new Error(node.getText()); return node; } @@ -244,20 +245,7 @@ export function insertAfterLastOccurrence( return new InsertChange(file, lastItemPosition, toInsert); } -export function getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null { - if (node.kind == ts.SyntaxKind.Identifier) { - return (node as ts.Identifier).text; - } else if (node.kind == ts.SyntaxKind.StringLiteral) { - return (node as ts.StringLiteral).text; - } else { - return null; - } -} - -function _angularImportsFromNode( - node: ts.ImportDeclaration, - _sourceFile: ts.SourceFile, -): { [name: string]: string } { +function _angularImportsFromNode(node: ts.ImportDeclaration): { [name: string]: string } { const ms = node.moduleSpecifier; let modulePath: string; switch (ms.kind) { @@ -281,11 +269,11 @@ function _angularImportsFromNode( if (nb.kind == ts.SyntaxKind.NamespaceImport) { // This is of the form `import * as name from 'path'`. Return `name.`. return { - [(nb as ts.NamespaceImport).name.text + '.']: modulePath, + [nb.name.text + '.']: modulePath, }; } else { // This is of the form `import {a,b,c} from 'path'` - const namedImports = nb as ts.NamedImports; + const namedImports = nb; return namedImports.elements .map((is: ts.ImportSpecifier) => (is.propertyName ? is.propertyName.text : is.name.text)) @@ -310,7 +298,7 @@ export function getDecoratorMetadata( module: string, ): ts.Node[] { const angularImports = findNodes(source, ts.isImportDeclaration) - .map(node => _angularImportsFromNode(node, source)) + .map(node => _angularImportsFromNode(node)) .reduce((acc, current) => { for (const key of Object.keys(current)) { acc[key] = current[key]; @@ -354,38 +342,6 @@ export function getDecoratorMetadata( .map(expr => expr.arguments[0] as ts.ObjectLiteralExpression); } -function findClassDeclarationParent(node: ts.Node): ts.ClassDeclaration | undefined { - if (ts.isClassDeclaration(node)) { - return node; - } - - return node.parent && findClassDeclarationParent(node.parent); -} - -/** - * Given a source file with @NgModule class(es), find the name of the first @NgModule class. - * - * @param source source file containing one or more @NgModule - * @returns the name of the first @NgModule, or `undefined` if none is found - */ -export function getFirstNgModuleName(source: ts.SourceFile): string | undefined { - // First, find the @NgModule decorators. - const ngModulesMetadata = getDecoratorMetadata(source, 'NgModule', '@angular/core'); - if (ngModulesMetadata.length === 0) { - return undefined; - } - - // Then walk parent pointers up the AST, looking for the ClassDeclaration parent of the NgModule - // metadata. - const moduleClass = findClassDeclarationParent(ngModulesMetadata[0]); - if (!moduleClass || !moduleClass.name) { - return undefined; - } - - // Get the class name of the module ClassDeclaration. - return moduleClass.name.text; -} - export function getMetadataField( node: ts.ObjectLiteralExpression, metadataField: string, @@ -396,9 +352,7 @@ export function getMetadataField( // Filter out every fields that's not "metadataField". Also handles string literals // (but not expressions). .filter(({ name }) => { - return ( - (ts.isIdentifier(name) || ts.isStringLiteral(name)) && name.getText() === metadataField - ); + return (ts.isIdentifier(name) || ts.isStringLiteral(name)) && name.text === metadataField; }) ); } @@ -411,36 +365,33 @@ export function addSymbolToNgModuleMetadata( importPath: string | null = null, ): Change[] { const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core'); - let node: any = nodes[0]; + const node = nodes[0]; // Find the decorator declaration. - if (!node) { + if (!node || !ts.isObjectLiteralExpression(node)) { return []; } // Get all the children property assignment of object literals. - const matchingProperties = getMetadataField(node as ts.ObjectLiteralExpression, metadataField); + const matchingProperties = getMetadataField(node, metadataField); - // Get the last node of the array literal. - if (!matchingProperties) { - return []; - } if (matchingProperties.length == 0) { // We haven't found the field in the metadata declaration. Insert a new field. - const expr = node as ts.ObjectLiteralExpression; let position: number; let toInsert: string; - if (expr.properties.length == 0) { - position = expr.getEnd() - 1; - toInsert = ` ${metadataField}: [${symbolName}]\n`; + if (node.properties.length == 0) { + position = node.getEnd() - 1; + toInsert = `\n ${metadataField}: [\n${tags.indentBy(4)`${symbolName}`}\n ]\n`; } else { - node = expr.properties[expr.properties.length - 1]; - position = node.getEnd(); + const childNode = node.properties[node.properties.length - 1]; + position = childNode.getEnd(); // Get the indentation of the last element, if any. - const text = node.getFullText(source); - const matches = text.match(/^\r?\n\s*/); - if (matches && matches.length > 0) { - toInsert = `,${matches[0]}${metadataField}: [${symbolName}]`; + const text = childNode.getFullText(source); + const matches = text.match(/^(\r?\n)(\s*)/); + if (matches) { + toInsert = + `,${matches[0]}${metadataField}: [${matches[1]}` + + `${tags.indentBy(matches[2].length + 2)`${symbolName}`}${matches[0]}]`; } else { toInsert = `, ${metadataField}: [${symbolName}]`; } @@ -454,69 +405,48 @@ export function addSymbolToNgModuleMetadata( return [new InsertChange(ngModulePath, position, toInsert)]; } } - const assignment = matchingProperties[0] as ts.PropertyAssignment; + const assignment = matchingProperties[0]; // If it's not an array, nothing we can do really. - if (assignment.initializer.kind !== ts.SyntaxKind.ArrayLiteralExpression) { + if ( + !ts.isPropertyAssignment(assignment) || + !ts.isArrayLiteralExpression(assignment.initializer) + ) { return []; } - const arrLiteral = assignment.initializer as ts.ArrayLiteralExpression; - if (arrLiteral.elements.length == 0) { - // Forward the property. - node = arrLiteral; - } else { - node = arrLiteral.elements; - } - - if (!node) { - console.error('No app module found. Please add your new class to your component.'); + let expresssion: ts.Expression | ts.ArrayLiteralExpression; + const assignmentInit = assignment.initializer; + const elements = assignmentInit.elements; - return []; - } - - if (Array.isArray(node)) { - // eslint-disable-next-line @typescript-eslint/ban-types - const nodeArray = node as {} as Array; - const symbolsArray = nodeArray.map(node => node.getText()); - if (symbolsArray.includes(symbolName)) { + if (elements.length) { + const symbolsArray = elements.map(node => tags.oneLine`${node.getText()}`); + if (symbolsArray.includes(tags.oneLine`${symbolName}`)) { return []; } - node = node[node.length - 1]; + expresssion = elements[elements.length - 1]; + } else { + expresssion = assignmentInit; } let toInsert: string; - let position = node.getEnd(); - if (node.kind == ts.SyntaxKind.ObjectLiteralExpression) { - // We haven't found the field in the metadata declaration. Insert a new - // field. - const expr = node as ts.ObjectLiteralExpression; - if (expr.properties.length == 0) { - position = expr.getEnd() - 1; - toInsert = ` ${symbolName}\n`; - } else { - // Get the indentation of the last element, if any. - const text = node.getFullText(source); - if (text.match(/^\r?\r?\n/)) { - toInsert = `,${text.match(/^\r?\n\s*/)[0]}${symbolName}`; - } else { - toInsert = `, ${symbolName}`; - } - } - } else if (node.kind == ts.SyntaxKind.ArrayLiteralExpression) { + let position = expresssion.getEnd(); + if (ts.isArrayLiteralExpression(expresssion)) { // We found the field but it's empty. Insert it just before the `]`. position--; - toInsert = `${symbolName}`; + toInsert = `\n${tags.indentBy(4)`${symbolName}`}\n `; } else { // Get the indentation of the last element, if any. - const text = node.getFullText(source); - if (text.match(/^\r?\n/)) { - toInsert = `,${text.match(/^\r?\n(\r?)\s*/)[0]}${symbolName}`; + const text = expresssion.getFullText(source); + const matches = text.match(/^(\r?\n)(\s*)/); + if (matches) { + toInsert = `,${matches[1]}${tags.indentBy(matches[2].length)`${symbolName}`}`; } else { toInsert = `, ${symbolName}`; } } + if (importPath !== null) { return [ new InsertChange(ngModulePath, position, toInsert), @@ -594,25 +524,6 @@ export function addBootstrapToModule( return addSymbolToNgModuleMetadata(source, modulePath, 'bootstrap', classifiedName, importPath); } -/** - * Custom function to insert an entryComponent into NgModule. It also imports it. - * @deprecated - Since version 9.0.0 with Ivy, entryComponents is no longer necessary. - */ -export function addEntryComponentToModule( - source: ts.SourceFile, - modulePath: string, - classifiedName: string, - importPath: string, -): Change[] { - return addSymbolToNgModuleMetadata( - source, - modulePath, - 'entryComponents', - classifiedName, - importPath, - ); -} - /** * Determine if an import already exists. */ @@ -690,10 +601,13 @@ export function getEnvironmentExportName(source: ts.SourceFile): string | null { * Returns the RouterModule declaration from NgModule metadata, if any. */ export function getRouterModuleDeclaration(source: ts.SourceFile): ts.Expression | undefined { - const result = getDecoratorMetadata(source, 'NgModule', '@angular/core') as ts.Node[]; - const node = result[0] as ts.ObjectLiteralExpression; - const matchingProperties = getMetadataField(node, 'imports'); + const result = getDecoratorMetadata(source, 'NgModule', '@angular/core'); + const node = result[0]; + if (!node || !ts.isObjectLiteralExpression(node)) { + return undefined; + } + const matchingProperties = getMetadataField(node, 'imports'); if (!matchingProperties) { return; } @@ -721,7 +635,10 @@ export function addRouteDeclarationToModule( ): Change { const routerModuleExpr = getRouterModuleDeclaration(source); if (!routerModuleExpr) { - throw new Error(`Couldn't find a route declaration in ${fileToAdd}.`); + throw new Error( + `Couldn't find a route declaration in ${fileToAdd}.\n` + + `Use the '--module' option to specify a different routing module.`, + ); } const scopeConfigMethodArgs = (routerModuleExpr as ts.CallExpression).arguments; if (!scopeConfigMethodArgs.length) { diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/change.ts b/npm/ng-packs/packages/schematics/src/utils/angular/change.ts index 543e41427b..08df56a6dd 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/change.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/change.ts @@ -1,10 +1,13 @@ /** * @license - * Copyright Google Inc. All Rights Reserved. + * Copyright Google LLC All Rights Reserved. * * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ + +import { UpdateRecorder } from '@angular-devkit/schematics'; + export interface Host { write(path: string, content: string): Promise; read(path: string): Promise; @@ -56,7 +59,7 @@ export class InsertChange implements Change { * This method does not insert spaces if there is none in the original string. */ apply(host: Host) { - return host.read(this.path).then(content => { + return host.read(this.path).then((content) => { const prefix = content.substring(0, this.pos); const suffix = content.substring(this.pos); @@ -72,7 +75,7 @@ export class RemoveChange implements Change { order: number; description: string; - constructor(public path: string, private pos: number, private toRemove: string) { + constructor(public path: string, private pos: number, public toRemove: string) { if (pos < 0) { throw new Error('Negative positions are invalid'); } @@ -81,7 +84,7 @@ export class RemoveChange implements Change { } apply(host: Host): Promise { - return host.read(this.path).then(content => { + return host.read(this.path).then((content) => { const prefix = content.substring(0, this.pos); const suffix = content.substring(this.pos + this.toRemove.length); @@ -101,8 +104,8 @@ export class ReplaceChange implements Change { constructor( public path: string, private pos: number, - private oldText: string, - private newText: string, + public oldText: string, + public newText: string, ) { if (pos < 0) { throw new Error('Negative positions are invalid'); @@ -112,7 +115,7 @@ export class ReplaceChange implements Change { } apply(host: Host): Promise { - return host.read(this.path).then(content => { + return host.read(this.path).then((content) => { const prefix = content.substring(0, this.pos); const suffix = content.substring(this.pos + this.oldText.length); const text = content.substring(this.pos, this.pos + this.oldText.length); @@ -126,3 +129,18 @@ export class ReplaceChange implements Change { }); } } + +export function applyToUpdateRecorder(recorder: UpdateRecorder, changes: Change[]): void { + for (const change of changes) { + if (change instanceof InsertChange) { + recorder.insertLeft(change.pos, change.toAdd); + } else if (change instanceof RemoveChange) { + recorder.remove(change.order, change.toRemove.length); + } else if (change instanceof ReplaceChange) { + recorder.remove(change.order, change.oldText.length); + recorder.insertLeft(change.order, change.newText); + } else if (!(change instanceof NoopChange)) { + throw new Error('Unknown Change type encountered when updating a recorder.'); + } + } +} diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/config.ts b/npm/ng-packs/packages/schematics/src/utils/angular/config.ts deleted file mode 100644 index 86e26d8a08..0000000000 --- a/npm/ng-packs/packages/schematics/src/utils/angular/config.ts +++ /dev/null @@ -1,541 +0,0 @@ -/* eslint-disable @typescript-eslint/ban-types */ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ -import { JsonParseMode, parseJson } from '@angular-devkit/core'; -import { Rule, SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics'; -import { ProjectType, WorkspaceProject, WorkspaceSchema } from './workspace-models'; - -// The interfaces below are generated from the Angular CLI configuration schema -// https://github.com/angular/angular-cli/blob/master/packages/@angular/cli/lib/config/schema.json -export interface AppConfig { - /** - * Name of the app. - */ - name?: string; - /** - * Directory where app files are placed. - */ - appRoot?: string; - /** - * The root directory of the app. - */ - root?: string; - /** - * The output directory for build results. - */ - outDir?: string; - /** - * List of application assets. - */ - assets?: ( - | string - | { - /** - * The pattern to match. - */ - glob?: string; - /** - * The dir to search within. - */ - input?: string; - /** - * The output path (relative to the outDir). - */ - output?: string; - } - )[]; - /** - * URL where files will be deployed. - */ - deployUrl?: string; - /** - * Base url for the application being built. - */ - baseHref?: string; - /** - * The runtime platform of the app. - */ - platform?: 'browser' | 'server'; - /** - * The name of the start HTML file. - */ - index?: string; - /** - * The name of the main entry-point file. - */ - main?: string; - /** - * The name of the polyfills file. - */ - polyfills?: string; - /** - * The name of the test entry-point file. - */ - test?: string; - /** - * The name of the TypeScript configuration file. - */ - tsconfig?: string; - /** - * The name of the TypeScript configuration file for unit tests. - */ - testTsconfig?: string; - /** - * The prefix to apply to generated selectors. - */ - prefix?: string; - /** - * Experimental support for a service worker from @angular/service-worker. - */ - serviceWorker?: boolean; - /** - * Global styles to be included in the build. - */ - styles?: ( - | string - | { - input?: string; - [name: string]: any; - } - )[]; - /** - * Options to pass to style preprocessors - */ - stylePreprocessorOptions?: { - /** - * Paths to include. Paths will be resolved to project root. - */ - includePaths?: string[]; - }; - /** - * Global scripts to be included in the build. - */ - scripts?: ( - | string - | { - input: string; - [name: string]: any; - } - )[]; - /** - * Source file for environment config. - */ - environmentSource?: string; - /** - * Name and corresponding file for environment config. - */ - environments?: { - [name: string]: any; - }; - appShell?: { - app: string; - route: string; - }; - budgets?: { - /** - * The type of budget - */ - type?: 'bundle' | 'initial' | 'allScript' | 'all' | 'anyScript' | 'any' | 'anyComponentStyle'; - /** - * The name of the bundle - */ - name?: string; - /** - * The baseline size for comparison. - */ - baseline?: string; - /** - * The maximum threshold for warning relative to the baseline. - */ - maximumWarning?: string; - /** - * The maximum threshold for error relative to the baseline. - */ - maximumError?: string; - /** - * The minimum threshold for warning relative to the baseline. - */ - minimumWarning?: string; - /** - * The minimum threshold for error relative to the baseline. - */ - minimumError?: string; - /** - * The threshold for warning relative to the baseline (min & max). - */ - warning?: string; - /** - * The threshold for error relative to the baseline (min & max). - */ - error?: string; - }[]; -} - -export interface CliConfig { - $schema?: string; - /** - * The global configuration of the project. - */ - project?: { - /** - * The name of the project. - */ - name?: string; - /** - * Whether or not this project was ejected. - */ - ejected?: boolean; - }; - /** - * Properties of the different applications in this project. - */ - apps?: AppConfig[]; - /** - * Configuration for end-to-end tests. - */ - e2e?: { - protractor?: { - /** - * Path to the config file. - */ - config?: string; - }; - }; - /** - * Properties to be passed to TSLint. - */ - lint?: { - /** - * File glob(s) to lint. - */ - files?: string | string[]; - /** - * Location of the tsconfig.json project file. - * Will also use as files to lint if 'files' property not present. - */ - project: string; - /** - * Location of the tslint.json configuration. - */ - tslintConfig?: string; - /** - * File glob(s) to ignore. - */ - exclude?: string | string[]; - }[]; - /** - * Configuration for unit tests. - */ - test?: { - karma?: { - /** - * Path to the karma config file. - */ - config?: string; - }; - codeCoverage?: { - /** - * Globs to exclude from code coverage. - */ - exclude?: string[]; - }; - }; - /** - * Specify the default values for generating. - */ - defaults?: { - /** - * The file extension to be used for style files. - */ - styleExt?: string; - /** - * How often to check for file updates. - */ - poll?: number; - /** - * Use lint to fix files after generation - */ - lintFix?: boolean; - /** - * Options for generating a class. - */ - class?: { - /** - * Specifies if a spec file is generated. - */ - spec?: boolean; - }; - /** - * Options for generating a component. - */ - component?: { - /** - * Flag to indicate if a directory is created. - */ - flat?: boolean; - /** - * Specifies if a spec file is generated. - */ - spec?: boolean; - /** - * Specifies if the style will be in the ts file. - */ - inlineStyle?: boolean; - /** - * Specifies if the template will be in the ts file. - */ - inlineTemplate?: boolean; - /** - * Specifies the view encapsulation strategy. - */ - viewEncapsulation?: 'Emulated' | 'Native' | 'None'; - /** - * Specifies the change detection strategy. - */ - changeDetection?: 'Default' | 'OnPush'; - }; - /** - * Options for generating a directive. - */ - directive?: { - /** - * Flag to indicate if a directory is created. - */ - flat?: boolean; - /** - * Specifies if a spec file is generated. - */ - spec?: boolean; - }; - /** - * Options for generating a guard. - */ - guard?: { - /** - * Flag to indicate if a directory is created. - */ - flat?: boolean; - /** - * Specifies if a spec file is generated. - */ - spec?: boolean; - }; - /** - * Options for generating an interface. - */ - interface?: { - /** - * Prefix to apply to interface names. (i.e. I) - */ - prefix?: string; - }; - /** - * Options for generating a module. - */ - module?: { - /** - * Flag to indicate if a directory is created. - */ - flat?: boolean; - /** - * Specifies if a spec file is generated. - */ - spec?: boolean; - }; - /** - * Options for generating a pipe. - */ - pipe?: { - /** - * Flag to indicate if a directory is created. - */ - flat?: boolean; - /** - * Specifies if a spec file is generated. - */ - spec?: boolean; - }; - /** - * Options for generating a service. - */ - service?: { - /** - * Flag to indicate if a directory is created. - */ - flat?: boolean; - /** - * Specifies if a spec file is generated. - */ - spec?: boolean; - }; - /** - * Properties to be passed to the build command. - */ - build?: { - /** - * Output sourcemaps. - */ - sourcemaps?: boolean; - /** - * Base url for the application being built. - */ - baseHref?: string; - /** - * The ssl key used by the server. - */ - progress?: boolean; - /** - * Enable and define the file watching poll time period (milliseconds). - */ - poll?: number; - /** - * Delete output path before build. - */ - deleteOutputPath?: boolean; - /** - * Do not use the real path when resolving modules. - */ - preserveSymlinks?: boolean; - /** - * Show circular dependency warnings on builds. - */ - showCircularDependencies?: boolean; - /** - * Use a separate bundle containing code used across multiple bundles. - */ - commonChunk?: boolean; - /** - * Use file name for lazy loaded chunks. - */ - namedChunks?: boolean; - }; - /** - * Properties to be passed to the serve command. - */ - serve?: { - /** - * The port the application will be served on. - */ - port?: number; - /** - * The host the application will be served on. - */ - host?: string; - /** - * Enables ssl for the application. - */ - ssl?: boolean; - /** - * The ssl key used by the server. - */ - sslKey?: string; - /** - * The ssl certificate used by the server. - */ - sslCert?: string; - /** - * Proxy configuration file. - */ - proxyConfig?: string; - }; - /** - * Properties about schematics. - */ - schematics?: { - /** - * The schematics collection to use. - */ - collection?: string; - /** - * The new app schematic. - */ - newApp?: string; - }; - }; - /** - * Specify which package manager tool to use. - */ - packageManager?: 'npm' | 'cnpm' | 'yarn' | 'default'; - /** - * Allow people to disable console warnings. - */ - warnings?: { - versionMismatch?: boolean; - }; -} - -export function getWorkspacePath(host: Tree): string { - const possibleFiles = ['/angular.json', '/.angular.json']; - const path = possibleFiles.filter(path => host.exists(path))[0]; - - return path; -} - -export function getWorkspaceSchema(host: Tree): WorkspaceSchema { - const path = getWorkspacePath(host); - const configBuffer = host.read(path); - if (configBuffer === null) { - throw new SchematicsException(`Could not find (${path})`); - } - const content = configBuffer.toString(); - - return parseJson(content, JsonParseMode.Loose) as {} as WorkspaceSchema; -} - -export function addProjectToWorkspace( - workspace: WorkspaceSchema, - name: string, - project: WorkspaceProject, -): Rule { - return (_host: Tree, _context: SchematicContext) => { - if (workspace.projects[name]) { - throw new Error(`Project '${name}' already exists in workspace.`); - } - - // Add project to workspace. - workspace.projects[name] = project; - - if (!workspace.defaultProject && Object.keys(workspace.projects).length === 1) { - // Make the new project the default one. - workspace.defaultProject = name; - } - - return updateWorkspaceSchema(workspace); - }; -} - -export function updateWorkspaceSchema(workspace: WorkspaceSchema): Rule { - return (host: Tree, _context: SchematicContext) => { - host.overwrite(getWorkspacePath(host), JSON.stringify(workspace, null, 2)); - }; -} - -export const configPath = '/.angular-cli.json'; - -export function getConfig(host: Tree): CliConfig { - const configBuffer = host.read(configPath); - if (configBuffer === null) { - throw new SchematicsException('Could not find .angular-cli.json'); - } - - const config = parseJson(configBuffer.toString(), JsonParseMode.Loose) as {} as CliConfig; - - return config; -} - -export function getAppFromConfig(config: CliConfig, appIndexOrName: string): AppConfig | null { - if (!config.apps) { - return null; - } - - if (parseInt(appIndexOrName) >= 0) { - return config.apps[parseInt(appIndexOrName)]; - } - - return config.apps.filter(app => app.name === appIndexOrName)[0]; -} diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/dependencies.ts b/npm/ng-packs/packages/schematics/src/utils/angular/dependencies.ts index 9298dba3b8..c9aa617191 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/dependencies.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/dependencies.ts @@ -1,10 +1,11 @@ /** * @license - * Copyright Google Inc. All Rights Reserved. + * Copyright Google LLC All Rights Reserved. * * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ + import { Tree } from '@angular-devkit/schematics'; import { JSONFile } from './json-file'; @@ -36,9 +37,6 @@ export function addPackageJsonDependency( pkgJsonPath = PKG_JSON_PATH, ): void { const json = new JSONFile(tree, pkgJsonPath); - if (json.error) { - throw json.error; - } const { overwrite, type, name, version } = dependency; const path = [type, name]; @@ -53,9 +51,6 @@ export function removePackageJsonDependency( pkgJsonPath = PKG_JSON_PATH, ): void { const json = new JSONFile(tree, pkgJsonPath); - if (json.error) { - throw json.error; - } for (const depType of ALL_DEPENDENCY_TYPE) { json.remove([depType, name]); @@ -68,9 +63,6 @@ export function getPackageJsonDependency( pkgJsonPath = PKG_JSON_PATH, ): NodeDependency | null { const json = new JSONFile(tree, pkgJsonPath); - if (json.error) { - throw json.error; - } for (const depType of ALL_DEPENDENCY_TYPE) { const version = json.get([depType, name]); diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/find-module.ts b/npm/ng-packs/packages/schematics/src/utils/angular/find-module.ts index d8602244ce..a420f07eb0 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/find-module.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/find-module.ts @@ -1,21 +1,19 @@ /** * @license - * Copyright Google Inc. All Rights Reserved. + * Copyright Google LLC All Rights Reserved. * * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import { dirname, join, normalize, NormalizedRoot, Path, relative } from '@angular-devkit/core'; + +import { NormalizedRoot, Path, dirname, join, normalize, relative } from '@angular-devkit/core'; import { DirEntry, Tree } from '@angular-devkit/schematics'; export interface ModuleOptions { - project?: string; // added this module?: string; name: string; flat?: boolean; path?: string; - route?: string; // added this - selector?: string; // added this skipImport?: boolean; moduleExt?: string; routingModuleExt?: string; @@ -28,7 +26,8 @@ export const ROUTING_MODULE_EXT = '-routing.module.ts'; * Find the module referred by a set of options passed to the schematics. */ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path | undefined { - if (Object.prototype.hasOwnProperty.call(options, 'skipImport') && options.skipImport) { + // eslint-disable-next-line no-prototype-builtins + if (options.hasOwnProperty('skipImport') && options.skipImport) { return undefined; } @@ -55,8 +54,8 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path const candidatesDirs = [...candidateSet].sort((a, b) => b.length - a.length); for (const c of candidatesDirs) { - const candidateFiles = ['', `${moduleBaseName}.ts`, `${moduleBaseName}${moduleExt}`].map(x => - join(c, x), + const candidateFiles = ['', `${moduleBaseName}.ts`, `${moduleBaseName}${moduleExt}`].map( + (x) => join(c, x), ); for (const sc of candidateFiles) { @@ -86,8 +85,8 @@ export function findModule( let foundRoutingModule = false; while (dir) { - const allMatches = dir.subfiles.filter(p => p.endsWith(moduleExt)); - const filteredMatches = allMatches.filter(p => !p.endsWith(routingModuleExt)); + const allMatches = dir.subfiles.filter((p) => p.endsWith(moduleExt)); + const filteredMatches = allMatches.filter((p) => !p.endsWith(routingModuleExt)); foundRoutingModule = foundRoutingModule || allMatches.length !== filteredMatches.length; @@ -95,7 +94,7 @@ export function findModule( return join(dir.path, filteredMatches[0]); } else if (filteredMatches.length > 1) { throw new Error( - 'More than one module matches. Use the skip-import option to skip importing ' + + `More than one module matches. Use the '--skip-import' option to skip importing ` + 'the component into the closest module or use the module option to specify a module.', ); } @@ -106,8 +105,8 @@ export function findModule( const errorMsg = foundRoutingModule ? 'Could not find a non Routing NgModule.' + `\nModules with suffix '${routingModuleExt}' are strictly reserved for routing.` + - '\nUse the skip-import option to skip importing in NgModule.' - : 'Could not find an NgModule. Use the skip-import option to skip importing in NgModule.'; + `\nUse the '--skip-import' option to skip importing in NgModule.` + : `Could not find an NgModule. Use the '--skip-import' option to skip importing in NgModule.`; throw new Error(errorMsg); } diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/generate-from-files.ts b/npm/ng-packs/packages/schematics/src/utils/angular/generate-from-files.ts new file mode 100644 index 0000000000..2ce391b900 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/utils/angular/generate-from-files.ts @@ -0,0 +1,61 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +import { strings } from '@angular-devkit/core'; +import { + apply, + applyTemplates, + chain, + filter, + mergeWith, + move, + noop, + Rule, + Tree, + url, +} from '@angular-devkit/schematics'; +import { parseName } from './parse-name'; +import { createDefaultPath } from './workspace'; + +export interface GenerateFromFilesOptions { + flat?: boolean; + name: string; + path?: string; + prefix?: string; + project?: string; + skipTests?: boolean; +} + +export function generateFromFiles( + options: GenerateFromFilesOptions, + extraTemplateValues: Record string)> = {}, +): Rule { + return async (host: Tree) => { + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + options.path ??= await createDefaultPath(host, options.project as string); + options.prefix ??= ''; + options.flat ??= true; + + const parsedPath = parseName(options.path!, options.name); + options.name = parsedPath.name; + options.path = parsedPath.path; + + const templateSource = apply(url('./files'), [ + options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(), + applyTemplates({ + ...strings, + ...options, + ...extraTemplateValues, + }), + move(parsedPath.path + (options.flat ? '' : '/' + strings.dasherize(options.name))), + ]); + + return chain([mergeWith(templateSource)]); + }; +} diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/index.ts b/npm/ng-packs/packages/schematics/src/utils/angular/index.ts index fec78af448..abf2992d90 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/index.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/index.ts @@ -1,17 +1,13 @@ export * from './ast-utils'; export * from './change'; -export * from './config'; export * from './dependencies'; export * from './find-module'; +export * from './generate-from-files'; export * from './json-file'; -export * from './json-utils'; -export * from './latest-versions'; -export * from './lint-fix'; export * from './ng-ast-utils'; export * from './parse-name'; export * from './paths'; export * from './project-targets'; -export * from './tsconfig'; export * from './validation'; export * from './workspace'; export * from './workspace-models'; diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/json-file.ts b/npm/ng-packs/packages/schematics/src/utils/angular/json-file.ts index 25df010315..647199ef84 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/json-file.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/json-file.ts @@ -1,6 +1,6 @@ /** * @license - * Copyright Google Inc. All Rights Reserved. + * Copyright Google LLC All Rights Reserved. * * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license @@ -10,46 +10,62 @@ import { JsonValue } from '@angular-devkit/core'; import { Tree } from '@angular-devkit/schematics'; import { Node, + ParseError, applyEdits, findNodeAtLocation, getNodeValue, modify, parseTree, + printParseErrorCode, } from 'jsonc-parser'; +export type InsertionIndex = (properties: string[]) => number; export type JSONPath = (string | number)[]; /** @internal */ export class JSONFile { - private content: string; - error: undefined | Error; + content: string; constructor(private readonly host: Tree, private readonly path: string) { const buffer = this.host.read(this.path); if (buffer) { this.content = buffer.toString(); } else { - this.error = new Error(`Could not read ${path}.`); + throw new Error(`Could not read '${path}'.`); } } private _jsonAst: Node | undefined; - private get JsonAst(): Node { + private get JsonAst(): Node | undefined { if (this._jsonAst) { return this._jsonAst; } - this._jsonAst = parseTree(this.content); + const errors: ParseError[] = []; + this._jsonAst = parseTree(this.content, errors, { allowTrailingComma: true }); + if (errors.length) { + const { error, offset } = errors[0]; + throw new Error( + `Failed to parse "${this.path}" as JSON AST Object. ${printParseErrorCode( + error, + )} at location: ${offset}.`, + ); + } return this._jsonAst; } get(jsonPath: JSONPath): unknown { + const jsonAstNode = this.JsonAst; + if (!jsonAstNode) { + return undefined; + } + if (jsonPath.length === 0) { - return getNodeValue(this.JsonAst); + return getNodeValue(jsonAstNode); } - const node = findNodeAtLocation(this.JsonAst, jsonPath); + const node = findNodeAtLocation(jsonAstNode, jsonPath); return node === undefined ? undefined : getNodeValue(node); } @@ -57,12 +73,15 @@ export class JSONFile { modify( jsonPath: JSONPath, value: JsonValue | undefined, - getInsertionIndex?: (properties: string[]) => number, + insertInOrder?: InsertionIndex | false, ): void { - if (!getInsertionIndex) { + let getInsertionIndex: InsertionIndex | undefined; + if (insertInOrder === undefined) { const property = jsonPath.slice(-1)[0]; - getInsertionIndex = properties => - [...properties, property].sort().findIndex(p => p === property); + getInsertionIndex = (properties) => + [...properties, property].sort().findIndex((p) => p === property); + } else if (insertInOrder !== false) { + getInsertionIndex = insertInOrder; } const edits = modify(this.content, jsonPath, value, { diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/json-utils.ts b/npm/ng-packs/packages/schematics/src/utils/angular/json-utils.ts deleted file mode 100644 index 0e71dd7545..0000000000 --- a/npm/ng-packs/packages/schematics/src/utils/angular/json-utils.ts +++ /dev/null @@ -1,221 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ -import { - JsonAstArray, - JsonAstKeyValue, - JsonAstNode, - JsonAstObject, - JsonValue, -} from '@angular-devkit/core'; -import { UpdateRecorder } from '@angular-devkit/schematics'; - -export function appendPropertyInAstObject( - recorder: UpdateRecorder, - node: JsonAstObject, - propertyName: string, - value: JsonValue, - indent: number, -) { - const indentStr = _buildIndent(indent); - let index = node.start.offset + 1; - if (node.properties.length > 0) { - // Insert comma. - const last = node.properties[node.properties.length - 1]; - const { text, end } = last; - const commaIndex = text.endsWith('\n') ? end.offset - 1 : end.offset; - recorder.insertRight(commaIndex, ','); - index = end.offset; - } - const content = _stringifyContent(value, indentStr); - recorder.insertRight( - index, - (node.properties.length === 0 && indent ? '\n' : '') + - ' '.repeat(indent) + - `"${propertyName}":${indent ? ' ' : ''}${content}` + - indentStr.slice(0, -indent), - ); -} - -export function insertPropertyInAstObjectInOrder( - recorder: UpdateRecorder, - node: JsonAstObject, - propertyName: string, - value: JsonValue, - indent: number, -) { - if (node.properties.length === 0) { - appendPropertyInAstObject(recorder, node, propertyName, value, indent); - - return; - } - - // Find insertion info. - let insertAfterProp: JsonAstKeyValue | null = null; - let prev: JsonAstKeyValue | null = null; - let isLastProp = false; - const last = node.properties[node.properties.length - 1]; - for (const prop of node.properties) { - if (prop.key.value > propertyName) { - if (prev) { - insertAfterProp = prev; - } - break; - } - if (prop === last) { - isLastProp = true; - insertAfterProp = last; - } - prev = prop; - } - - if (isLastProp) { - appendPropertyInAstObject(recorder, node, propertyName, value, indent); - - return; - } - - const indentStr = _buildIndent(indent); - const insertIndex = - insertAfterProp === null ? node.start.offset + 1 : insertAfterProp.end.offset + 1; - const content = _stringifyContent(value, indentStr); - recorder.insertRight( - insertIndex, - indentStr + `"${propertyName}":${indent ? ' ' : ''}${content}` + ',', - ); -} - -export function removePropertyInAstObject( - recorder: UpdateRecorder, - node: JsonAstObject, - propertyName: string, -) { - // Find the property inside the object. - const propIdx = node.properties.findIndex(prop => prop.key.value === propertyName); - - if (propIdx === -1) { - // There's nothing to remove. - return; - } - - if (node.properties.length === 1) { - // This is a special case. Everything should be removed, including indentation. - recorder.remove(node.start.offset, node.end.offset - node.start.offset); - recorder.insertRight(node.start.offset, '{}'); - - return; - } - - // The AST considers commas and indentation to be part of the preceding property. - // To get around messy comma and identation management, we can work over the range between - // two properties instead. - const previousProp = node.properties[propIdx - 1]; - const targetProp = node.properties[propIdx]; - const nextProp = node.properties[propIdx + 1]; - - let start, end; - if (previousProp) { - // Given the object below, and intending to remove the `m` property: - // "{\n \"a\": \"a\",\n \"m\": \"m\",\n \"z\": \"z\"\n}" - // ^---------------^ - // Removing the range above results in: - // "{\n \"a\": \"a\",\n \"z\": \"z\"\n}" - start = previousProp.end; - end = targetProp.end; - } else { - // If there's no previousProp there is a nextProp, since we've specialcased the 1 length case. - // Given the object below, and intending to remove the `a` property: - // "{\n \"a\": \"a\",\n \"m\": \"m\",\n \"z\": \"z\"\n}" - // ^---------------^ - // Removing the range above results in: - // "{\n \"m\": \"m\",\n \"z\": \"z\"\n}" - start = targetProp.start; - end = nextProp.start; - } - - recorder.remove(start.offset, end.offset - start.offset); - if (!nextProp) { - recorder.insertRight(start.offset, '\n'); - } -} - -export function appendValueInAstArray( - recorder: UpdateRecorder, - node: JsonAstArray, - value: JsonValue, - indent = 4, -) { - let indentStr = _buildIndent(indent); - let index = node.start.offset + 1; - let newNodes: any[] | undefined; - - if (node.elements.length > 0) { - // Insert comma. - const { end } = node.elements[node.elements.length - 1]; - const isClosingOnSameLine = node.end.offset - end.offset === 1; - - if (isClosingOnSameLine && indent) { - // Reformat the entire array - recorder.remove(node.start.offset, node.end.offset - node.start.offset); - newNodes = [...node.elements.map(({ value }) => value), value]; - index = node.start.offset; - // In case we are generating the entire node we need to reduce the spacing as - // otherwise we'd end up having incorrect double spacing - indent = indent - 2; - indentStr = _buildIndent(indent); - } else { - recorder.insertRight(end.offset, ','); - index = end.offset; - } - } - - recorder.insertRight( - index, - (newNodes ? '' : indentStr) + - _stringifyContent(newNodes || value, indentStr) + - (node.elements.length === 0 && indent ? indentStr.substr(0, -indent) + '\n' : ''), - ); -} - -export function findPropertyInAstObject( - node: JsonAstObject, - propertyName: string, -): JsonAstNode | null { - let maybeNode: JsonAstNode | null = null; - for (const property of node.properties) { - if (property.key.value == propertyName) { - maybeNode = property.value; - } - } - - return maybeNode; -} - -function _buildIndent(count: number): string { - return count ? '\n' + ' '.repeat(count) : ''; -} - -function _stringifyContent(value: JsonValue, indentStr: string): string { - // TODO: Add snapshot tests - - // The 'space' value is 2, because we want to add 2 additional - // indents from the 'key' node. - - // If we use the indent provided we will have double indents: - // "budgets": [ - // { - // "type": "initial", - // "maximumWarning": "2mb", - // "maximumError": "5mb" - // }, - // { - // "type": "anyComponentStyle", - // 'maximumWarning": "5kb" - // } - // ] - return JSON.stringify(value, null, 2).replace(/\n/g, indentStr); -} diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/latest-versions.ts b/npm/ng-packs/packages/schematics/src/utils/angular/latest-versions.ts deleted file mode 100644 index bead0e6282..0000000000 --- a/npm/ng-packs/packages/schematics/src/utils/angular/latest-versions.ts +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -export const latestVersions = { - // These versions should be kept up to date with latest Angular peer dependencies. - Angular: '~10.0.0-rc.0', - RxJs: '~6.6.0', - ZoneJs: '~0.10.2', - TypeScript: '~3.9.5', - TsLib: '^2.0.0', - - // The versions below must be manually updated when making a new devkit release. - // For our e2e tests, these versions must match the latest tag present on the branch. - // During RC periods they will not match the latest RC until there's a new git tag, and - // should not be updated. - DevkitBuildAngular: '~0.1000.0-rc.0', - DevkitBuildNgPackagr: '~0.1000.0-rc.0', - DevkitBuildWebpack: '~0.1000.0-rc.0', - - ngPackagr: '^10.0.0', -}; diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/latest-versions/package.json b/npm/ng-packs/packages/schematics/src/utils/angular/latest-versions/package.json new file mode 100644 index 0000000000..119d4156b8 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/utils/angular/latest-versions/package.json @@ -0,0 +1,20 @@ +{ + "description": "Package versions used by schematics in @schematics/angular.", + "comment": "This file is needed so that depedencies are synced by Renovate.", + "private": true, + "dependencies": { + "@types/jasmine": "~3.10.0", + "@types/node": "^12.11.1", + "jasmine-core": "~4.0.0", + "karma-chrome-launcher": "~3.1.0", + "karma-coverage": "~2.1.0", + "karma-jasmine-html-reporter": "~1.7.0", + "karma-jasmine": "~4.0.0", + "karma": "~6.3.0", + "ng-packagr": "^13.0.0", + "rxjs": "~6.6.7", + "tslib": "^2.3.0", + "typescript": "~4.6.2", + "zone.js": "~0.11.4" + } +} diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/lint-fix.ts b/npm/ng-packs/packages/schematics/src/utils/angular/lint-fix.ts deleted file mode 100644 index d0998db7ab..0000000000 --- a/npm/ng-packs/packages/schematics/src/utils/angular/lint-fix.ts +++ /dev/null @@ -1,54 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ -import { - DirEntry, - Rule, - SchematicContext, - SchematicsException, - Tree, -} from '@angular-devkit/schematics'; -import { TslintFixTask } from '@angular-devkit/schematics/tasks'; - -export function applyLintFix(path = '/'): Rule { - return (tree: Tree, context: SchematicContext) => { - // Find the closest tslint.json or tslint.yaml - let dir: DirEntry | null = tree.getDir(path.substr(0, path.lastIndexOf('/'))); - - do { - if ((dir.subfiles as string[]).some(f => f === 'tslint.json' || f === 'tslint.yaml')) { - break; - } - - dir = dir.parent; - } while (dir !== null); - - if (dir === null) { - throw new SchematicsException( - 'Asked to run lint fixes, but could not find a tslint.json or tslint.yaml config file.', - ); - } - - // Only include files that have been touched. - const files = tree.actions.reduce((acc: Set, action) => { - const path = action.path.substr(1); // Remove the starting '/'. - if (path.endsWith('.ts') && dir && action.path.startsWith(dir.path)) { - acc.add(path); - } - - return acc; - }, new Set()); - - context.addTask( - new TslintFixTask({ - ignoreErrors: true, - tsConfigPath: 'tsconfig.json', - files: [...files], - }), - ); - }; -} diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/ng-ast-utils.ts b/npm/ng-packs/packages/schematics/src/utils/angular/ng-ast-utils.ts index 2c48c9b8bd..6638f832ac 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/ng-ast-utils.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/ng-ast-utils.ts @@ -1,10 +1,11 @@ /** * @license - * Copyright Google Inc. All Rights Reserved. + * Copyright Google LLC All Rights Reserved. * * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ + import { normalize } from '@angular-devkit/core'; import { SchematicsException, Tree } from '@angular-devkit/schematics'; import { dirname } from 'path'; @@ -59,17 +60,17 @@ export function findBootstrapModulePath(host: Tree, mainPath: string): string { const mainBuffer = host.read(mainPath); if (!mainBuffer) { - throw new SchematicsException(`Client app main file (${mainPath}) not found`); + throw new SchematicsException(`Client application main file (${mainPath}) not found`); } const mainText = mainBuffer.toString('utf-8'); const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true); const allNodes = getSourceNodes(source); const bootstrapModuleRelativePath = allNodes - .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration) + .filter(ts.isImportDeclaration) .filter(imp => { return findNode(imp, ts.SyntaxKind.Identifier, bootstrapModule.getText()); }) - .map((imp: ts.ImportDeclaration) => { + .map(imp => { const modulePathStringLiteral = imp.moduleSpecifier as ts.StringLiteral; return modulePathStringLiteral.text; diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/parse-name.ts b/npm/ng-packs/packages/schematics/src/utils/angular/parse-name.ts index 65a45c21ee..231c99341a 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/parse-name.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/parse-name.ts @@ -1,10 +1,11 @@ /** * @license - * Copyright Google Inc. All Rights Reserved. + * Copyright Google LLC All Rights Reserved. * * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ + // import { relative, Path } from "../../../angular_devkit/core/src/virtual-fs"; import { Path, basename, dirname, join, normalize } from '@angular-devkit/core'; @@ -15,7 +16,7 @@ export interface Location { export function parseName(path: string, name: string): Location { const nameWithoutPath = basename(normalize(name)); - const namePath = dirname(join(normalize(path), name) as Path); + const namePath = dirname(join(normalize(path), name)); return { name: nameWithoutPath, diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/paths.ts b/npm/ng-packs/packages/schematics/src/utils/angular/paths.ts index 35729a6417..dffa9e841d 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/paths.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/paths.ts @@ -1,6 +1,6 @@ /** * @license - * Copyright Google Inc. All Rights Reserved. + * Copyright Google LLC All Rights Reserved. * * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/project-targets.ts b/npm/ng-packs/packages/schematics/src/utils/angular/project-targets.ts index e99293f10e..7f4b7ba8c6 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/project-targets.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/project-targets.ts @@ -1,6 +1,6 @@ /** * @license - * Copyright Google Inc. All Rights Reserved. + * Copyright Google LLC All Rights Reserved. * * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/tsconfig.ts b/npm/ng-packs/packages/schematics/src/utils/angular/tsconfig.ts deleted file mode 100644 index ae9075d94b..0000000000 --- a/npm/ng-packs/packages/schematics/src/utils/angular/tsconfig.ts +++ /dev/null @@ -1,76 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -import { JsonParseMode, parseJsonAst } from '@angular-devkit/core'; -import { Rule, SchematicsException, Tree } from '@angular-devkit/schematics'; -import { appendValueInAstArray, findPropertyInAstObject } from './json-utils'; - -const SOLUTION_TSCONFIG_PATH = 'tsconfig.json'; - -/** - * Add project references in "Solution Style" tsconfig. - */ -export function addTsConfigProjectReferences(paths: string[]): Rule { - return (host, context) => { - const logger = context.logger; - - // We need to read after each write to avoid missing `,` when appending multiple items. - for (const path of paths) { - const source = host.read(SOLUTION_TSCONFIG_PATH); - if (!source) { - // Solution tsconfig doesn't exist. - logger.warn( - `Cannot add reference '${path}' in '${SOLUTION_TSCONFIG_PATH}'. File doesn't exists.`, - ); - - return; - } - - const jsonAst = parseJsonAst(source.toString(), JsonParseMode.Loose); - if (jsonAst?.kind !== 'object') { - // Invalid JSON - throw new SchematicsException(`Invalid JSON AST Object '${SOLUTION_TSCONFIG_PATH}'.`); - } - - // Solutions style tsconfig can contain 2 properties: - // - 'files' with a value of empty array - // - 'references' - const filesAst = findPropertyInAstObject(jsonAst, 'files'); - const referencesAst = findPropertyInAstObject(jsonAst, 'references'); - if ( - filesAst?.kind !== 'array' || - filesAst.elements.length !== 0 || - referencesAst?.kind !== 'array' - ) { - logger.warn( - `Cannot add reference '${path}' in '${SOLUTION_TSCONFIG_PATH}'. It appears to be an invalid solution style tsconfig.`, - ); - - return; - } - - // Append new paths - const recorder = host.beginUpdate(SOLUTION_TSCONFIG_PATH); - appendValueInAstArray(recorder, referencesAst, { path: `./${path}` }, 4); - host.commitUpdate(recorder); - } - }; -} - -/** - * Throws an exception when the base tsconfig doesn't exists. - */ -export function verifyBaseTsConfigExists(host: Tree): void { - if (host.exists('tsconfig.json')) { - return; - } - - throw new SchematicsException( - `Cannot find base TypeScript configuration file 'tsconfig.json'.`, - ); -} diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/validation.ts b/npm/ng-packs/packages/schematics/src/utils/angular/validation.ts index 4fa3182a10..8a51bd9541 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/validation.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/validation.ts @@ -1,20 +1,14 @@ /** * @license - * Copyright Google Inc. All Rights Reserved. + * Copyright Google LLC All Rights Reserved. * * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ + import { tags } from '@angular-devkit/core'; import { SchematicsException } from '@angular-devkit/schematics'; -export function validateName(name: string): void { - if (name && /^\d/.test(name)) { - throw new SchematicsException(tags.oneLine`name (${name}) - can not start with a digit.`); - } -} - // Must start with a letter, and must contain only alphanumeric characters or dashes. // When adding a dash the segment after the dash must also start with a letter. export const htmlSelectorRe = /^[a-zA-Z][.0-9a-zA-Z]*(:?-[a-zA-Z][.0-9a-zA-Z]*)*$/; @@ -25,53 +19,3 @@ export function validateHtmlSelector(selector: string): void { is invalid.`); } } - -export function validateProjectName(projectName: string) { - const errorIndex = getRegExpFailPosition(projectName); - const unsupportedProjectNames: string[] = []; - const packageNameRegex = /^(?:@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9_-]+$/; - if (errorIndex !== null) { - const firstMessage = tags.oneLine` - Project name "${projectName}" is not valid. New project names must - start with a letter, and must contain only alphanumeric characters or dashes. - When adding a dash the segment after the dash must also start with a letter. - `; - const msg = tags.stripIndent` - ${firstMessage} - ${projectName} - ${Array(errorIndex + 1).join(' ') + '^'} - `; - throw new SchematicsException(msg); - } else if (unsupportedProjectNames.indexOf(projectName) !== -1) { - throw new SchematicsException( - `Project name ${JSON.stringify(projectName)} is not a supported name.`, - ); - } else if (!packageNameRegex.test(projectName)) { - throw new SchematicsException(`Project name ${JSON.stringify(projectName)} is invalid.`); - } -} - -function getRegExpFailPosition(str: string): number | null { - const isScope = /^@.*\/.*/.test(str); - if (isScope) { - // Remove starting @ - str = str.replace(/^@/, ''); - // Change / to - for validation - str = str.replace(/\//g, '-'); - } - - const parts = str.indexOf('-') >= 0 ? str.split('-') : [str]; - const matched: string[] = []; - - const projectNameRegexp = /^[a-zA-Z][.0-9a-zA-Z]*(-[.0-9a-zA-Z]*)*$/; - - parts.forEach(part => { - if (part.match(projectNameRegexp)) { - matched.push(part); - } - }); - - const compare = matched.join('-'); - - return str !== compare ? compare.length : null; -} diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/workspace-models.ts b/npm/ng-packs/packages/schematics/src/utils/angular/workspace-models.ts index 0a9c972995..5bfa9c0878 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/workspace-models.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/workspace-models.ts @@ -1,11 +1,11 @@ -/* eslint-disable @typescript-eslint/ban-types */ /** * @license - * Copyright Google Inc. All Rights Reserved. + * Copyright Google LLC All Rights Reserved. * * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ + export enum ProjectType { Application = 'application', Library = 'library', @@ -49,7 +49,6 @@ export interface BrowserBuilderOptions extends BrowserBuilderBaseOptions { optimization?: boolean; outputHashing?: OutputHashing; resourcesOutputPath?: string; - extractCss?: boolean; namedChunks?: boolean; aot?: boolean; extractLicenses?: boolean; @@ -77,10 +76,12 @@ export interface ServerBuilderOptions { tsConfig: string; main: string; fileReplacements?: FileReplacements[]; - optimization?: { - scripts?: boolean; - styles?: boolean; - }; + optimization?: + | boolean + | { + scripts?: boolean; + styles?: boolean; + }; sourceMap?: | boolean | { @@ -101,11 +102,6 @@ export interface TestBuilderOptions extends Partial { karmaConfig: string; } -export interface LintBuilderOptions { - tsConfig: string[] | string; - exclude?: string[]; -} - export interface ExtractI18nOptions { browserTarget: string; } @@ -128,7 +124,6 @@ export type LibraryBuilderTarget = BuilderTarget; export type ServerBuilderTarget = BuilderTarget; export type AppShellBuilderTarget = BuilderTarget; -export type LintBuilderTarget = BuilderTarget; export type TestBuilderTarget = BuilderTarget; export type ServeBuilderTarget = BuilderTarget; export type ExtractI18nBuilderTarget = BuilderTarget; @@ -168,12 +163,12 @@ export interface WorkspaceProject { build?: TProjectType extends ProjectType.Library ? LibraryBuilderTarget : BrowserBuilderTarget; server?: ServerBuilderTarget; - lint?: LintBuilderTarget; test?: TestBuilderTarget; serve?: ServeBuilderTarget; e2e?: E2EBuilderTarget; 'app-shell'?: AppShellBuilderTarget; 'extract-i18n'?: ExtractI18nBuilderTarget; // TODO(hans): change this any to unknown when google3 supports TypeScript 3.0. + // eslint-disable-next-line @typescript-eslint/no-explicit-any [key: string]: any; } diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/workspace.ts b/npm/ng-packs/packages/schematics/src/utils/angular/workspace.ts index f2c3403ed9..5ac2ad855f 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/workspace.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/workspace.ts @@ -1,12 +1,13 @@ /** * @license - * Copyright Google Inc. All Rights Reserved. + * Copyright Google LLC All Rights Reserved. * * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import { virtualFs, workspaces } from '@angular-devkit/core'; -import { Rule, Tree } from '@angular-devkit/schematics'; + +import { json, virtualFs, workspaces } from '@angular-devkit/core'; +import { noop, Rule, Tree } from '@angular-devkit/schematics'; import { ProjectType } from './workspace-models'; function createHost(tree: Tree): workspaces.WorkspaceHost { @@ -33,13 +34,13 @@ function createHost(tree: Tree): workspaces.WorkspaceHost { } export function updateWorkspace( - updater: (workspace: workspaces.WorkspaceDefinition) => void | PromiseLike, + updater: (workspace: workspaces.WorkspaceDefinition) => void | Rule | PromiseLike, ): Rule; export function updateWorkspace(workspace: workspaces.WorkspaceDefinition): Rule; export function updateWorkspace( updaterOrWorkspace: | workspaces.WorkspaceDefinition - | ((workspace: workspaces.WorkspaceDefinition) => void | PromiseLike), + | ((workspace: workspaces.WorkspaceDefinition) => void | Rule | PromiseLike), ): Rule { return async (tree: Tree) => { const host = createHost(tree); @@ -47,14 +48,15 @@ export function updateWorkspace( if (typeof updaterOrWorkspace === 'function') { const { workspace } = await workspaces.readWorkspace('/', host); - const result = updaterOrWorkspace(workspace); - if (result !== undefined) { - await result; - } + const result = await updaterOrWorkspace(workspace); await workspaces.writeWorkspace(workspace, host); + + return result || noop; } else { await workspaces.writeWorkspace(updaterOrWorkspace, host); + + return noop; } }; } @@ -83,8 +85,37 @@ export async function createDefaultPath(tree: Tree, projectName: string): Promis const workspace = await getWorkspace(tree); const project = workspace.projects.get(projectName); if (!project) { - throw new Error('Specified project does not exist.'); + throw new Error(`Project "${projectName}" does not exist.`); } return buildDefaultPath(project); } + +export function* allWorkspaceTargets( + workspace: workspaces.WorkspaceDefinition, +): Iterable<[string, workspaces.TargetDefinition, string, workspaces.ProjectDefinition]> { + for (const [projectName, project] of workspace.projects) { + for (const [targetName, target] of project.targets) { + yield [targetName, target, projectName, project]; + } + } +} + +export function* allTargetOptions( + target: workspaces.TargetDefinition, + skipBaseOptions = false, +): Iterable<[string | undefined, Record]> { + if (!skipBaseOptions && target.options) { + yield [undefined, target.options]; + } + + if (!target.configurations) { + return; + } + + for (const [name, options] of Object.entries(target.configurations)) { + if (options !== undefined) { + yield [name, options]; + } + } +} diff --git a/npm/ng-packs/packages/schematics/src/utils/index.ts b/npm/ng-packs/packages/schematics/src/utils/index.ts index eeb12e6d9e..53950e8a87 100644 --- a/npm/ng-packs/packages/schematics/src/utils/index.ts +++ b/npm/ng-packs/packages/schematics/src/utils/index.ts @@ -7,6 +7,7 @@ export * from './enum'; export * from './file'; export * from './generics'; export * from './import'; +export * from './lib'; export * from './methods'; export * from './model'; export * from './namespace'; diff --git a/npm/ng-packs/packages/schematics/src/utils/lib.ts b/npm/ng-packs/packages/schematics/src/utils/lib.ts new file mode 100644 index 0000000000..d083c6c206 --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/utils/lib.ts @@ -0,0 +1,9 @@ +import { Tree } from '@angular-devkit/schematics'; +import { resolveProject } from "./workspace"; +export async function createTargetLibIfNotExist(tree: Tree, target: string) { + const lib = await resolveProject(tree, target, null); + + if (!lib) { + + } +} diff --git a/npm/ng-packs/packages/schematics/src/utils/source.ts b/npm/ng-packs/packages/schematics/src/utils/source.ts index ad488b27be..be1156a775 100644 --- a/npm/ng-packs/packages/schematics/src/utils/source.ts +++ b/npm/ng-packs/packages/schematics/src/utils/source.ts @@ -23,7 +23,7 @@ export function createApiDefinitionGetter(params: GenerateProxySchema) { if (!sourceUrl) { sourceUrl = getSourceUrl(host, source, apiName); } - return await getApiDefinition(sourceUrl); + return await getApiDefinition(sourceUrl!); }; } diff --git a/npm/ng-packs/packages/schematics/src/utils/workspace.ts b/npm/ng-packs/packages/schematics/src/utils/workspace.ts index 81bfdc7307..41bad90615 100644 --- a/npm/ng-packs/packages/schematics/src/utils/workspace.ts +++ b/npm/ng-packs/packages/schematics/src/utils/workspace.ts @@ -3,9 +3,11 @@ import { strings, workspaces } from '@angular-devkit/core'; import { SchematicsException, Tree } from '@angular-devkit/schematics'; import { Exception } from '../enums'; import { Project } from '../models'; -import { getWorkspace, getWorkspaceSchema, ProjectType, WorkspaceSchema } from './angular'; +import { buildDefaultPath, getWorkspace, ProjectType, WorkspaceSchema } from './angular'; import { findEnvironmentExpression } from './ast'; import { readFileInTree } from './common'; +import { NOT_FOUND_VALUE } from '../constants/symbols'; +import { parseJson } from '@angular/cli/utilities/json-file'; export function isLibrary(project: workspaces.ProjectDefinition): boolean { return project.extensions['projectType'] === ProjectType.Library; @@ -33,8 +35,11 @@ export function readWorkspaceSchema(tree: Tree) { return workspaceSchema; } - -export async function resolveProject(tree: Tree, name: string): Promise { +export async function resolveProject( + tree: Tree, + name: string, + notFoundValue: T = NOT_FOUND_VALUE as unknown as any, +): Promise { name = name || readWorkspaceSchema(tree).defaultProject!; const workspace = await getWorkspace(tree); let definition: Project['definition'] | undefined; @@ -61,7 +66,45 @@ export async function resolveProject(tree: Tree, name: string): Promise definition = workspace.projects.get(name); } catch (_) {} + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + if (!definition && notFoundValue !== NOT_FOUND_VALUE) { + return notFoundValue; + } if (!definition) throw new SchematicsException(Exception.NoProject); return { name, definition }; } + +export function getWorkspaceSchema(host: Tree): WorkspaceSchema { + const path = getWorkspacePath(host); + const configBuffer = host.read(path); + if (configBuffer === null) { + throw new SchematicsException(`Could not find (${path})`); + } + const content = configBuffer.toString(); + + return parseJson(content) as Record as WorkspaceSchema; +} + +export function getWorkspacePath(host: Tree): string { + const possibleFiles = ['/angular.json', '/.angular.json']; + const path = possibleFiles.filter(path => host.exists(path))[0]; + + return path; +} + +/** + * Build a default project path for generating. + * @param project The project which will have its default path generated. + * @param entryPoint The secondary-entry-point. + */ +export function buildTargetPath( + project: workspaces.ProjectDefinition, + entryPoint?: string, +): string { + if (entryPoint) { + return `${project.root}/${entryPoint}/src`; + } + return buildDefaultPath(project); +} diff --git a/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html index 21d3ee1dee..2219cc4bd8 100644 --- a/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html +++ b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html @@ -6,13 +6,13 @@
    + }}*
    + }}*
    @@ -20,7 +20,7 @@
    - +
    diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index bd8dd9a7fd..db0b99a233 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": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~6.0.0-rc.3", - "@abp/ng.theme.shared": "~6.0.0-rc.3", + "@abp/ng.components": "~6.0.0-rc.4", + "@abp/ng.theme.shared": "~6.0.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index 963b1f766f..1cb40d6dfd 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": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~6.0.0-rc.3", - "@abp/ng.theme.shared": "~6.0.0-rc.3", + "@abp/ng.feature-management": "~6.0.0-rc.4", + "@abp/ng.theme.shared": "~6.0.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index 2bb2b470d0..d39a21260d 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": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~6.0.0-rc.3", - "@abp/ng.theme.shared": "~6.0.0-rc.3", + "@abp/ng.account.core": "~6.0.0-rc.4", + "@abp/ng.theme.shared": "~6.0.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html index a5eeffa31c..9cdc06401c 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html @@ -1,4 +1,5 @@ @@ -8,9 +9,9 @@
    - []> = of([]); validators: ValidatorFn[] = []; @@ -183,7 +185,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { ngOnChanges({ prop, data }: SimpleChanges) { const currentProp = prop?.currentValue as FormProp; - const { options, readonly, disabled, validators, template } = currentProp || {}; + const { options, readonly, disabled, validators, className, template } = currentProp || {}; if (template) { this.injectorForCustomComponent = Injector.create({ providers: [ @@ -211,6 +213,9 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { this.validators = validators(this.data); this.setAsterisk(); } + if(className !== undefined){ + this.containerClassName = className; + } const [keyControl, valueControl] = this.getTypeaheadControls(); if (keyControl && valueControl) diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.html index 69ad86da5c..c0cdcbea6d 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.html +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.html @@ -1,23 +1,45 @@ - - - - - + + + + +
    + +
    - - - -     + + + +     +     + + + + + + + + + + + + + + + + diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.ts index 927550024c..abb90c9cc6 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.ts @@ -12,7 +12,7 @@ import { } from '@angular/core'; import { ControlContainer, UntypedFormGroup } from '@angular/forms'; import { EXTRA_PROPERTIES_KEY } from '../../constants/extra-properties'; -import { FormPropList } from '../../models/form-props'; +import { FormPropList, GroupedFormPropList } from '../../models/form-props'; import { ExtensionsService } from '../../services/extensions.service'; import { EXTENSIONS_IDENTIFIER } from '../../tokens/extensions.token'; import { selfFactory } from '../../utils/factory.util'; @@ -38,14 +38,23 @@ export class ExtensibleFormComponent { @Input() set selectedRecord(record: R) { const type = !record || JSON.stringify(record) === '{}' ? 'create' : 'edit'; - this.propList = this.extensions[`${type}FormProps`].get(this.identifier).props; + const propList = this.extensions[`${type}FormProps`].get(this.identifier).props; + this.groupedPropList = this.createGroupedList(propList); this.record = record; } extraPropertiesKey = EXTRA_PROPERTIES_KEY; - propList!: FormPropList; + groupedPropList: GroupedFormPropList; record!: R; + createGroupedList(propList: FormPropList) { + const groupedFormPropList = new GroupedFormPropList(); + propList.forEach(item => { + groupedFormPropList.addItem(item.value); + }); + return groupedFormPropList; + } + get form(): UntypedFormGroup { return (this.container ? this.container.control : { controls: {} }) as UntypedFormGroup; } diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts index bfc9f46dba..14de1a94f4 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts @@ -21,6 +21,34 @@ export class FormProps extends Props> { protected _ctor: Type> = FormPropList; } +export interface FormPropGroup { + name: string; + className?: string; +} + +export class GroupedFormPropList { + public readonly items: GroupedFormPropItem[] = []; + addItem(item: FormProp) { + const groupName = item.group?.name; + let group = this.items.find(i => i.group?.name === groupName); + if (group) { + group.formPropList.addTail(item); + } else { + group = { + formPropList: new FormPropList(), + group: item.group, + }; + group.formPropList.addHead(item); + this.items.push(group); + } + } +} + +export interface GroupedFormPropItem { + group: FormPropGroup; + formPropList: FormPropList; +} + export class CreateFormPropsFactory extends PropsFactory> { protected _ctor: Type> = FormProps; } @@ -40,6 +68,7 @@ export class FormProp extends Prop { readonly id: string | undefined; readonly template?: Type; readonly className?: string; + readonly group?: FormPropGroup | undefined; constructor(options: FormPropOptions) { super( @@ -52,6 +81,8 @@ export class FormProp extends Prop { options.template, options.className, ); + this.group = options.group; + this.className = options.className; this.asyncValidators = options.asyncValidators || (_ => []); this.validators = options.validators || (_ => []); diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 6dfba128b1..ea2f0ce121 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": "6.0.0-rc.3", + "version": "6.0.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~6.0.0-rc.3", + "@abp/ng.core": "~6.0.0-rc.4", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "13.0.0", "@ngx-validate/core": "^0.1.2", diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html index 89b8645cf3..82c27d2518 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html @@ -1,7 +1,7 @@ -