Merge pull request #387 from aspnet/release/2.1

Move layout and partial script to Shared dir (#368)

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

@@ -38,16 +38,22 @@
         },
         {
           "condition": "(!OrganizationalAuth && !IndividualB2CAuth)",
+          "rename": {
+            "Pages/Shared/_LoginPartial.Identity.cshtml": "Pages/Shared/_LoginPartial.cshtml"
+          },
           "exclude": [
             "Controllers/**",
             "Pages/Account/**",
-            "Pages/_LoginPartial.cshtml"
+            "Pages/Shared/_LoginPartial.OrgAuth.cshtml"
           ]
         },
         {
           "condition": "(!IndividualLocalAuth)",
+          "rename": {
+            "Pages/Shared/_LoginPartial.OrgAuth.cshtml": "Pages/Shared/_LoginPartial.cshtml"
+          },
           "exclude": [
-            "Pages/Shared/_LoginPartial.cshtml"
+            "Pages/Shared/_LoginPartial.Identity.cshtml"
           ]
         },
         {
@@ -85,7 +91,7 @@
         {
           "condition": "(IndividualLocalAuth && UseLocalDB)",
           "rename": {
-            "Data/SqlServer/": "Data/Migrations/",
+            "Data/SqlServer/": "Data/Migrations/"
           },
           "exclude": [
             "Data/SqlLite/**"

src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Areas/Identity/Pages/_ViewStart.cshtml

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