-
Notifications
You must be signed in to change notification settings - Fork 10.3k
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
Conversation
@danroth27 here is the ServerSide rename work, blocked on wasm template |
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) |
@danroth27 here are the client-side updates. Will need a review on my approach with templates, but they build and work. |
@phenning one thing that I may need some help with is moving the contents of a folder up one level using the template engine |
@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
Outdated
Show resolved
Hide resolved
src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/Pages/FetchData.razor
Outdated
Show resolved
Hide resolved
.../Blazor/Templates/src/content/BlazorHosted-CSharp/Server/Controllers/SampleDataController.cs
Outdated
Show resolved
Hide resolved
.../Blazor/Templates/src/content/BlazorHosted-CSharp/Server/Controllers/SampleDataController.cs
Outdated
Show resolved
Hide resolved
.../Blazor/Templates/src/content/BlazorHosted-CSharp/Server/Controllers/SampleDataController.cs
Outdated
Show resolved
Hide resolved
.../Blazor/Templates/src/content/BlazorHosted-CSharp/Server/Controllers/SampleDataController.cs
Outdated
Show resolved
Hide resolved
...ponents/Blazor/Templates/src/content/BlazorLibrary-CSharp/.template.config.src/template.json
Show resolved
Hide resolved
...lazor/Templates/src/content/BlazorStandalone-CSharp/.template.config.src/dotnetcli.host.json
Show resolved
Hide resolved
...Templates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json
Outdated
Show resolved
Hide resolved
src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/Counter.razor
Show resolved
Hide resolved
src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Hosted-CSharp.sln
Outdated
Show resolved
Hide resolved
There was a problem hiding this 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 ?
...mponents/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/template.json
Outdated
Show resolved
Hide resolved
...mponents/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/template.json
Outdated
Show resolved
Hide resolved
src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Hosted-CSharp.sln
Outdated
Show resolved
Hide resolved
...Templates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json
Outdated
Show resolved
Hide resolved
...Templates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json
Outdated
Show resolved
Hide resolved
src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor
Outdated
Show resolved
Hide resolved
fixed some js reference issues per #11700 |
...ojectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
Outdated
Show resolved
Hide resolved
...mponents/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/template.json
Show resolved
Hide resolved
@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 |
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. |
@ryanbrandenburg resolved the merge on my side. Should be good if it passes tests and review |
There was a problem hiding this 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.
...mponents/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/template.json
Outdated
Show resolved
Hide resolved
...mponents/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/template.json
Outdated
Show resolved
Hide resolved
...ts/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/BlazorHosted-CSharp.Client.csproj
Outdated
Show resolved
Hide resolved
src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/Pages/Counter.razor
Outdated
Show resolved
Hide resolved
src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/Shared/NavMenu.razor
Outdated
Show resolved
Hide resolved
@danroth27 changes complete |
There was a problem hiding this 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!
src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor
Outdated
Show resolved
Hide resolved
...ents/Blazor/Templates/src/content/BlazorWasm-CSharp/.template.config.src/vs-2017.3.host.json
Outdated
Show resolved
Hide resolved
...tes/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/vs-2017.3.host.json
Show resolved
Hide resolved
@phenning can you confirm the vs template shows the Hosted option after Dan's requested changes? |
There was a problem hiding this 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 --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix indentation?
@danroth27 can you confirm the VS dialog is what you want |
…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]>
This reverts commit 6803969.
This reverts commit a1fd2cc.
…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]>
@danroth27 party time! |
Summary of the changes (Less than 80 chars)
--host
that will add ASP.NET Core hosted backendAddresses #10348, #11700