Skip to content

Commit f54cff0

Browse files
authored
Merge pull request #36411 from dotnet/main
2 parents f1e5859 + 16442dd commit f54cff0

File tree

19 files changed

+340
-72
lines changed

19 files changed

+340
-72
lines changed

.github/workflows/blazor-hybrid-issue-processing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
issue_number: context.issue.number,
1818
owner: context.repo.owner,
1919
repo: context.repo.repo,
20-
body: `### 🦃 ***Happy Thanksgiving!*** 🍽️
20+
body: `### 🥳 ***Happy Holidays!*** 🍽️
2121
2222
*Stand-by!* A green dinosaur 🦖 will be along shortly to assist.`
2323
})

.github/workflows/blazor-issue-processing.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,9 @@ jobs:
2323
issue_number: context.issue.number,
2424
owner: context.repo.owner,
2525
repo: context.repo.repo,
26-
body: `### 🦃 ***Happy Thanksgiving!*** 🍽️
26+
body: `### 🥳 ***Happy Holidays!*** 🍽️
2727
28-
This issue has been marked for triage on the Blazor Docs GitHub project, and I'll respond after the Thanksgiving holiday during the first week of December.
29-
30-
We only work on documentation on this repo. If you need product support, close this issue and seek assistance through one or more of the following support channels:
31-
32-
* [Stack Overflow (tagged: 'blazor')](https://stackoverflow.com/questions/tagged/blazor)
33-
* [General ASP.NET Core Slack Team](https://aspnetcore.slack.com/join/shared_invite/zt-1mv5487zb-EOZxJ1iqb0A0ajowEbxByQ#/shared-invite/email)
34-
* [Blazor Gitter](https://gitter.im/aspnet/Blazor)
35-
36-
If you think that you found a potential bug in the framework or have product feedback, close this issue and open a new issue for the ASP.NET Core product unit at [dotnet/aspnetcore issues](https://github.com/dotnet/aspnetcore/issues). Bug reports require a clear explanation of the problem, usually including a minimal repro project placed on GitHub for the product unit engineers to download and run. If you determine with the product unit that it isn't a bug but merely requires documentation, please re-open this docs issue and place a cross-link to your engineering issue discussion.
37-
38-
For problems or feedback on Visual Studio, close this issue and use the [**Report a Problem**](https://docs.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio) or [**Suggest a Feature**](https://docs.microsoft.com/visualstudio/ide/suggest-a-feature) processes from within VS, which open internal issues for the VS product unit. For more information, see [Visual Studio Feedback](https://developercommunity.visualstudio.com/home).
39-
40-
For problems with Visual Studio Code, close this issue and ask for support on community support forums. For bug reports and product feedback, open an issue on the [microsoft/vscode GitHub repo](https://github.com/microsoft/vscode/issues).`
28+
*Stand-by!* A green dinosaur 🦖 will be along shortly to assist.`
4129
})
4230
await github.rest.issues.addLabels({
4331
issue_number: context.issue.number,

aspnetcore/blazor/components/integration.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,12 @@ To support routable Razor components in Razor Pages apps:
179179

180180
> [!NOTE]
181181
> The preceding example assumes that the <xref:Microsoft.AspNetCore.Components.Web.HeadOutlet> component and Blazor script (`_framework/blazor.server.js`) are rendered by the app's layout. For more information, see the [Configuration](#configuration) section.
182+
>
183+
> In .NET 10 or later, the Blazor script is included by the framework if the project contains at least one Razor component file (`.razor`). If your app requires the Blazor script but doesn't contain at least one component, add the following MSBuild property to the app's project file to force unconditional script inclusion:
184+
>
185+
> ```xml
186+
> <RequiresAspNetWebAssets>true</RequiresAspNetWebAssets>
187+
> ```
182188
183189
<xref:Microsoft.AspNetCore.Mvc.Rendering.RenderMode> configures whether the `App` component:
184190
@@ -260,6 +266,12 @@ To support routable Razor components in MVC apps:
260266

261267
> [!NOTE]
262268
> The preceding example assumes that the <xref:Microsoft.AspNetCore.Components.Web.HeadOutlet> component and Blazor script (`_framework/blazor.server.js`) are rendered by the app's layout. For more information, see the [Configuration](#configuration) section.
269+
>
270+
> In .NET 10 or later, the Blazor script is included by the framework if the project contains at least one Razor component file (`.razor`). If your app requires the Blazor script but doesn't contain at least one component, add the following MSBuild property to the app's project file to force unconditional script inclusion:
271+
>
272+
> ```xml
273+
> <RequiresAspNetWebAssets>true</RequiresAspNetWebAssets>
274+
> ```
263275
264276
<xref:Microsoft.AspNetCore.Mvc.Rendering.RenderMode> configures whether the `App` component:
265277

aspnetcore/blazor/project-structure.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ The `Components/Pages` folder of the server project contains the app's routable
7070
Add the angle brackets around the cross-link when
7171
activating.
7272
73-
:::moniker range=">= aspnetcore-10.0"
73+
moniker range=">= aspnetcore-10.0"
7474
7575
The `NotFound` component (`NotFound.razor`) implements a Not Found page to display when content isn't found for a request path. For more information, see xref:blazor/fundamentals/navigation#not-found-responses.
7676
77-
:::moniker-end
77+
moniker-end
7878
7979
-->
8080

@@ -332,19 +332,19 @@ Project structure:
332332
Add the angle brackets around the cross-link when
333333
activating.
334334
335-
:::moniker-end
335+
moniker-end
336336
337-
:::moniker range=">= aspnetcore-10.0"
337+
moniker range=">= aspnetcore-10.0"
338338
339339
* `Pages` folder: Contains the Blazor app's routable Razor components (`.razor`). The route for each page is specified using the [`@page`](xref:mvc/views/razor#page) directive. The template includes the following components:
340340
* `Counter` component (`Counter.razor`): Implements the Counter page.
341341
* `Index` component (`Index.razor`): Implements the Home page.
342342
* `Weather` component (`Weather.razor`): Implements the Weather page.
343343
* `NotFound` component (`NotFound.razor`) Implements a Not Found page to display when content isn't found for a request path. For more information, see xref:blazor/fundamentals/navigation#not-found-responses.
344344
345-
:::moniker-end
345+
moniker-end
346346
347-
:::moniker range=">= aspnetcore-8.0 < aspnetcore-10.0"
347+
moniker range=">= aspnetcore-8.0 < aspnetcore-10.0"
348348
349349
-->
350350

@@ -357,9 +357,9 @@ Project structure:
357357
https://github.com/dotnet/AspNetCore.Docs/pull/36145
358358
is merged.
359359
360-
:::moniker-end
360+
moniker-end
361361
362-
:::moniker range=">= aspnetcore-8.0"
362+
moniker range=">= aspnetcore-8.0"
363363
364364
-->
365365

aspnetcore/blazor/security/additional-scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ Alternatively, the setting can be made in the app settings (`appsettings.json`)
551551
```json
552552
{
553553
"AzureAd": {
554-
"Authority": "https://login.microsoftonline.com/common/oauth2/v2.0/",
554+
"Authority": "https://login.microsoftonline.com/common/oauth2/v2.0",
555555
...
556556
}
557557
}

0 commit comments

Comments
 (0)