Skip to content
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 36 commits into from
Aug 3, 2023
Merged
Show file tree
Hide file tree
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 Aug 2, 2023
233af92
Steps towards splitting the blazorweb template into two projects
SteveSandersonMS Aug 2, 2023
ec4f31e
Try renaming the server project to be the actual project name
SteveSandersonMS Aug 2, 2023
325595b
Update template.json
SteveSandersonMS Aug 2, 2023
d001124
Rename Components-CSharp to BlazorWeb-CSharp
SteveSandersonMS Aug 2, 2023
9c13f34
Add script for running locally
SteveSandersonMS Aug 2, 2023
f60fba0
More required renames
SteveSandersonMS Aug 2, 2023
f39fb76
Trying to switch between one project and two
SteveSandersonMS Aug 2, 2023
1e27e0f
Stop hiding wasm option
SteveSandersonMS Aug 2, 2023
d4efa4b
Add sln
SteveSandersonMS Aug 2, 2023
a0b0c3c
Add project reference
SteveSandersonMS Aug 2, 2023
99e8fda
Update default interactivity flags
SteveSandersonMS Aug 2, 2023
453e15f
Content changes to match plans
SteveSandersonMS Aug 2, 2023
029b98b
Fixes
SteveSandersonMS Aug 2, 2023
70c0bf6
Eliminate bootstrap-icons; inline the three we use
SteveSandersonMS Aug 2, 2023
3549249
Temporary workaround for inability to route to pages in referenced pr…
SteveSandersonMS Aug 2, 2023
f4c06bf
Towards PWAs
SteveSandersonMS Aug 2, 2023
d3c1e36
Move PWA content into WebAssembly project
SteveSandersonMS Aug 2, 2023
b9f2b1c
Remove PWA option. See #49798
SteveSandersonMS Aug 2, 2023
dae8116
Update templatestrings
SteveSandersonMS Aug 2, 2023
91733d0
Rename .WebAssembly project to .Client
SteveSandersonMS Aug 2, 2023
4269d5d
Stop adding pointless launchSettings.json
SteveSandersonMS Aug 2, 2023
d76f3cf
Add edge case RootNamespace/AssemblyName to .Client project
SteveSandersonMS Aug 2, 2023
efc27b2
Structural improvements
SteveSandersonMS Aug 2, 2023
b36c157
Split some lines
SteveSandersonMS Aug 3, 2023
9c48280
Make CSS links external. Rename Sidebar back to NavMenu.
SteveSandersonMS Aug 3, 2023
bf521b4
Simplify import
SteveSandersonMS Aug 3, 2023
01a402f
Make scoped CSS work
SteveSandersonMS Aug 3, 2023
fab438c
Starting on empty flag
SteveSandersonMS Aug 3, 2023
e5108c2
Empty updates
SteveSandersonMS Aug 3, 2023
306e8f3
Eliminate pointless css subdir
SteveSandersonMS Aug 3, 2023
25fccb4
Make Router NotFound optional
SteveSandersonMS Aug 3, 2023
9ad0865
Remove NotFound content in new template
SteveSandersonMS Aug 3, 2023
d0bf7ed
Drop the BOM
SteveSandersonMS Aug 3, 2023
6832248
Update template-baselines.json
SteveSandersonMS Aug 3, 2023
f5f7fc9
Move error UI css to be scoped
SteveSandersonMS Aug 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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>
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>

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
<GeneratedContent Include="WebApi-FSharp.fsproj.in" OutputPath="content/WebApi-FSharp/Company.WebApplication1.fsproj" />
<GeneratedContent Include="Worker-CSharp.csproj.in" OutputPath="content/Worker-CSharp/Company.Application1.csproj" />
<GeneratedContent Include="Worker-FSharp.fsproj.in" OutputPath="content/Worker-FSharp/Company.Application1.fsproj" />
<GeneratedContent Include="Components-CSharp.csproj.in" OutputPath="content/Components-CSharp/Components-CSharp.csproj" />
<GeneratedContent Include="BlazorWeb-CSharp.csproj.in" OutputPath="content/BlazorWeb-CSharp/BlazorWeb-CSharp/BlazorWeb-CSharp.csproj" />
<GeneratedContent Include="BlazorWeb-CSharp.Client.csproj.in" OutputPath="content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/BlazorWeb-CSharp.Client.csproj" />
Copy link
Member

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? (Either BlazorWebassembly or ComponentsWeb`)

Copy link
Member Author

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 on BlazorWebAssembly. Just not trying to do that as part of this PR.

<GeneratedContent Include="ComponentsWebAssembly-CSharp.csproj.in" OutputPath="content/ComponentsWebAssembly-CSharp/ComponentsWebAssembly-CSharp.csproj" />
<GeneratedContent Include="EmptyComponentsWebAssembly-CSharp.csproj.in" OutputPath="content/EmptyComponentsWebAssembly-CSharp/EmptyComponentsWebAssembly-CSharp.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,11 @@
"longName": "no-restore",
"shortName": ""
},
"PWA": {
"longName": "pwa",
"isHidden": true
},
"UseServer": {
"longName": "use-server"
},
"UseWebAssembly": {
"longName": "use-wasm",
"isHidden": true
"longName": "use-wasm"
},
"Framework": {
"longName": "framework"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,7 @@
},
{
"id": "UseWebAssembly",
"isVisible": false,
"persistenceScope": "templateGroup"
},
{
"id": "PWA",
"isVisible": false,
"isVisible": true,
"persistenceScope": "templateGroup"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"symbols/UseWebAssembly/description": "Pokud je zadáno, nakonfiguruje projekt tak, aby vykreslovat komponenty interaktivně v prohlížeči pomocí WebAssembly.",
"symbols/UseServer/displayName": "_Použít interaktivní serverové komponenty",
"symbols/UseServer/description": "Pokud je zadáno, nakonfiguruje projekt tak, aby vykresloval komponenty interaktivně na serveru.",
"symbols/PWA/displayName": "_Progresivní webová aplikace",
"symbols/PWA/description": "Pokud je tato možnost zadaná, vytvoří progresivní webovou aplikaci (PWA), která podporuje instalaci a offline použití.",
"symbols/NoHttps/description": "Určuje, jestli se má protokol HTTPS vypnout. Tato možnost platí jenom v případě, že se pro --auth nepoužívají Individual, IndividualB2C, SingleOrg ani MultiOrg.",
"symbols/UseProgramMain/displayName": "Nepoužívat _příkazy nejvyšší úrovně",
"symbols/UseProgramMain/description": "Určuje, jestli se má místo příkazů nejvyšší úrovně generovat explicitní třída Program a metoda Main.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"symbols/UseWebAssembly/description": "Bei Angabe dieser Option wird das Projekt so konfiguriert, dass Komponenten interaktiv mithilfe von WebAssembly im Browser gerendert werden.",
"symbols/UseServer/displayName": "_Interaktive Serverkomponenten verwenden",
"symbols/UseServer/description": "Bei Angabe dieser Option wird das Projekt so konfiguriert, dass Komponenten interaktiv auf dem Server gerendert werden.",
"symbols/PWA/displayName": "_Progressive Webanwendung",
"symbols/PWA/description": "Wenn angegeben, wird eine Progressive Web Application (PWA) erstellt, die die Installation und Offlineverwendung unterstützt.",
"symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn Individual, IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.",
"symbols/UseProgramMain/displayName": "Keine Anweisungen_der obersten Ebene verwenden",
"symbols/UseProgramMain/description": "Gibt an, ob anstelle von Anweisungen der obersten Ebene eine explizite Programmklasse und eine Main-Methode generiert werden soll.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
"symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.",
"symbols/iisHttpsPort/description": "Port number to use for the IIS Express HTTPS endpoint in launchSettings.json. This option is only applicable when the parameter no-https is not used (no-https will be ignored if either IndividualAuth or OrganizationalAuth is used).",
"symbols/UseWebAssembly/displayName": "_Use interactive WebAssembly components",
"symbols/UseWebAssembly/description": "If specified, configures the project to render components interactively in the browser using WebAssembly.",
"symbols/UseWebAssembly/description": "Configures whether to support rendering components interactively in the browser using WebAssembly. The default value is false.",
"symbols/UseServer/displayName": "_Use interactive server components",
"symbols/UseServer/description": "If specified, configures the project to render components interactively on the server.",
"symbols/PWA/displayName": "_Progressive Web Application",
"symbols/PWA/description": "If specified, produces a Progressive Web Application (PWA) supporting installation and offline use.",
"symbols/UseServer/description": "Configures whether to support rendering components interactively on the server via a SignalR WebSocket connection. The default value is true.",
"symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.",
"symbols/UseProgramMain/displayName": "Do not use _top-level statements",
"symbols/UseProgramMain/description": "Whether to generate an explicit Program class and Main method instead of top-level statements.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"symbols/UseWebAssembly/description": "Si se especifica, esta opción configura el proyecto para representar los componentes de forma interactiva en el explorador mediante WebAssembly.",
"symbols/UseServer/displayName": "_Use componentes de servidor interactivos",
"symbols/UseServer/description": "Si se especifica, esta opción configura el proyecto para representar los componentes de forma interactiva en el servidor.",
"symbols/PWA/displayName": "_Aplicación web progresiva",
"symbols/PWA/description": "Si se especifica, produce una aplicación web progresiva (PWA) compatible con la instalación y el uso sin conexión.",
"symbols/NoHttps/description": "Si se va a desactivar HTTPS. Esta opción solo se aplica si Individual, IndividualB2C, SingleOrg o MultiOrg no se usan para --auth.",
"symbols/UseProgramMain/displayName": "No usar instrucciones de _nivel superior",
"symbols/UseProgramMain/description": "Indica si se debe generar una clase Program explícita y un método Main en lugar de instrucciones de nivel superior.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"symbols/UseWebAssembly/description": "S’il est spécifié, configure le projet pour afficher les composants de manière interactive dans le navigateur à l’aide de WebAssembly.",
"symbols/UseServer/displayName": "_Utiliser les composants serveur interactifs",
"symbols/UseServer/description": "Si ce paramètre est spécifié, configure le projet pour afficher les composants de manière interactive sur le serveur.",
"symbols/PWA/displayName": "_Application web progressive",
"symbols/PWA/description": "Si ce paramètre est spécifié, produit une application web progressive (PWA) qui prend en charge l’installation et l’utilisation hors connexion.",
"symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si Individual, IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.",
"symbols/UseProgramMain/displayName": "N’utilisez pas _d’instructions de niveau supérieur.",
"symbols/UseProgramMain/description": "Indique s’il faut générer une classe Programme explicite et une méthode Main au lieu d’instructions de niveau supérieur.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"symbols/UseWebAssembly/description": "Se specificato, configura il progetto per il rendering interattivo dei componenti nel browser tramite WebAssembly.",
"symbols/UseServer/displayName": "_Usa componenti server interattivi",
"symbols/UseServer/description": "Se specificato, configura il progetto per il rendering interattivo dei componenti nel server.",
"symbols/PWA/displayName": "Applicazione Web _Progressive",
"symbols/PWA/description": "Se specificato, produce un'applicazione Web progressiva (PWA) che supporta l'installazione e l'uso offline.",
"symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se Individual, IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.",
"symbols/UseProgramMain/displayName": "Non usare_istruzioni di primo livello",
"symbols/UseProgramMain/description": "Indica se generare una classe Program esplicita e un metodo Main anziché istruzioni di primo livello.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"symbols/UseWebAssembly/description": "指定した場合、WebAssembly を使用してブラウザーでコンポーネントを対話的にレンダリングするようにプロジェクトを構成します。",
"symbols/UseServer/displayName": "_対話型サーバー コンポーネントを使用する",
"symbols/UseServer/description": "指定した場合、サーバー上でコンポーネントを対話的にレンダリングするようにプロジェクトを構成します。",
"symbols/PWA/displayName": "プログレッシブ Web アプリケーション(_P)",
"symbols/PWA/description": "指定した場合、インストールとオフラインでの使用をサポートするプログレッシブ Web アプリケーション (PWA) が生成されます。",
"symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、Individual、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。",
"symbols/UseProgramMain/displayName": "最上位レベルのステートメントを使用しない(_T)",
"symbols/UseProgramMain/description": "最上位レベルのステートメントではなく、明示的な Program クラスと Main メソッドを生成するかどうか。",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"symbols/UseWebAssembly/description": "지정할 경우 WebAssembly를 사용하여 브라우저에서 대화형으로 구성 요소를 렌더링하도록 프로젝트를 구성합니다.",
"symbols/UseServer/displayName": "_대화형 서버 구성 요소 사용",
"symbols/UseServer/description": "지정되는 경우 서버에서 대화형으로 구성 요소를 렌더링하도록 프로젝트를 구성합니다.",
"symbols/PWA/displayName": "프로그레시브 웹 애플리케이션(_P)",
"symbols/PWA/description": "지정된 경우 설치 및 오프라인 사용을 지원하는 PWA(프로그레시브 웹 응용 프로그램)를 생성합니다.",
"symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 Individual, IndividualB2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.",
"symbols/UseProgramMain/displayName": "최상위 문 사용 안 함(_T)",
"symbols/UseProgramMain/description": "최상위 문 대신 명시적 Program 클래스 및 Main 메서드를 생성할지 여부입니다.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"symbols/UseWebAssembly/description": "Jeśli jest określony, konfiguruje projekt w celu interaktywnego renderowania składników w przeglądarce przy użyciu zestawu WebAssembly.",
"symbols/UseServer/displayName": "_Używanie interakcyjnych składników serwera",
"symbols/UseServer/description": "Jeśli określono, konfiguruje projekt do renderowania składników w sposób interakcyjny na serwerze.",
"symbols/PWA/displayName": "_Progresywna aplikacja internetowa",
"symbols/PWA/description": "Jeśli zostanie określony, tworzy progresywną aplikację internetową (PWA) obsługującą instalację i używanie w trybie offline.",
"symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy dla uwierzytelniania --auth nie są używane elementy Individual, IndividualB2C, SingleOrg lub MultiOrg.",
"symbols/UseProgramMain/displayName": "Nie używaj ins_trukcji najwyższego poziomu",
"symbols/UseProgramMain/description": "Określa, czy wygenerować jawną klasę Program i metodę Main zamiast instrukcji najwyższego poziomu.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"symbols/UseWebAssembly/description": "Se especificado, configura o projeto para renderizar componentes interativamente no navegador usando WebAssembly.",
"symbols/UseServer/displayName": "_Use componentes de servidor interativos",
"symbols/UseServer/description": "Se especificado, configura o projeto para renderizar componentes interativamente no servidor.",
"symbols/PWA/displayName": "_Aplicativo da Web Progressivo",
"symbols/PWA/description": "Se especificado, produz um Progressive Web Application (PWA) com suporte para instalação e uso offline.",
"symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção se aplica somente se Individual, IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.",
"symbols/UseProgramMain/displayName": "Não use ins_truções de nível superior",
"symbols/UseProgramMain/description": "Se deve gerar uma classe de Programa explícita e um método principal em vez de instruções de nível superior.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"symbols/UseWebAssembly/description": "Если указано, настраивает проект для интерактивного отображения компонентов в браузере с помощью WebAssembly.",
"symbols/UseServer/displayName": "_Использовать интерактивные компоненты сервера",
"symbols/UseServer/description": "Если указано, настраивает проект для интерактивного отображения компонентов на сервере.",
"symbols/PWA/displayName": "_Прогрессивное веб-приложение",
"symbols/PWA/description": "Если указывается, используется для создания прогрессивного веб-приложения (PWA), поддерживающего установку и автономное использование.",
"symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются Individual, IndividualB2C, SingleOrg или MultiOrg.",
"symbols/UseProgramMain/displayName": "Не использовать _операторы верхнего уровня",
"symbols/UseProgramMain/description": "Следует ли создавать явный класс Program и метод Main вместо операторов верхнего уровня.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"symbols/UseWebAssembly/description": "Belirtilmişse, projeyi Webassembly kullanarak bileşenleri tarayıcıda etkileşimli olarak işleyecek şekilde yapılandırır.",
"symbols/UseServer/displayName": "_Etkileşimli sunucu bileşenlerini kullanın",
"symbols/UseServer/description": "Belirtilmişse, projeyi bileşenleri sunucuda etkileşimli olarak işleyecek şekilde yapılandırır.",
"symbols/PWA/displayName": "_Aşamalı Web Uygulaması",
"symbols/PWA/description": "Belirtilmişse, yükleme ve çevrimdışı kullanımı destekleyen bir Aşamalı Web Uygulaması (PWA) oluşturur.",
"symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca Bireysel, IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.",
"symbols/UseProgramMain/displayName": "_Üst düzey deyimler kullanmayın",
"symbols/UseProgramMain/description": "Üst düzey deyimler yerine açık bir Program sınıfı ve Ana yöntem oluşturup oluşturulmayacağını belirtir.",
Expand Down
Loading