-
Notifications
You must be signed in to change notification settings - Fork 10.1k
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
Blazor Web template updates #49801
Merged
Merged
Blazor Web template updates #49801
Changes from 24 commits
Commits
Show all changes
36 commits
Select commit
Hold shift + click to select a range
450bfba
Let the build process update some template strings
SteveSandersonMS 233af92
Steps towards splitting the blazorweb template into two projects
SteveSandersonMS ec4f31e
Try renaming the server project to be the actual project name
SteveSandersonMS 325595b
Update template.json
SteveSandersonMS d001124
Rename Components-CSharp to BlazorWeb-CSharp
SteveSandersonMS 9c13f34
Add script for running locally
SteveSandersonMS f60fba0
More required renames
SteveSandersonMS f39fb76
Trying to switch between one project and two
SteveSandersonMS 1e27e0f
Stop hiding wasm option
SteveSandersonMS d4efa4b
Add sln
SteveSandersonMS a0b0c3c
Add project reference
SteveSandersonMS 99e8fda
Update default interactivity flags
SteveSandersonMS 453e15f
Content changes to match plans
SteveSandersonMS 029b98b
Fixes
SteveSandersonMS 70c0bf6
Eliminate bootstrap-icons; inline the three we use
SteveSandersonMS 3549249
Temporary workaround for inability to route to pages in referenced pr…
SteveSandersonMS f4c06bf
Towards PWAs
SteveSandersonMS d3c1e36
Move PWA content into WebAssembly project
SteveSandersonMS b9f2b1c
Remove PWA option. See #49798
SteveSandersonMS dae8116
Update templatestrings
SteveSandersonMS 91733d0
Rename .WebAssembly project to .Client
SteveSandersonMS 4269d5d
Stop adding pointless launchSettings.json
SteveSandersonMS d76f3cf
Add edge case RootNamespace/AssemblyName to .Client project
SteveSandersonMS efc27b2
Structural improvements
SteveSandersonMS b36c157
Split some lines
SteveSandersonMS 9c48280
Make CSS links external. Rename Sidebar back to NavMenu.
SteveSandersonMS bf521b4
Simplify import
SteveSandersonMS 01a402f
Make scoped CSS work
SteveSandersonMS fab438c
Starting on empty flag
SteveSandersonMS e5108c2
Empty updates
SteveSandersonMS 306e8f3
Eliminate pointless css subdir
SteveSandersonMS 25fccb4
Make Router NotFound optional
SteveSandersonMS 9ad0865
Remove NotFound content in new template
SteveSandersonMS d0bf7ed
Drop the BOM
SteveSandersonMS 6832248
Update template-baselines.json
SteveSandersonMS f5f7fc9
Move error UI css to be scoped
SteveSandersonMS File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
16 changes: 16 additions & 0 deletions
16
src/ProjectTemplates/Web.ProjectTemplates/BlazorWeb-CSharp.Client.csproj.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework> | ||
<ImplicitUsings>enable</ImplicitUsings> | ||
<Nullable>enable</Nullable> | ||
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile> | ||
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">BlazorWeb-CSharp.Client</RootNamespace> | ||
<AssemblyName Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">`$(AssemblyName.Replace(' ', '_'))</AssemblyName> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="${MicrosoftAspNetCoreComponentsWebAssemblyVersion}" /> | ||
</ItemGroup> | ||
|
||
</Project> |
19 changes: 19 additions & 0 deletions
19
src/ProjectTemplates/Web.ProjectTemplates/BlazorWeb-CSharp.csproj.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
<Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework> | ||
<Nullable>enable</Nullable> | ||
<ImplicitUsings>enable</ImplicitUsings> | ||
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile> | ||
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">BlazorWeb-CSharp</RootNamespace> | ||
<AssemblyName Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">`$(AssemblyName.Replace(' ', '_'))</AssemblyName> | ||
</PropertyGroup> | ||
<!--#if UseWebAssembly --> | ||
|
||
<ItemGroup> | ||
<ProjectReference Include="..\BlazorWeb-CSharp.Client\BlazorWeb-CSharp.Client.csproj" /> | ||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="${MicrosoftAspNetCoreComponentsWebAssemblyServerVersion}" /> | ||
</ItemGroup> | ||
<!--#endif --> | ||
|
||
</Project> |
35 changes: 0 additions & 35 deletions
35
src/ProjectTemplates/Web.ProjectTemplates/Components-CSharp.csproj.in
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
The other template that we have is
components-webassembly
could we have consistent naming between the two? (EitherBlazorWebassembly
or ComponentsWeb`)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.
Yeah, I'd like to change the other template's name to
BlazorWebAssembly
(to match everything else about its branding) and eliminate the "empty" variant in favour of a flag onBlazorWebAssembly
. Just not trying to do that as part of this PR.