Rename RazorComponents template directory to BlazorServer

src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in

@@ -2,11 +2,16 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+<<<<<<< HEAD:src/ProjectTemplates/Web.ProjectTemplates/RazorComponentsWeb-CSharp.csproj.in
     <UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-RazorComponentsWeb_CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
+=======
+    <LangVersion>7.3</LangVersion>
+    <UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-BlazorServerWeb_CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
+>>>>>>> Rename RazorComponents template directory to BlazorServer:src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in
     <WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
     <WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
     <NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
-    <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">RazorComponentsWeb_CSharp</RootNamespace>
+    <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">BlazorServerWeb_CSharp</RootNamespace>
   </PropertyGroup>
 
   <!--#if (IndividualLocalAuth && !UseLocalDB) -->

src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj

@@ -35,7 +35,7 @@
     <GeneratedContent Include="EmptyWeb-CSharp.csproj.in" OutputPath="content/EmptyWeb-CSharp/Company.WebApplication1.csproj" />
     <GeneratedContent Include="EmptyWeb-FSharp.fsproj.in" OutputPath="content/EmptyWeb-FSharp/Company.WebApplication1.fsproj" />
     <GeneratedContent Include="GrpcService-CSharp.csproj.in" OutputPath="content/GrpcService-CSharp/GrpcService-CSharp.csproj" />
-    <GeneratedContent Include="RazorComponentsWeb-CSharp.csproj.in" OutputPath="content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.csproj" />
+    <GeneratedContent Include="BlazorServerWeb-CSharp.csproj.in" OutputPath="content/BlazorServerWeb-CSharp/BlazorServerWeb-CSharp.csproj" />
     <GeneratedContent Include="RazorPagesWeb-CSharp.csproj.in" OutputPath="content/RazorPagesWeb-CSharp/Company.WebApplication1.csproj" />
     <GeneratedContent Include="RazorClassLibrary-CSharp.csproj.in" OutputPath="content/RazorClassLibrary-CSharp/Company.RazorClassLibrary1.csproj" />
     <GeneratedContent Include="StarterWeb-CSharp.csproj.in" OutputPath="content/StarterWeb-CSharp/Company.WebApplication1.csproj" />

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json

@@ -17,7 +17,7 @@
     "language": "C#",
     "type": "project"
   },
