Merge branch 'master' into dev

Author: ismcagdas

doc-obsolete/Development-Guide-Angular.md

@@ -1089,9 +1089,9 @@ new tenant registration).
 
 We are using [angular-cli](https://cli.angular.io/) for development &
 deployment. Angular CLI has it's own build command that can be used to
-build your application:
+build your application. Below command uses Gulp and Angular CLI to build your application.
 
-    ng build --prod
+    npm run publish
 
 This command uses **dist** folder as output. Just remember to change
 **assets/appconfig.json** file with your own configuration.

doc-obsolete/Step-by-step-angular-publish-to-iis.md

@@ -29,7 +29,7 @@ Check [Host ASP.NET Core on Windows with IIS](https://docs.microsoft.com/en-us/a
 
 We are using angular-cli for development & deployment. Angular CLI has it's own build command that can be used to build your application:
 
-- Run `ng build --prod`. This command uses dist folder as output. 
+- Run `npm run publish`. This command uses dist folder as output. 
 - Change `assets/appconfig.production.json` file with your own configuration.
 - After ng build command, dist folder contains all necessary files to create a web site under IIS. (For example: copy files from `\*.dist` to `C:\inetpub\wwwroot\angularwebsite`).
 

doc-obsolete/Step-by-step-publish-to-azure-angular.md

@@ -83,14 +83,14 @@ Select "**azure-publish-demo-server**" and click "**OK**", then click "**Publish
 The details will be explained in the next lines. Here are the quick steps to publish the **AngularUI** to the Azure
 
 - Run the `yarn` command to restore packages
-- Run the `ng build --prod`
+- Run the `npm run publish`
 - Copy the web.config file that is placed in **angular** folder root to dist folder
 - Configure the **angular/dist/assets/appconfig.json**
 - Send the required files to the Azure
 
 ### Prepare The Publish Folder
 
-Run the `yarn` command to restore packages and run the `ng build --prod` to create publish folder that named **dist**.
+Run the `yarn` command to restore packages and run the `npm run publish` to create publish folder that named **dist**.
 
 <img src="images/azure-publish-angular-publish-angular.png">
 

docs/en/Change-Logs.md

@@ -6,6 +6,19 @@ jQuery and ASP.NET Core + Angular versions beginning from v4.1. See
 
 The change logs in this page are just a summary of major changes. Detailed release notes are shared on the GitHub repository (only available to the customers).
 
+## 8.8.0 (2020-05-22)
+
+* Social login settings per tenant (Mvc project).
+* Azure Key Vault support.
+* Upgraded to ABP v5.8.
+* Enhancements and bug fixes.
+
+## 8.7.0 (2020-05-07)
+
+* Added Non-Modal CRUD pages generation to Power Tools.
+* Upgraded to ABP v5.7. 
+* Enhancements and bug fixes.
+
 ## 8.6.0 (2020-04-20)
 
 * Upgraded to ABP v5.6.

docs/en/Deleting-A-Metronic-Theme-Mvc-Core.md

@@ -12,6 +12,7 @@ Metronic theme currently has 12 different themes and AspNet Zero includes them a
   * Go to **Areas -> AppAreaName-> Views **folder
     * Go to **Layout** folder
       * Open `_ThemeSelectionPanel.cshtml` and delete Theme2 related code parts
+      * Delete ```Theme2/_Layout.cshtml``` file.
     * Go to **UICustomization** folder
       * Delete `_Theme2Settings.cshtml`	
       * Open `Index.cshml` and delete Theme2 code parts

docs/en/Deployment-Angular-Publish-Azure.md

@@ -96,7 +96,7 @@ The details will be explained in the next lines. Here are the quick steps to pub
 
 ### Prepare The Publish Folder
 
-Run the `yarn` command to restore packages and run the `ng build --prod` to create publish folder that named **dist**.
+Run the `yarn` command to restore packages and run the `npm run publish` to create publish folder that named **dist**.
 
 <img src="images/azure-publish-angular-publish-angular.png">
 

docs/en/Deployment-Angular-Publish-IIS.md

@@ -25,13 +25,15 @@ Publishing ASP.NET Zero Host project is no different to any other ASP.NET Core A
 
 <img src="images/iis-core-publish-configure-app-pool.png">
 
+The project contains a `web.config` file, its contents may be changed during development, please check the` web.config` file after publishing, especially the `ASPNETCORE_ENVIRONMENT` setting.
+
 Check [Host ASP.NET Core on Windows with IIS](https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/iis/index?view=aspnetcore-2.1) document for more detail.
 
 ## Angular Application Publishing
 
 We are using angular-cli for development & deployment. Angular CLI has it's own build command that can be used to build your application:
 
-- Run `ng build --prod`. This command uses dist folder as output. 
+- Run `npm run publish`. This command uses dist folder as output. 
 - Change `assets/appconfig.production.json` file with your own configuration.
 - After ng build command, dist folder contains all necessary files to create a web site under IIS. (For example: copy files from `\*.dist` to `C:\inetpub\wwwroot\angularwebsite`).
 

docs/en/Deployment-Angular.md

@@ -9,7 +9,7 @@ For example: Move files in `.Host/wwwroot/dist` to `C:\inetpub\wwwroot\my-websit
 We are using [angular-cli](https://cli.angular.io/) for development & deployment. Angular CLI has it's own build command that can be used to build your application:
 
 ```
-ng build --prod
+npm run publish
 ```
 
 This command uses **dist** folder as output. Just remember to change **assets/appconfig.json** file with your own configuration.

docs/en/Deployment-Mvc-Core-Azure.md

@@ -83,7 +83,7 @@ Following screen will be shown:
 
 Select "**azure-publish-demo-server**" and click "**OK**", then click "**Publish**" button. **Web.Mvc** application is live now:
 
-<img src="images/azure-publish-core-mvc-ui-admin.png">
+<img src="images/azure-publish-core-mvc-ui-admin-2.png">
 
 ## Publish Public Website to The Azure
 
@@ -97,8 +97,6 @@ The details will be explained in the next lines. Here are the quick steps to pub
 
 Run the **npm run build** command to create js and css bundles.
 
-<img src="images/azure-publish-core-mvc-bundle-public.png">
-
 ### Configure the appsettings.production.json
 
 Azure is using **appsettings.production.json** that is placed in the **Web.Public**, so this file should be configured like following:

docs/en/Deployment-Mvc-Core-IIS.md

@@ -24,6 +24,8 @@ Publishing ASP.NET Zero Core MVC project is no different to any other ASP.NET Co
 <img src="images/iis-core-publish-configure-app-pool.png">
 
 
+The project contains a `web.config` file, its contents may be changed during development, please check the` web.config` file after publishing, especially the `ASPNETCORE_ENVIRONMENT` setting.
+
 For instructions on how to install the ASP.NET Core Module, see [Install the .NET Core Hosting Bundle](https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/iis/index?view=aspnetcore-2.1#install-the-net-core-hosting-bundle).
 
 For more information see [Host ASP.NET Core on Windows with IIS](https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/iis/index?view=aspnetcore-2.1) document

docs/en/Developing-Step-By-Step-Angular-Creating-PhoneBook-Component.md

@@ -40,15 +40,15 @@ As we declared in **phonebook.component.ts** we should create a
 <div [@routerTransition]>
     <div class="kt-content  kt-grid__item kt-grid__item--fluid kt-grid kt-grid--hor">
         <div class="kt-subheader kt-grid__item">
-            <div class="kt-container ">
+            <div [class]="containerClass">
                 <div class="kt-subheader__main">
                     <h3 class="kt-subheader__title">
                         <span>{{"PhoneBook" | localize}}</span>
                     </h3>
                 </div>
             </div>
         </div>
-        <div class="kt-container kt-grid__item kt-grid__item--fluid">
+        <div [class]="containerClass + ' kt-grid__item kt-grid__item--fluid'"
             <div class="kt-portlet kt-portlet--mobile">
                 <div class="kt-portlet__body  kt-portlet__body--fit">
                     <p>PHONE BOOK CONTENT COMES HERE!</p>
@@ -109,4 +109,4 @@ any changes made to any file in the application.
 
 ## Next
 
-- [Creating Person Entity](Developing-Step-By-Step-Angular-Creating-Person-Entity)
+- [Creating Person Entity](Developing-Step-By-Step-Angular-Creating-Person-Entity)

docs/en/Development-Mvc-Core-Docker.md

@@ -0,0 +1,64 @@
+# Development with Docker Containers for MVC
+
+ASP.NET Zero **Web** solution has a **docker folder** which contains various docker projects for your application  to debug for your preferences. 
+
+<img src="images/development-docker-mvc/docker-projects-folder-core-mvc.png" alt="docker-projects-folder-core-mvc" style="zoom:150%;" />
+
+To get started with using docker for development, there are some prerequisites.
+
+### 1. Setting up the infrastructure
+
+Infrastructure contains **mssql-server-linux** as a replacement for your LocalDb and **redis** server for your applications.
+
+In your `aspnet-core\docker\infrastructure\` folder, you will find **run-infrastructure.ps1** file which uses **docker-compose.infrastructure.yml** file to setup your infrastructure. Running the shell script should have a similar output like below.
+
+<img src="images/development-docker-mvc/docker-infrastructure-run.png" alt="docker-infrastructure-run"/>
+
+After running the script, powershell will be hanging (non interactive) for you to see if there is any error occurred while creating the containers. You can use **Ctrl + X** to exit tailing the database logging to make the powershell interactive again.
+
+### 2. Setting up the self-signed certificate
+
+Your applications need certificate to enable https. Normally Visual Studio creates this certificate for you when you run your application for the first time however sometimes it doesn't when docker is involved. To overcome the issue, we create our own self-signed certificate for development.
+
+In your `aspnet-core\docker\certificate\` folder, you will find **create-certificate.ps1** file to create the certificate. After running the shell script, you should have a similar output like below.
+<img src="images/development-docker-mvc/docker-create-dev-certificate.png" alt="docker-create-dev-certificate"/>
+
+### 3. Running the migrator
+
+In your `aspnet-core\docker\migrator\` folder, you will find **run-migrator** file to apply migrations for your application. Running the shell script should have a similar output like below.
+
+<img src="images/development-docker-mvc/docker-migrate.png" alt="docker-migrate"/>
+
+
+
+## Running applications on containers
+
+In your applications **.Web** solution under **docker folder**, set as startup project you want to debug. Visual studio will instantly begin building the container. **Building containers may take some time** for the first time since it will be downloading required base images.
+
+Below you can see **docker-compose-mvc** debugging:
+
+<img src="images/development-docker-mvc/docker-mvc-running.png" alt="docker-mvc-running"  style="zoom:100%;" />
+
+There are three docker solutions you can set as startup project to run;
+
+1. **docker-compose-host:** Runs Web.Host project.
+2. **docker-compose-mvc:** Runs only Web.Mvc project.
+3. **docker-compose-public:** Runs Web.Mvc and Web.Public projects together.
+
+Each docker-compose files have override.yml files to set the other environments like certification information, docker volumes or AspnetCore environment.
+
+<img src="images/development-docker-mvc/docker-override-configuration.png" alt="docker-override-configuration"  style="zoom:100%;" />
+
+Configuration is separated between **docker development** and default **IIS development**. 
+
+If you want to change the default connection string when running on containers; you need to change the environment variable **ConnectionStrings__Default** in corresponding **docker-compose.yml** shown below:
+
+<img src="images/development-docker-mvc/docker-cs-configuration.png" alt="docker-cs-configuration"  style="zoom:100%;" />
+
+This environment variable overrides the connection string which has been set in appsettings.json. This way you can use both development environments without mixing up the configurations.
+
+In some cases, you may get **container conflict errors** when switching between docker projects; like debugging **docker-compose-mvc** first then start debugging **docker-compose-public** after stopping the first one.
+
+<img src="images/development-docker-mvc/docker-container-conflict.png" alt="docker-cs-configuration"  style="zoom:100%;" />
+
+This occurs because the mvc container is still alive even if you stop debugging. To avoid container conflicts, you need to **Clean** the solution (right click to docker project and clean option) to remove the container completely before running the **docker-compose-public** which uses common containers like mvc container.

docs/en/Feature-Dynamic-Entity-Parameters-Custom-Input-Types-Angular.md

@@ -1,5 +1,3 @@
-
-
 # Create Custom Input Types
 
 In this document we will create a custom input type step by step. Our input type is multi-select combobox input type.
@@ -132,4 +130,4 @@ In this document we will create a custom input type step by step. Our input type
 
 All done. Your custom input type is ready to use in dynamic parameter. Create new dynamic parameter which uses that input type, add it to an entity. Then you can go to manage page and use it. 
 
-![custom-input-type-multi-select-combobox-mvc](images\custom-input-type-multi-select-combobox-angular.png)
+![custom-input-type-multi-select-combobox-mvc](images/custom-input-type-multi-select-combobox-angular.png)

docs/en/Feature-Dynamic-Entity-Parameters-Custom-Input-Types-Mvc.md

@@ -1,5 +1,3 @@
-
-
 # Create Custom Input Types
 
 In this document we will create a custom input type step by step. Our input type is multi-select combobox input type.
@@ -35,7 +33,7 @@ In this document we will create a custom input type step by step. Our input type
 
 4. Go to `*.Web.Mvc\wwwroot\view-resources\Areas\AppAreaName\Views\Common\IInputTypes\` folder
 
-5. Create new javascript file named `MultiSelectComboboxInputType.js` and fill required functions.
+5. Create new JavaScript file named `MultiSelectComboboxInputType.js` and fill required functions.
 
    ```javascript
    var MultiSelectComboBoxInputType = (function () {
@@ -84,7 +82,7 @@ In this document we will create a custom input type step by step. Our input type
                init: init,
                getSelectedValues: getSelectedValues,
                getView: getView,
-               hasValues: true,//is that input type need values to work. For example dropdown need values to select.
+               hasValues: true, // is that input type need values to work. For example dropdown need values to select.
                afterViewInitialized: afterViewInitialized
            };
        };
@@ -131,6 +129,7 @@ In this document we will create a custom input type step by step. Our input type
            <td>The function that manager will trigger after view initialized.</td>
        </tr>
    </tbody>
+   </table>
 
 6. Create `MultiSelectComboBoxInputTypeProvider` that create new input type object for each request. Then add that provider to `abp.inputTypeProviders`
 
@@ -148,4 +147,4 @@ In this document we will create a custom input type step by step. Our input type
 
 All done. Your custom input type is ready to use in dynamic parameter. Create new dynamic parameter which uses that input type, add it to an entity. Then you can go to manage page and use it. 
 
-![custom-input-type-multi-select-combobox-mvc](images\custom-input-type-multi-select-combobox-mvc.png)
+![custom-input-type-multi-select-combobox-mvc](images/custom-input-type-multi-select-combobox-mvc.png)

docs/en/Features-Angular-Host-Dashboard.md

@@ -3,7 +3,7 @@
 Host dashboard is used to show some statistics about tenants, editions
 and income:
 
-<img src="images/host-dashboardv5.png" alt="Host dashboard" class="img-thumbnail"/>
+<img src="images/host-dashboardV5.png" alt="Host dashboard" class="img-thumbnail"/>
 
 This is a fully implemented dashboard except two sample statistics (sample statistics 1 & 2) those are placeholders for your own statistics.
 

docs/en/images/azure-publish-core-mvc-ui-admin-2.png

@@ -513,6 +513,10 @@
             {
               "text": "Converting Create & Edit Modals to MVC Pages",
               "path": "Converting-Create-Edit-Modal-To-Page-Mvc-Core.md"
+            },
+			{
+              "text": "Development with Docker Containers",
+              "path": "Development-Mvc-Core-Docker.md"
             }
           ]
         },