From 0be24fefbda7d70f27bc0b4713d0a322497bfb7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 5 Apr 2021 09:08:41 +0300 Subject: [PATCH 1/4] Clean module document list --- docs/en/Modules/Blogging.md | 3 --- docs/en/Modules/Client-Simulation.md | 3 --- docs/en/Modules/Index.md | 3 --- docs/en/Modules/Users.md | 3 --- docs/en/docs-nav.json | 12 ------------ 5 files changed, 24 deletions(-) delete mode 100644 docs/en/Modules/Blogging.md delete mode 100644 docs/en/Modules/Client-Simulation.md delete mode 100644 docs/en/Modules/Users.md diff --git a/docs/en/Modules/Blogging.md b/docs/en/Modules/Blogging.md deleted file mode 100644 index 32d2e023ea..0000000000 --- a/docs/en/Modules/Blogging.md +++ /dev/null @@ -1,3 +0,0 @@ -# Blogging Module - -TODO \ No newline at end of file diff --git a/docs/en/Modules/Client-Simulation.md b/docs/en/Modules/Client-Simulation.md deleted file mode 100644 index bc5d38e814..0000000000 --- a/docs/en/Modules/Client-Simulation.md +++ /dev/null @@ -1,3 +0,0 @@ -# Client Simulation Module - -TODO \ No newline at end of file diff --git a/docs/en/Modules/Index.md b/docs/en/Modules/Index.md index 8851f8b554..fbebf9fa0f 100644 --- a/docs/en/Modules/Index.md +++ b/docs/en/Modules/Index.md @@ -14,8 +14,6 @@ There are some **free and open source** application modules developed and mainta * [**Account**](Account.md): Provides UI for the account management and allows user to login/register to the application. * [**Audit Logging**](Audit-Logging.md): Persists audit logs to a database. * [**Background Jobs**](Background-Jobs.md): Persist background jobs when using the default background job manager. -* [**Blogging**](Blogging.md): Used to create fancy blogs. ABP's [own blog](https://blog.abp.io/) already using this module. -* [**Client Simulation**](Client-Simulation.md): A simple web UI to stress test HTTP APIs by simulating concurrent clients. * [**CMS Kit**](Cms-Kit.md): A set of reusable *Content Management System* features. * [**Docs**](Docs.md): Used to create technical documentation website. ABP's [own documentation](https://docs.abp.io) already using this module. * [**Feature Management**](Feature-Management.md): Used to persist and manage the [features](../Features.md). @@ -24,7 +22,6 @@ There are some **free and open source** application modules developed and mainta * [**Permission Management**](Permission-Management.md): Used to persist permissions. * **[Setting Management](Setting-Management.md)**: Used to persist and manage the [settings](../Settings.md). * [**Tenant Management**](Tenant-Management.md): Manages tenants for a [multi-tenant](../Multi-Tenancy.md) application. -* [**Users**](Users.md): Abstract users, so other modules can depend on this module instead of the Identity module. * [**Virtual File Explorer**](Virtual-File-Explorer.md): Provided a simple UI to view files in [virtual file system](../Virtual-File-System.md). See [the GitHub repository](https://github.com/abpframework/abp/tree/master/modules) for source code of all modules. diff --git a/docs/en/Modules/Users.md b/docs/en/Modules/Users.md deleted file mode 100644 index 1cb0f4b701..0000000000 --- a/docs/en/Modules/Users.md +++ /dev/null @@ -1,3 +0,0 @@ -# Users Module - -TODO \ No newline at end of file diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index efca73a484..23d9cc761d 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -1004,14 +1004,6 @@ "text": "Background Jobs", "path": "Modules/Background-Jobs.md" }, - { - "text": "Blogging", - "path": "Modules/Blogging.md" - }, - { - "text": "Client Simulation", - "path": "Modules/Client-Simulation.md" - }, { "text": "CMS Kit", "path": "Modules/Cms-Kit.md" @@ -1044,10 +1036,6 @@ "text": "Tenant Management", "path": "Modules/Tenant-Management.md" }, - { - "text": "Users", - "path": "Modules/Users.md" - }, { "text": "Virtual File Explorer", "path": "Modules/Virtual-File-Explorer.md" From e24eb7848319f13d1a7825a2c8e70ecea92b4067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 5 Apr 2021 09:14:55 +0300 Subject: [PATCH 2/4] Removed beta / not supported texts. --- docs/en/Entity-Framework-Core-Oracle.md | 2 +- docs/en/Module-Entity-Extensions.md | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/en/Entity-Framework-Core-Oracle.md b/docs/en/Entity-Framework-Core-Oracle.md index 02aaac305c..8c265149ba 100644 --- a/docs/en/Entity-Framework-Core-Oracle.md +++ b/docs/en/Entity-Framework-Core-Oracle.md @@ -4,7 +4,7 @@ This document explains how to switch to the **Oracle** database provider for **[ ABP Framework provides integrations for two different Oracle packages. See one of the following documents based on your provider decision: -* **[Volo.Abp.EntityFrameworkCore.Oracle](Entity-Framework-Core-Oracle-Official.md)** package uses the official & free oracle driver (which is **currently in beta**). +* **[Volo.Abp.EntityFrameworkCore.Oracle](Entity-Framework-Core-Oracle-Official.md)** package uses the official & free oracle driver. * **[Volo.Abp.EntityFrameworkCore.Oracle.Devart](Entity-Framework-Core-Oracle-Devart.md)** package uses the commercial (paid) driver of [Devart](https://www.devart.com/) company. > You can choose one of the package you want. If you don't know the differences of the packages, please search for it. ABP Framework only provides integrations it doesn't provide support for such 3rd-party libraries. diff --git a/docs/en/Module-Entity-Extensions.md b/docs/en/Module-Entity-Extensions.md index dc23d1e663..f160f98b1a 100644 --- a/docs/en/Module-Entity-Extensions.md +++ b/docs/en/Module-Entity-Extensions.md @@ -1,9 +1,5 @@ # Module Entity Extensions -> This feature is not supported by the Blazor UI yet. - -## Introduction - Module entity extension system is a **high level** extension system that allows you to **define new properties** for existing entities of the depended modules. It automatically **adds properties to the entity, database, HTTP API and the user interface** in a single point. > The module must be developed the *Module Entity Extensions* system in mind. All the **official modules** supports this system wherever possible. From d1fe78dec4bdb1e15bcaaea449903d93290fcc7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 5 Apr 2021 09:16:59 +0300 Subject: [PATCH 3/4] connection string should be localhost in docs. --- docs/en/Getting-Started-Running-Solution.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Getting-Started-Running-Solution.md b/docs/en/Getting-Started-Running-Solution.md index a195a4e2a2..e871ec882f 100644 --- a/docs/en/Getting-Started-Running-Solution.md +++ b/docs/en/Getting-Started-Running-Solution.md @@ -21,7 +21,7 @@ Check the **connection string** in the `appsettings.json` file under the {{if Ti ````json "ConnectionStrings": { - "Default": "Server=localhost;Database=BookStore;Trusted_Connection=True" + "Default": "Server=(LocalDb)\MSSQLLocalDB;Database=BookStore;Trusted_Connection=True" } ```` From bdd2a8a86cc090ce12632fd2a4f8c97304649877 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 5 Apr 2021 09:53:17 +0300 Subject: [PATCH 4/4] Refactor MicroserviceServiceRandomPortStep --- .../MicroserviceServiceRandomPortStep.cs | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/MicroserviceServiceRandomPortStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/MicroserviceServiceRandomPortStep.cs index 88a19b43af..befc5414eb 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/MicroserviceServiceRandomPortStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/MicroserviceServiceRandomPortStep.cs @@ -59,9 +59,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps return _tyeFileContent; } - var solutionFolderPath = context.BuildArgs.ExtraProperties[NewCommand.Options.OutputFolder.Short] ?? - context.BuildArgs.ExtraProperties[NewCommand.Options.OutputFolder.Long] ?? - Directory.GetCurrentDirectory(); + var solutionFolderPath = GetSolutionFolderPath(context); var tyeFilePath = Path.Combine(solutionFolderPath, "tye.yaml"); @@ -74,5 +72,20 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps return _tyeFileContent; } + + private static string GetSolutionFolderPath(ProjectBuildContext context) + { + if (context.BuildArgs.ExtraProperties.ContainsKey(NewCommand.Options.OutputFolder.Short)) + { + return context.BuildArgs.ExtraProperties[NewCommand.Options.OutputFolder.Short]; + } + + if (context.BuildArgs.ExtraProperties.ContainsKey(NewCommand.Options.OutputFolder.Long)) + { + return context.BuildArgs.ExtraProperties[NewCommand.Options.OutputFolder.Long]; + } + + return Directory.GetCurrentDirectory(); + } } }