-  "sourceName": "RazorComponentsWeb-CSharp",
+  "sourceName": "BlazorServerWeb-CSharp",
   "preferNameDirectory": true,
   "guids": [
     "09732173-2cef-46b7-83db-1334bcb079d3", // Tenant ID
@@ -233,8 +233,8 @@
     "UserSecretsId": {
       "type": "parameter",
       "datatype": "string",
-      "replaces": "aspnet-RazorComponentsWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502",
-      "defaultValue": "aspnet-RazorComponentsWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502",
+      "replaces": "aspnet-BlazorServerWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502",
+      "defaultValue": "aspnet-BlazorServerWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502",
       "description": "The ID to use for secrets (use with OrgReadAccess or Individual auth)."
     },
     "ExcludeLaunchSettings": {
@@ -361,7 +361,7 @@
   },
   "primaryOutputs": [
     {
-      "path": "RazorComponentsWeb-CSharp.csproj"
+      "path": "BlazorServerWeb-CSharp.csproj"
     }
   ],
   "defaultName": "WebApplication1",

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/ApplicationDbContext.cs

@@ -4,7 +4,7 @@ using System.Text;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
-namespace RazorComponentsWeb_CSharp.Data
+namespace BlazorServerWeb_CSharp.Data
 {
     public class ApplicationDbContext : IdentityDbContext
     {

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.Designer.cs

@@ -1,12 +1,12 @@
 // <auto-generated />
 using System;
-using RazorComponentsWeb_CSharp.Data;
+using BlazorServerWeb_CSharp.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-namespace RazorComponentsWeb_CSharp.Data.Migrations
+namespace BlazorServerWeb_CSharp.Data.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("00000000000000_CreateIdentitySchema")]

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.cs

@@ -1,7 +1,7 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace RazorComponentsWeb_CSharp.Data.Migrations
+namespace BlazorServerWeb_CSharp.Data.Migrations
 {
     public partial class CreateIdentitySchema : Migration
     {

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/SqlLite/ApplicationDbContextModelSnapshot.cs

@@ -1,11 +1,11 @@
 // <auto-generated />
 using System;
-using RazorComponentsWeb_CSharp.Data;
+using BlazorServerWeb_CSharp.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-namespace RazorComponentsWeb_CSharp.Data.Migrations
+namespace BlazorServerWeb_CSharp.Data.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     partial class ApplicationDbContextModelSnapshot : ModelSnapshot

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.Designer.cs

@@ -1,13 +1,13 @@
 // <auto-generated />
 using System;
-using RazorComponentsWeb_CSharp.Data;
+using BlazorServerWeb_CSharp.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-namespace RazorComponentsWeb_CSharp.Data.Migrations
+namespace BlazorServerWeb_CSharp.Data.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("00000000000000_CreateIdentitySchema")]

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.cs

@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace RazorComponentsWeb_CSharp.Data.Migrations
+namespace BlazorServerWeb_CSharp.Data.Migrations
 {
     public partial class CreateIdentitySchema : Migration
     {

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/SqlServer/ApplicationDbContextModelSnapshot.cs

@@ -1,12 +1,12 @@
 // <auto-generated />
 using System;
-using RazorComponentsWeb_CSharp.Data;
+using BlazorServerWeb_CSharp.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-namespace RazorComponentsWeb_CSharp.Data.Migrations
+namespace BlazorServerWeb_CSharp.Data.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     partial class ApplicationDbContextModelSnapshot : ModelSnapshot

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/WeatherForecast.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace RazorComponentsWeb_CSharp.Data
+namespace BlazorServerWeb_CSharp.Data
 {
     public class WeatherForecast
     {

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Data/WeatherForecastService.cs

@@ -2,7 +2,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace RazorComponentsWeb_CSharp.Data
+namespace BlazorServerWeb_CSharp.Data
 {
     public class WeatherForecastService
     {

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor

@@ -1,5 +1,10 @@
+<<<<<<< HEAD:src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor
 @page "/fetchdata"
 @using RazorComponentsWeb_CSharp.Data
+=======
+@page "/fetchdata"
+@using BlazorServerWeb_CSharp.Data
+>>>>>>> Rename RazorComponents template directory to BlazorServer:src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor
 @inject WeatherForecastService ForecastService
 
 <h1>Weather forecast</h1>

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml

@@ -1,5 +1,10 @@
+<<<<<<< HEAD:src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/_Host.cshtml
 @page "/"
 @namespace RazorComponentsWeb_CSharp.Pages
+=======
+@page "/"
+@namespace BlazorServerWeb_CSharp.Pages
+>>>>>>> Rename RazorComponents template directory to BlazorServer:src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 <!DOCTYPE html>
@@ -7,7 +12,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>RazorComponentsWeb-CSharp</title>
+    <title>BlazorServerWeb-CSharp</title>
     <base href="~/" />
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
     <link href="css/site.css" rel="stylesheet" />

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Program.cs

@@ -9,7 +9,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace RazorComponentsWeb_CSharp
+namespace BlazorServerWeb_CSharp
 {
     public class Program
     {

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Properties/launchSettings.json

@@ -24,7 +24,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "RazorComponentsWeb-CSharp": {
+    "BlazorServerWeb-CSharp": {
       "commandName": "Project",
       "launchBrowser": true,
       //#if(RequiresHttps)

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor

@@ -1,6 +1,12 @@
+<<<<<<< HEAD:src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/NavMenu.razor
 <div class="top-row pl-4 navbar navbar-dark">
     <a class="navbar-brand" href="">RazorComponentsWeb-CSharp</a>
     <button class="navbar-toggler" @onclick="ToggleNavMenu">
+=======
+<div class="top-row pl-4 navbar navbar-dark">
+    <a class="navbar-brand" href="">BlazorServerWeb-CSharp</a>
+    <button class="navbar-toggler" @onclick="@ToggleNavMenu">
+>>>>>>> Rename RazorComponents template directory to BlazorServer:src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor
         <span class="navbar-toggler-icon"></span>
     </button>
 </div>

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs

@@ -37,12 +37,16 @@ using Microsoft.Extensions.Hosting;
 #if(MultiOrgAuth)
 using Microsoft.IdentityModel.Tokens;
 #endif
+<<<<<<< HEAD:src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs
 #if (IndividualLocalAuth)
 using RazorComponentsWeb_CSharp.Areas.Identity;
 #endif
 using RazorComponentsWeb_CSharp.Data;
+=======
+using BlazorServerWeb_CSharp.Data;
+>>>>>>> Rename RazorComponents template directory to BlazorServer:src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs
 
-namespace RazorComponentsWeb_CSharp
+namespace BlazorServerWeb_CSharp
 {
     public class Startup
     {

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/_Imports.razor

@@ -3,5 +3,5 @@
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop
-@using RazorComponentsWeb_CSharp
-@using RazorComponentsWeb_CSharp.Shared
+@using BlazorServerWeb_CSharp
+@using BlazorServerWeb_CSharp.Shared

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/appsettings.json

@@ -25,7 +25,7 @@
 ////#if (IndividualLocalAuth)
 //  "ConnectionStrings": {
 ////#if (UseLocalDB)
-//    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-RazorComponentsWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502;Trusted_Connection=True;MultipleActiveResultSets=true"
+//    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-BlazorServerWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502;Trusted_Connection=True;MultipleActiveResultSets=true"
 ////#else
 //    "DefaultConnection": "DataSource=app.db"
 //#endif

src/ProjectTemplates/test/BlazorServerTemplateTest.cs

@@ -14,9 +14,9 @@ using Xunit.Abstractions;
 
 namespace Templates.Test
 {
-    public class RazorComponentsTemplateTest : BrowserTestBase
+    public class BlazorServerTemplateTest : BrowserTestBase
     {
-        public RazorComponentsTemplateTest(ProjectFactoryFixture projectFactory, BrowserFixture browserFixture, ITestOutputHelper output) : base(browserFixture, output)
+        public BlazorServerTemplateTest(ProjectFactoryFixture projectFactory, BrowserFixture browserFixture, ITestOutputHelper output) : base(browserFixture, output)
         {
             ProjectFactory = projectFactory;
         }
@@ -27,7 +27,7 @@ namespace Templates.Test
 
         [Fact]
         [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2407", FlakyOn.AzP.Windows)]
-        public async Task RazorComponentsTemplateWorks_NoAuth()
+        public async Task BlazorServerTemplateWorks_NoAuth()
         {
             Project = await ProjectFactory.GetOrCreateProject("blazorservernoauth", Output);
 
@@ -85,7 +85,7 @@ namespace Templates.Test
         [InlineData(true)]
         [InlineData(false)]
         [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2407", FlakyOn.AzP.Windows)]
-        public async Task RazorComponentsTemplateWorks_IndividualAuth(bool useLocalDB)
+        public async Task BlazorServerTemplateWorks_IndividualAuth(bool useLocalDB)
         {
             Project = await ProjectFactory.GetOrCreateProject("blazorserverindividual" + (useLocalDB ? "uld" : ""), Output);
 

src/ProjectTemplates/test/ItemTemplateTests/BlazorServerTests.cs

@@ -8,9 +8,9 @@ using Xunit.Abstractions;
 
 namespace Templates.Items.Test
 {
-    public class RazorComponentsTest
+    public class BlazorServerTest
     {
-        public RazorComponentsTest(ProjectFactoryFixture projectFactory, ITestOutputHelper output)
+        public BlazorServerTest(ProjectFactoryFixture projectFactory, ITestOutputHelper output)
         {
             ProjectFactory = projectFactory;
             Output = output;
@@ -22,7 +22,7 @@ namespace Templates.Items.Test
         public ITestOutputHelper Output { get; }
 
         [Fact]
-        public async Task RazorComponentsItemTemplate()
+        public async Task BlazorServerItemTemplate()
         {
             Project = await ProjectFactory.GetOrCreateProject("razorcomponentitem", Output);
 

src/ProjectTemplates/test/template-baselines.json

@@ -880,7 +880,7 @@
       ]
     }
   },
-  "razorcomponents": {
+  "blazorserver": {
     "Individual": {
       "Template": "blazorserver",
       "Arguments": "new blazorserver -au Individual",