Merge pull request #8364 from abpframework/auto-merge/rel-4-3/205

Merge branch dev with rel-4.3

docs/en/Getting-Started-Create-Solution.md

@@ -3,7 +3,7 @@
 ````json
 //[doc-params]
 {
-    "UI": ["MVC", "Blazor", "NG"],
+    "UI": ["MVC", "Blazor", "BlazorServer", "NG"],
     "DB": ["EF", "Mongo"],
     "Tiered": ["Yes", "No"]
 }
@@ -13,17 +13,21 @@
 
 ## Create a New Project
 
+We will use the ABP CLI to create a new ABP project.
+
+> Alternatively, you can **create and download** projects from [ABP Framework website](https://abp.io/get-started) by easily selecting the all the options from the page.
+
 Use the `new` command of the ABP CLI to create a new project:
 
 ````shell
-abp new Acme.BookStore{{if UI == "NG"}} -u angular{{else if UI == "Blazor"}} -u blazor{{end}}{{if DB == "Mongo"}} -d mongodb{{end}}{{if Tiered == "Yes"}}{{if UI == "MVC"}} --tiered{{else}} --separate-identity-server{{end}}{{end}}
+abp new Acme.BookStore{{if UI == "NG"}} -u angular{{else if UI == "Blazor"}} -u blazor{{else if UI == "BlazorServer"}} -u blazor-server{{end}}{{if DB == "Mongo"}} -d mongodb{{end}}{{if Tiered == "Yes"}}{{if UI == "MVC"}} --tiered{{else}} --separate-identity-server{{end}}{{end}}
 ````
 
 *You can use different level of namespaces; e.g. BookStore, Acme.BookStore or Acme.Retail.BookStore.* 
 
 {{ if Tiered == "Yes" }}
 
-{{ if UI == "MVC" }}
+{{ if UI == "MVC" || UI == "BlazorServer" }}
 
 * `--tiered` argument is used to create N-tiered solution where authentication server, UI and API layers are physically separated.
 
@@ -37,8 +41,6 @@ abp new Acme.BookStore{{if UI == "NG"}} -u angular{{else if UI == "Blazor"}} -u
 
 > [ABP CLI document](./CLI.md) covers all of the available commands and options.
 
-> Alternatively, you can **create and download** projects from [ABP Framework website](https://abp.io/get-started) by easily selecting the all the options from the page.
-
 ### The Solution Structure
 
 The solution has a layered structure (based on the [Domain Driven Design](Domain-Driven-Design.md)) and contains unit & integration test projects. See the [application template document](Startup-Templates/Application.md) to understand the solution structure in details. 

docs/en/Getting-Started-Running-Solution.md

@@ -3,7 +3,7 @@
 ````json
 //[doc-params]
 {
-    "UI": ["MVC", "Blazor", "NG"],
+    "UI": ["MVC", "Blazor", "BlazorServer", "NG"],
     "DB": ["EF", "Mongo"],
     "Tiered": ["Yes", "No"]
 }
@@ -15,7 +15,7 @@
 
 ### Connection String
 
-Check the **connection string** in the `appsettings.json` file under the {{if Tiered == "Yes"}}`.IdentityServer` and `.HttpApi.Host` projects{{else}}{{if UI=="MVC"}}`.Web` project{{else}}`.HttpApi.Host` project{{end}}{{end}}
+Check the **connection string** in the `appsettings.json` file under the {{if Tiered == "Yes"}}`.IdentityServer` and `.HttpApi.Host` projects{{else}}{{if UI=="MVC"}}`.Web` project{{else if UI=="BlazorServer"}}`.Blazor` project{{else}}`.HttpApi.Host` project{{end}}{{end}}.
 
 {{ if DB == "EF" }}
 
@@ -91,7 +91,7 @@ Right click to the `.DbMigrator` project and select **Set as StartUp Project**
 
 ## Run the Application
 
-{{ if UI == "MVC" }}
+{{ if UI == "MVC" || UI == "BlazorServer" }}
 
 {{ if Tiered == "Yes" }}
 
@@ -109,7 +109,7 @@ You can login, but you cannot enter to the main application here. This is **just
 
 This is the HTTP API that is used by the web application.
 
-3. Lastly, ensure that the `.Web` project is the startup project and run the application which will open a **welcome** page in your browser
+3. Lastly, ensure that the {{if UI=="MVC"}}`.Web`{{else}}`.Blazor`{{end}} project is the startup project and run the application which will open a **welcome** page in your browser
 
 ![mvc-tiered-app-home](images/bookstore-home.png)
 
@@ -119,7 +119,7 @@ Click to the **login** button which will redirect you to the *authentication ser
 
 {{ else # Tiered != "Yes" }}
 
-Ensure that the `.Web` project is the startup project. Run the application which will open the **login** page in your browser:
+Ensure that the {{if UI=="MVC"}}`.Web`{{else}}`.Blazor`{{end}} project is the startup project. Run the application which will open the **login** page in your browser:
 
 > Use Ctrl+F5 in Visual Studio (instead of F5) to run the application without debugging. If you don't have a debug purpose, this will be faster.
 
@@ -127,7 +127,7 @@ Ensure that the `.Web` project is the startup project. Run the application which
 
 {{ end # Tiered }}
 
-{{ else # UI != "MVC" }}
+{{ else # UI != MVC || BlazorServer }}
 
 ### Running the HTTP API Host (Server Side)
 

docs/en/Getting-Started-Setup-Environment.md

@@ -3,7 +3,7 @@
 ````json
 //[doc-params]
 {
-    "UI": ["MVC", "Blazor", "NG"],
+    "UI": ["MVC", "Blazor", "BlazorServer", "NG"],
     "DB": ["EF", "Mongo"],
     "Tiered": ["Yes", "No"]
 }

docs/en/Getting-Started.md

@@ -3,7 +3,7 @@
 ````json
 //[doc-params]
 {
-    "UI": ["MVC", "Blazor", "NG"],
+    "UI": ["MVC", "Blazor", "BlazorServer", "NG"],
     "DB": ["EF", "Mongo"],
     "Tiered": ["Yes", "No"]
 }

docs/en/docs-params.json

@@ -5,7 +5,8 @@
       "displayName": "UI",
       "values": {
         "MVC": "MVC / Razor Pages",
-        "Blazor": "Blazor",
+        "Blazor": "Blazor WebAssembly",
+        "BlazorServer": "Blazor Server",
         "NG": "Angular"
       }
     },

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClientFactory.cs

@@ -13,7 +13,8 @@ namespace Volo.Abp.Cli.Http
         private readonly IHttpClientFactory _clientFactory;
         private readonly ICancellationTokenProvider _cancellationTokenProvider;
 
-        public CliHttpClientFactory(IHttpClientFactory clientFactory, ICancellationTokenProvider cancellationTokenProvider)
+        public CliHttpClientFactory(IHttpClientFactory clientFactory,
+            ICancellationTokenProvider cancellationTokenProvider)
         {
             _clientFactory = clientFactory;
             _cancellationTokenProvider = cancellationTokenProvider;
@@ -55,4 +56,4 @@ namespace Volo.Abp.Cli.Http
             }
         }
     }
-}
+}