Skip to content

Commit a3ee229

Browse files
committed
Merge branch 'master' into dev
2 parents 32b9ab9 + 4b7b4fb commit a3ee229

25 files changed

+104
-23
lines changed

doc-obsolete/Development-Guide-Angular.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,9 +1089,9 @@ new tenant registration).
10891089

10901090
We are using [angular-cli](https://cli.angular.io/) for development &
10911091
deployment. Angular CLI has it's own build command that can be used to
1092-
build your application:
1092+
build your application. Below command uses Gulp and Angular CLI to build your application.
10931093

1094-
ng build --prod
1094+
npm run publish
10951095

10961096
This command uses **dist** folder as output. Just remember to change
10971097
**assets/appconfig.json** file with your own configuration.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Check [Host ASP.NET Core on Windows with IIS](https://docs.microsoft.com/en-us/a
2929

3030
We are using angular-cli for development & deployment. Angular CLI has it's own build command that can be used to build your application:
3131

32-
- Run `ng build --prod`. This command uses dist folder as output.
32+
- Run `npm run publish`. This command uses dist folder as output.
3333
- Change `assets/appconfig.production.json` file with your own configuration.
3434
- 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`).
3535

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ Select "**azure-publish-demo-server**" and click "**OK**", then click "**Publish
8383
The details will be explained in the next lines. Here are the quick steps to publish the **AngularUI** to the Azure
8484

8585
- Run the `yarn` command to restore packages
86-
- Run the `ng build --prod`
86+
- Run the `npm run publish`
8787
- Copy the web.config file that is placed in **angular** folder root to dist folder
8888
- Configure the **angular/dist/assets/appconfig.json**
8989
- Send the required files to the Azure
9090

9191
### Prepare The Publish Folder
9292

93-
Run the `yarn` command to restore packages and run the `ng build --prod` to create publish folder that named **dist**.
93+
Run the `yarn` command to restore packages and run the `npm run publish` to create publish folder that named **dist**.
9494

9595
<img src="images/azure-publish-angular-publish-angular.png">
9696

docs/en/Change-Logs.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,19 @@ jQuery and ASP.NET Core + Angular versions beginning from v4.1. See
66

77
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).
88

9+
## 8.8.0 (2020-05-22)
10+
11+
* Social login settings per tenant (Mvc project).
12+
* Azure Key Vault support.
13+
* Upgraded to ABP v5.8.
14+
* Enhancements and bug fixes.
15+
16+
## 8.7.0 (2020-05-07)
17+
18+
* Added Non-Modal CRUD pages generation to Power Tools.
19+
* Upgraded to ABP v5.7.
20+
* Enhancements and bug fixes.
21+
922
## 8.6.0 (2020-04-20)
1023

1124
* Upgraded to ABP v5.6.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Metronic theme currently has 12 different themes and AspNet Zero includes them a
1212
* Go to **Areas -> AppAreaName-> Views **folder
1313
* Go to **Layout** folder
1414
* Open `_ThemeSelectionPanel.cshtml` and delete Theme2 related code parts
15+
* Delete ```Theme2/_Layout.cshtml``` file.
1516
* Go to **UICustomization** folder
1617
* Delete `_Theme2Settings.cshtml`
1718
* Open `Index.cshml` and delete Theme2 code parts

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ The details will be explained in the next lines. Here are the quick steps to pub
9696

9797
### Prepare The Publish Folder
9898

99-
Run the `yarn` command to restore packages and run the `ng build --prod` to create publish folder that named **dist**.
99+
Run the `yarn` command to restore packages and run the `npm run publish` to create publish folder that named **dist**.
100100

101101
<img src="images/azure-publish-angular-publish-angular.png">
102102

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ Publishing ASP.NET Zero Host project is no different to any other ASP.NET Core A
2525

2626
<img src="images/iis-core-publish-configure-app-pool.png">
2727

28+
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.
29+
2830
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.
2931

3032
## Angular Application Publishing
3133

3234
We are using angular-cli for development & deployment. Angular CLI has it's own build command that can be used to build your application:
3335

34-
- Run `ng build --prod`. This command uses dist folder as output.
36+
- Run `npm run publish`. This command uses dist folder as output.
3537
- Change `assets/appconfig.production.json` file with your own configuration.
3638
- 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`).
3739

docs/en/Deployment-Angular.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ For example: Move files in `.Host/wwwroot/dist` to `C:\inetpub\wwwroot\my-websit
99
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:
1010

1111
```
12-
ng build --prod
12+
npm run publish
1313
```
1414

1515
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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Following screen will be shown:
8383

8484
Select "**azure-publish-demo-server**" and click "**OK**", then click "**Publish**" button. **Web.Mvc** application is live now:
8585

86-
<img src="images/azure-publish-core-mvc-ui-admin.png">
86+
<img src="images/azure-publish-core-mvc-ui-admin-2.png">
8787

8888
## Publish Public Website to The Azure
8989

@@ -97,8 +97,6 @@ The details will be explained in the next lines. Here are the quick steps to pub
9797

9898
Run the **npm run build** command to create js and css bundles.
9999

100-
<img src="images/azure-publish-core-mvc-bundle-public.png">
101-
102100
### Configure the appsettings.production.json
103101

104102
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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ Publishing ASP.NET Zero Core MVC project is no different to any other ASP.NET Co
2424
<img src="images/iis-core-publish-configure-app-pool.png">
2525

2626

27+
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.
28+
2729
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).
2830

2931
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

0 commit comments

Comments
 (0)