From 320c08cd8669852c96cf5c639a2b3fa712acb1eb Mon Sep 17 00:00:00 2001 From: Isaac Levin Date: Thu, 11 Jul 2019 13:14:53 -0400 Subject: [PATCH] add BOM --- .../src/content/BlazorWasm-CSharp/Client/_Imports.razor | 2 +- .../content/BlazorServerWeb-CSharp/Pages/FetchData.razor | 6 +----- .../content/BlazorServerWeb-CSharp/Pages/_Host.cshtml | 5 ----- .../content/BlazorServerWeb-CSharp/Shared/NavMenu.razor | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/_Imports.razor b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/_Imports.razor index a2adb31793..87ceeb5d5c 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/_Imports.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/_Imports.razor @@ -1,4 +1,4 @@ -@using System.Net.Http +@using System.Net.Http @using Microsoft.AspNetCore.Components.Forms @using Microsoft.AspNetCore.Components.Routing @using Microsoft.JSInterop diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor index 839ae4c1df..0aebdbf3b3 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor @@ -1,10 +1,6 @@ -<<<<<<< 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

Weather forecast

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml index 5bb8cc9dc2..183e8c97c6 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml @@ -1,10 +1,5 @@ -<<<<<<< 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 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor index 73066cc4e8..595692bd30 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor @@ -1,4 +1,4 @@ -
+
BlazorServerWeb-CSharp