From 900c6adff91a13825406fda6a062c666f5e606c6 Mon Sep 17 00:00:00 2001 From: Isaac Levin Date: Mon, 8 Jul 2019 14:46:07 -0400 Subject: [PATCH] changes to wasm template per Dan Roth --- .../.template.config.src/vs-2017.3.host.json | 30 --------- .../BlazorHosted-CSharp.sln | 64 ------------------- .../BlazorHosted-CSharp/Client/_Imports.razor | 12 ---- .../.template.config.src/template.json | 2 +- .../.template.config.src/vs-2017.3.host.json | 6 +- .../Client/BlazorWasm-CSharp.Client.csproj | 2 +- .../Client/Pages/Counter.razor | 2 +- .../Client/Shared/NavMenu.razor | 2 +- .../BlazorWasm-CSharp/Client/_Imports.razor | 3 +- 9 files changed, 9 insertions(+), 114 deletions(-) delete mode 100644 src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/vs-2017.3.host.json delete mode 100644 src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln delete mode 100644 src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/_Imports.razor diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/vs-2017.3.host.json b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/vs-2017.3.host.json deleted file mode 100644 index ebac4f6f55..0000000000 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/vs-2017.3.host.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/vs-2017.3.host", - "name": { - "text": "Blazor (ASP.NET Core hosted)", - "id": "1050" - }, - "description": { - "text": "A project template for creating a Blazor application that runs on WebAssembly and is hosted on an ASP.NET Core server.", - "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", - "id": "1051" - }, - "order": 610, - "icon": "icon.png", - "learnMoreLink": "https://github.com/aspnet/blazor", - "uiFilters": [ - "oneaspnet" - ], - "additionalWizardParameters": { - "$isMultiProjectTemplate$": "true" - }, - "symbolInfo": [ - { - "id": "Hosted", - "name": { - "text": "_Hosted" - }, - "isVisible": "true" - } - ] -} diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln deleted file mode 100644 index e8041a05a8..0000000000 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln +++ /dev/null @@ -1,64 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Server", "Server\BlazorHosted-CSharp.Server.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Client", "Client\BlazorHosted-CSharp.Client.csproj", "{5990939C-7E7B-4CFA-86FF-44CA5756498A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Shared", "Shared\BlazorHosted-CSharp.Shared.csproj", "{0AFFA7FD-4E37-4636-AB91-3753E746DB98}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5990939C-7E7B-4CFA-86FF-44CA5756498A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5990939C-7E7B-4CFA-86FF-44CA5756498A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5990939C-7E7B-4CFA-86FF-44CA5756498A}.Debug|x64.ActiveCfg = Debug|Any CPU - {5990939C-7E7B-4CFA-86FF-44CA5756498A}.Debug|x64.Build.0 = Debug|Any CPU - {5990939C-7E7B-4CFA-86FF-44CA5756498A}.Debug|x86.ActiveCfg = Debug|Any CPU - {5990939C-7E7B-4CFA-86FF-44CA5756498A}.Debug|x86.Build.0 = Debug|Any CPU - {5990939C-7E7B-4CFA-86FF-44CA5756498A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5990939C-7E7B-4CFA-86FF-44CA5756498A}.Release|Any CPU.Build.0 = Release|Any CPU - {5990939C-7E7B-4CFA-86FF-44CA5756498A}.Release|x64.ActiveCfg = Release|Any CPU - {5990939C-7E7B-4CFA-86FF-44CA5756498A}.Release|x64.Build.0 = Release|Any CPU - {5990939C-7E7B-4CFA-86FF-44CA5756498A}.Release|x86.ActiveCfg = Release|Any CPU - {5990939C-7E7B-4CFA-86FF-44CA5756498A}.Release|x86.Build.0 = Release|Any CPU - {650B3CE7-2E93-4CC4-9F46-466686815EAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {650B3CE7-2E93-4CC4-9F46-466686815EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {650B3CE7-2E93-4CC4-9F46-466686815EAA}.Debug|x64.ActiveCfg = Debug|Any CPU - {650B3CE7-2E93-4CC4-9F46-466686815EAA}.Debug|x64.Build.0 = Debug|Any CPU - {650B3CE7-2E93-4CC4-9F46-466686815EAA}.Debug|x86.ActiveCfg = Debug|Any CPU - {650B3CE7-2E93-4CC4-9F46-466686815EAA}.Debug|x86.Build.0 = Debug|Any CPU - {650B3CE7-2E93-4CC4-9F46-466686815EAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {650B3CE7-2E93-4CC4-9F46-466686815EAA}.Release|Any CPU.Build.0 = Release|Any CPU - {650B3CE7-2E93-4CC4-9F46-466686815EAA}.Release|x64.ActiveCfg = Release|Any CPU - {650B3CE7-2E93-4CC4-9F46-466686815EAA}.Release|x64.Build.0 = Release|Any CPU - {650B3CE7-2E93-4CC4-9F46-466686815EAA}.Release|x86.ActiveCfg = Release|Any CPU - {650B3CE7-2E93-4CC4-9F46-466686815EAA}.Release|x86.Build.0 = Release|Any CPU - {0AFFA7FD-4E37-4636-AB91-3753E746DB98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AFFA7FD-4E37-4636-AB91-3753E746DB98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AFFA7FD-4E37-4636-AB91-3753E746DB98}.Debug|x64.ActiveCfg = Debug|Any CPU - {0AFFA7FD-4E37-4636-AB91-3753E746DB98}.Debug|x64.Build.0 = Debug|Any CPU - {0AFFA7FD-4E37-4636-AB91-3753E746DB98}.Debug|x86.ActiveCfg = Debug|Any CPU - {0AFFA7FD-4E37-4636-AB91-3753E746DB98}.Debug|x86.Build.0 = Debug|Any CPU - {0AFFA7FD-4E37-4636-AB91-3753E746DB98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AFFA7FD-4E37-4636-AB91-3753E746DB98}.Release|Any CPU.Build.0 = Release|Any CPU - {0AFFA7FD-4E37-4636-AB91-3753E746DB98}.Release|x64.ActiveCfg = Release|Any CPU - {0AFFA7FD-4E37-4636-AB91-3753E746DB98}.Release|x64.Build.0 = Release|Any CPU - {0AFFA7FD-4E37-4636-AB91-3753E746DB98}.Release|x86.ActiveCfg = Release|Any CPU - {0AFFA7FD-4E37-4636-AB91-3753E746DB98}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {4C26868E-5E7C-458D-82E3-040509D0C71F} - EndGlobalSection -EndGlobal diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/_Imports.razor b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/_Imports.razor deleted file mode 100644 index 5fda72156f..0000000000 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/_Imports.razor +++ /dev/null @@ -1,12 +0,0 @@ -@using System.Net.Http -@using Microsoft.AspNetCore.Components.Forms -@using Microsoft.AspNetCore.Components.Layouts -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.JSInterop -@*#if (!Hosted) -@using BlazorHosted_CSharp -@using BlazorHosted_CSharp.Shared -#else -@using BlazorHosted_CSharp.Client -@using BlazorHosted_CSharp.Client.Shared -#endif*@ diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/.template.config.src/template.json b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/.template.config.src/template.json index a5654c18e4..96d177267c 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/.template.config.src/template.json +++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/.template.config.src/template.json @@ -36,7 +36,7 @@ { "condition": "(Hosted && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", "path": "Shared/BlazorWasm-CSharp.Shared.csproj" - } + } ], "shortName": "blazorwasm", "sourceName": "BlazorWasm-CSharp", diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/.template.config.src/vs-2017.3.host.json b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/.template.config.src/vs-2017.3.host.json index 4d0b04c1b3..ebac4f6f55 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/.template.config.src/vs-2017.3.host.json +++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/.template.config.src/vs-2017.3.host.json @@ -1,11 +1,11 @@ { "$schema": "http://json.schemastore.org/vs-2017.3.host", "name": { - "text": "Blazor WebAssembly App", + "text": "Blazor (ASP.NET Core hosted)", "id": "1050" }, "description": { - "text": "A project template for creating a Blazor app that runs on WebAssembly and is optionally hosted by an ASP.NET Core app. This template can be used for web apps with rich dynamic user interfaces (UIs).", + "text": "A project template for creating a Blazor application that runs on WebAssembly and is hosted on an ASP.NET Core server.", "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", "id": "1051" }, @@ -22,7 +22,7 @@ { "id": "Hosted", "name": { - "text": "ASP.NET Core _hosted" + "text": "_Hosted" }, "isVisible": "true" } diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj index 73fa0df28d..7731652b3c 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj +++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Pages/Counter.razor b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Pages/Counter.razor index 1360f9eb12..59c0d242c3 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Pages/Counter.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Pages/Counter.razor @@ -4,7 +4,7 @@

Current count: @currentCount

- + @code { int currentCount = 0; diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/NavMenu.razor b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/NavMenu.razor index a773afbc9e..6faa573fbf 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/NavMenu.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/NavMenu.razor @@ -5,7 +5,7 @@ -
+
  • 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 87ceeb5d5c..36ae36003a 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,5 +1,6 @@ -@using System.Net.Http +@using System.Net.Http @using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Layouts @using Microsoft.AspNetCore.Components.Routing @using Microsoft.JSInterop @*#if (!Hosted)