Skip to content

Rename Blazor Templates(#10348) #11550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Jul 12, 2019
Merged

Rename Blazor Templates(#10348) #11550

merged 26 commits into from
Jul 12, 2019

Conversation

isaacrlevin
Copy link
Contributor

@isaacrlevin isaacrlevin commented Jun 25, 2019

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
Copy link
Contributor Author

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

@Eilon Eilon added the area-blazor Includes: Blazor, Razor Components label Jun 25, 2019
@ryanbrandenburg
Copy link
Contributor

@aspnet-hello
Copy link

This comment was made automatically. If there is a problem contact [email protected].

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

@isaacrlevin
Copy link
Contributor Author

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

@isaacrlevin
Copy link
Contributor Author

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

@isaacrlevin isaacrlevin changed the title Rename Blazor Templates Rename Blazor Templates(#10348) Jul 1, 2019
@ryanbrandenburg ryanbrandenburg requested a review from danroth27 July 1, 2019 17:03
@ryanbrandenburg
Copy link
Contributor

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

Copy link
Member

@danroth27 danroth27 left a comment

Choose a reason for hiding this comment

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

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 ?

@isaacrlevin
Copy link
Contributor Author

fixed some js reference issues per #11700

@isaacrlevin
Copy link
Contributor Author

@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
Copy link
Contributor

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
Copy link
Contributor Author

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

Copy link
Member

@danroth27 danroth27 left a comment

Choose a reason for hiding this comment

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

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

@isaacrlevin
Copy link
Contributor Author

@danroth27 changes complete

Copy link
Member

@danroth27 danroth27 left a comment

Choose a reason for hiding this comment

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

A couple more small things. Otherwise looks good!

@isaacrlevin
Copy link
Contributor Author

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

Copy link
Member

@danroth27 danroth27 left a comment

Choose a reason for hiding this comment

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

Looks good to me.

</ItemGroup>
<!--#endif -->
Copy link
Member

Choose a reason for hiding this comment

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

Fix indentation?

@isaacrlevin
Copy link
Contributor Author

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

image

isaacrlevin and others added 26 commits July 12, 2019 08:48
…Web-CSharp/.template.config/template.json

Co-Authored-By: Ryan Brandenburg <[email protected]>
…Web-CSharp/Shared/NavMenu.razor

Co-Authored-By: Daniel Roth <[email protected]>
…Web-CSharp/.template.config/template.json

Co-Authored-By: Daniel Roth <[email protected]>
…Web-CSharp/.template.config/template.json

Co-Authored-By: Daniel Roth <[email protected]>
….template.config.src/vs-2017.3.host.json

Co-Authored-By: Daniel Roth <[email protected]>
…Web-CSharp/Shared/NavMenu.razor

Co-Authored-By: Daniel Roth <[email protected]>
@isaacrlevin isaacrlevin requested a review from a team as a code owner July 12, 2019 18:12
@ryanbrandenburg ryanbrandenburg merged commit fb5da88 into dotnet:master Jul 12, 2019
@isaacrlevin
Copy link
Contributor Author

@danroth27 party time!

@isaacrlevin isaacrlevin deleted the 10348-work branch July 12, 2019 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-blazor Includes: Blazor, Razor Components
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants