Rename Blazor Templates(#10348) by isaacrlevin · Pull Request #11550 · dotnet/aspnetcore

isaacrlevin · 2019-06-25T15:36:25Z

Summary of the changes (Less than 80 chars)

Rename RazorComponents project to blazorserver
Rename Standalone Blazor project to blazorwasm with option --host that will add ASP.NET Core hosted backend

Addresses #10348, #11700

isaacrlevin · 2019-06-25T15:36:58Z

@danroth27 here is the ServerSide rename work, blocked on wasm template

ryanbrandenburg · 2019-06-26T18:00:48Z

@aspnet-hello triage https://dev.azure.com/dnceng/public/_build/results?buildId=238021

aspnet-hello · 2019-06-26T18:02:58Z

This comment was made automatically. If there is a problem contact aspnetcore-build@microsoft.com.

I've triaged the above build. I've created/commented on the following issue(s)
https://github.com/aspnet/AspNetCore-Internal/issues/2718

isaacrlevin · 2019-07-01T13:58:44Z

@danroth27 here are the client-side updates. Will need a review on my approach with templates, but they build and work.

isaacrlevin · 2019-07-01T14:54:32Z

@phenning one thing that I may need some help with is moving the contents of a folder up one level using the template engine

ryanbrandenburg · 2019-07-01T17:13:15Z

@isaac2004 looks like this will be good to go once we get a review from @danroth27 and a rebase to solve these conflicts.

...mponents/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/template.json

src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/Pages/FetchData.razor

.../Blazor/Templates/src/content/BlazorHosted-CSharp/Server/Controllers/SampleDataController.cs

...ponents/Blazor/Templates/src/content/BlazorLibrary-CSharp/.template.config.src/template.json

...lazor/Templates/src/content/BlazorStandalone-CSharp/.template.config.src/dotnetcli.host.json

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

src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/Counter.razor

src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Hosted-CSharp.sln

danroth27

Looking good, @isaac2004! Thanks for contributing all this work!

We need to figure out if we can get rid of the "Client" folder and solution file when hosted isn't specified. @phenning ?

...mponents/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/template.json

src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Hosted-CSharp.sln

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

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

isaacrlevin · 2019-07-01T20:28:48Z

fixed some js reference issues per #11700

...ojectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml

...mponents/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/template.json

isaacrlevin · 2019-07-08T16:28:15Z

@ryanbrandenburg @danroth27 worked with @phenning to complete the authoring work. Templates are working through CLI and VS (including 16.3.1 option work). Can you and possibly @SteveSandersonMS review the template themselves?

@ryanbrandenburg also let me know if there are merge conflicts I need to do on my side, I moved the above files so there are conflicts that I manually added

ryanbrandenburg · 2019-07-08T17:38:03Z

I can't resolve these merge conflicts from the UI. When possible please resolve any merge conflicts you're aware of as it seems that the UI is pretty picky about what it will allow and not having push access to your fork makes it impossible to for me to resolve them on this PR.

isaacrlevin · 2019-07-08T17:51:46Z

@ryanbrandenburg resolved the merge on my side. Should be good if it passes tests and review

danroth27

Looks really good! Thanks for doing all this work! Just a few comments.

...mponents/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/template.json

...ts/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/BlazorHosted-CSharp.Client.csproj

src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/Pages/Counter.razor

src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/Shared/NavMenu.razor

isaacrlevin · 2019-07-08T18:46:38Z

@danroth27 changes complete

isaacrlevin · 2019-07-08T18:51:20Z

On a side note, the following docs will need to be updated after merging

https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/blazor/client-side?view=aspnetcore-3.0
https://docs.microsoft.com/en-us/aspnet/core/blazor/hosting-models?view=aspnetcore-3.0
https://docs.microsoft.com/en-us/aspnet/core/blazor/get-started?view=aspnetcore-3.0&tabs=visual-studio
https://docs.microsoft.com/en-us/aspnet/core/security/blazor/?view=aspnetcore-3.0&tabs=visual-studio

danroth27

A couple more small things. Otherwise looks good!

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

...ents/Blazor/Templates/src/content/BlazorWasm-CSharp/.template.config.src/vs-2017.3.host.json

...tes/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/vs-2017.3.host.json

isaacrlevin · 2019-07-08T19:27:05Z

@phenning can you confirm the vs template shows the Hosted option after Dan's requested changes?

danroth27

Looks good to me.

danroth27 · 2019-07-08T19:56:40Z

...onents/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj

Fix indentation?

isaacrlevin · 2019-07-09T14:09:17Z

@danroth27 can you confirm the VS dialog is what you want

…Web-CSharp/.template.config/template.json Co-Authored-By: Ryan Brandenburg <rybrande@microsoft.com>

…Web-CSharp/Shared/NavMenu.razor Co-Authored-By: Daniel Roth <daroth@microsoft.com>

This reverts commit 6803969.

This reverts commit a1fd2cc.

…Web-CSharp/.template.config/template.json Co-Authored-By: Daniel Roth <daroth@microsoft.com>

….template.config.src/vs-2017.3.host.json Co-Authored-By: Daniel Roth <daroth@microsoft.com>

…Web-CSharp/Shared/NavMenu.razor Co-Authored-By: Daniel Roth <daroth@microsoft.com>

isaacrlevin · 2019-07-12T20:44:43Z

@danroth27 party time!

isaacrlevin requested a review from ryanbrandenburg as a code owner June 25, 2019 15:36

Eilon added the area-blazor Includes: Blazor, Razor Components label Jun 25, 2019

isaacrlevin requested a review from SteveSandersonMS as a code owner July 1, 2019 13:57

isaacrlevin changed the title ~~Rename Blazor Templates~~ Rename Blazor Templates(#10348) Jul 1, 2019

ryanbrandenburg requested a review from danroth27 July 1, 2019 17:03

ryanbrandenburg suggested changes Jul 1, 2019

View reviewed changes

ryanbrandenburg reviewed Jul 1, 2019

View reviewed changes

src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Hosted-CSharp.sln Outdated Show resolved Hide resolved

danroth27 requested changes Jul 1, 2019

View reviewed changes

ryanbrandenburg reviewed Jul 1, 2019

View reviewed changes

...ojectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml Outdated Show resolved Hide resolved

danroth27 requested changes Jul 1, 2019

View reviewed changes

...mponents/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/template.json Show resolved Hide resolved

ryanbrandenburg approved these changes Jul 8, 2019

View reviewed changes

danroth27 requested changes Jul 8, 2019

View reviewed changes

danroth27 approved these changes Jul 8, 2019

View reviewed changes

...onents/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj Outdated

Copy link

Member

danroth27 Jul 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix indentation?

This was referenced Jul 8, 2019

Update documentation to reflect new Blazor template names dotnet/docs#13285

Closed

[Preview 8] Update documentation to reflect new Blazor template names dotnet/AspNetCore.Docs#13200

Closed

isaacrlevin and others added 26 commits July 12, 2019 08:48

rename RazorComponents project

6c963a8

updates to blazorwasm

df316e3

Rename RazorComponents template directory to BlazorServer

276fbd7

Update src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServer…

8f207cc

…Web-CSharp/.template.config/template.json Co-Authored-By: Ryan Brandenburg <rybrande@microsoft.com>

Update src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServer…

49fe663

…Web-CSharp/Shared/NavMenu.razor Co-Authored-By: Daniel Roth <daroth@microsoft.com>

added Error page to Server Blazor

3b88d2a

Revert "added Error page to Server Blazor"

2a24ab8

This reverts commit 6803969.

Revert "pointed all js references to minified version per 11700"

7a435bc

This reverts commit a1fd2cc.

Update src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServer…

3243df1

…Web-CSharp/.template.config/template.json Co-Authored-By: Daniel Roth <daroth@microsoft.com>

Update src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServer…

264b11c

…Web-CSharp/.template.config/template.json Co-Authored-By: Daniel Roth <daroth@microsoft.com>

completed hosted template work

5b254a9

update to server-side blazor csproj

3a37455

updates to blazorwasm

ceecc98

remove test configs

592bb68

changes to wasm template per Dan Roth

900c6ad

update VS template title

23ba4c0

Update src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/…

c070e25

….template.config.src/vs-2017.3.host.json Co-Authored-By: Daniel Roth <daroth@microsoft.com>

Update src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServer…

a4543ff

…Web-CSharp/Shared/NavMenu.razor Co-Authored-By: Daniel Roth <daroth@microsoft.com>

Updated name

ae4dffa

Update vs-2017.3.host.json

3dd8552

Update _Imports.razor

48371c2

Update vs-2017.3.host.json

fba8683

add BOM

320c08c

fix baseline missing files

520f856

remove redundant files

df360cd

fix failed tests

ea63490

isaacrlevin requested a review from a team as a code owner July 12, 2019 18:12

ryanbrandenburg merged commit fb5da88 into dotnet:master Jul 12, 2019

isaacrlevin deleted the 10348-work branch July 12, 2019 21:15

Comments

Conversation

isaacrlevin commented Jun 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

isaacrlevin commented Jun 25, 2019

Uh oh!

ryanbrandenburg commented Jun 26, 2019

Uh oh!

aspnet-hello commented Jun 26, 2019

Uh oh!

isaacrlevin commented Jul 1, 2019

Uh oh!

isaacrlevin commented Jul 1, 2019

Uh oh!

ryanbrandenburg commented Jul 1, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

danroth27 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

isaacrlevin commented Jul 1, 2019

Uh oh!

Uh oh!

Uh oh!

isaacrlevin commented Jul 8, 2019

Uh oh!

ryanbrandenburg commented Jul 8, 2019

Uh oh!

isaacrlevin commented Jul 8, 2019

Uh oh!

danroth27 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

isaacrlevin commented Jul 8, 2019

Uh oh!

isaacrlevin commented Jul 8, 2019

Uh oh!

danroth27 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

isaacrlevin commented Jul 8, 2019

Uh oh!

danroth27 left a comment

Choose a reason for hiding this comment

Uh oh!

danroth27 Jul 8, 2019

Choose a reason for hiding this comment

Uh oh!

isaacrlevin commented Jul 9, 2019

Uh oh!

isaacrlevin commented Jul 12, 2019

Uh oh!

Reviewers

Assignees

Labels

isaacrlevin commented Jun 25, 2019 •

edited

Loading