Skip to content

Commit 64d366d

Browse files
authored
Merge pull request #1 from aspnetboilerplate/master
Sync Master
2 parents b76d562 + 087151c commit 64d366d

File tree

651 files changed

+85314
-7736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

651 files changed

+85314
-7736
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ obj/
66
bin/
77
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/App_Data/Logs/
88
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/App_Data/Logs/
9+
aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/Logs/Logs.txt

angular/.angular-cli.json

Lines changed: 0 additions & 113 deletions
This file was deleted.

angular/.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

angular/Web.config

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
4-
<!--
5-
Configure your application settings in appsettings.json. Learn more at http://go.microsoft.com/fwlink/?LinkId=786380
6-
-->
7-
83
<system.webServer>
9-
<handlers>
10-
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
11-
</handlers>
12-
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/>
4+
<staticContent>
5+
<remove fileExtension=".json" />
6+
<mimeMap fileExtension=".json" mimeType="application/json" />
7+
<mimeMap fileExtension="woff" mimeType="application/font-woff" />
8+
<mimeMap fileExtension="woff2" mimeType="application/font-woff" />
9+
</staticContent>
10+
<!-- IIS URL Rewrite for Angular routes -->
11+
<rewrite>
12+
<rules>
13+
<rule name="Angular Routes" stopProcessing="true">
14+
<match url=".*" />
15+
<conditions logicalGrouping="MatchAll">
16+
<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
17+
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
18+
<add input="{REQUEST_URI}" pattern="^/(api)" negate="true" />
19+
</conditions>
20+
<action type="Rewrite" url="/" />
21+
</rule>
22+
</rules>
23+
</rewrite>
1324
</system.webServer>
14-
</configuration>
25+
</configuration>

0 commit comments

Comments
 (0)