huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.1' into dev

This commit is contained in:
Javier Calvarro Nelson 2018-01-23 17:41:36 -08:00
parent eea0048d58 2269a31983
commit d3c8231ed3
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
View File

@ -56,7 +56,8 @@
{ {
"condition": "(!IndividualLocalAuth)", "condition": "(!IndividualLocalAuth)",
"exclude": [ "exclude": [
"Data/**" "Data/**",
"Areas/**"
] ]
}, },
{ {

3
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Areas/Identity/Pages/_ViewStart.cshtml Normal file
View File

@ -0,0 +1,3 @@
@{
Layout = "/Pages/_Layout.cshtml";
}

0
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/_CookieConsentPartial.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_CookieConsentPartial.cshtml
View File

3
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
View File

@ -49,7 +49,8 @@
{ {
"condition": "(!IndividualAuth)", "condition": "(!IndividualAuth)",
"exclude": [ "exclude": [
"Data/**" "Data/**",
"Areas/**"
] ]
}, },
{ {

3
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Areas/Identity/Pages/_ViewStart.cshtml Normal file
View File

@ -0,0 +1,3 @@
@{
Layout = "/Views/Shared/_Layout.cshtml";
}