Skip to content

Commit 4c7b8d6

Browse files
authored
Merge pull request #35054 from dotnet/main
2 parents 9d0b4ed + 2c37895 commit 4c7b8d6

7 files changed

Lines changed: 41 additions & 7 deletions

File tree

.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: `### 🌱🐇 **_Spring is coming. Hang in there! I'm pull'in for ya!_** 🐣🌻
20+
body: `### 🌱🐇 **_Spring is here!!_** 🐣🌻
2121
2222
A green dinosaur 🦖 will be along shortly to assist. *Stand-by ........*`
2323
})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
issue_number: context.issue.number,
2323
owner: context.repo.owner,
2424
repo: context.repo.repo,
25-
body: `### 🌱🐇 **_Spring is coming. Hang in there! I'm pull'in for ya!_** 🐣🌻
25+
body: `### 🌱🐇 **_Spring is here!!_** 🐣🌻
2626
2727
*Stand-by!* ... A green dinosaur 🦖 will be along shortly to assist.`
2828
})

aspnetcore/blazor/fundamentals/routing.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,6 +1624,12 @@ Use a <xref:Microsoft.AspNetCore.Components.Routing.NavLink> component in place
16241624

16251625
There are two <xref:Microsoft.AspNetCore.Components.Routing.NavLinkMatch> options that you can assign to the `Match` attribute of the `<NavLink>` element:
16261626

1627+
<!-- UPDATE 10.0 PREVIEW3
1628+
Change `DisableMatchAllIgnoresLeftUriPart` to
1629+
`EnableMatchAllForQueryStringAndFragmentSwitchKey`
1630+
set to `true`.
1631+
-->
1632+
16271633
* <xref:Microsoft.AspNetCore.Components.Routing.NavLinkMatch.All?displayProperty=nameWithType>: The <xref:Microsoft.AspNetCore.Components.Routing.NavLink> is active when it matches the current URL, ignoring the query string and fragment. To include matching on the query string/fragment, use the `Microsoft.AspNetCore.Components.Routing.NavLink.DisableMatchAllIgnoresLeftUriPart` [`AppContext` switch](/dotnet/fundamentals/runtime-libraries/system-appcontext).
16281634
* <xref:Microsoft.AspNetCore.Components.Routing.NavLinkMatch.Prefix?displayProperty=nameWithType> (*default*): The <xref:Microsoft.AspNetCore.Components.Routing.NavLink> is active when it matches any prefix of the current URL.
16291635

Lines changed: 4 additions & 0 deletions
Loading

aspnetcore/blazor/host-and-deploy/webassembly.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -556,10 +556,11 @@ http {
556556
}
557557
```
558558

559-
When setting the [NGINX burst rate limit](https://www.nginx.com/blog/rate-limiting-nginx/#bursts) with [`limit_req`](https://nginx.org/docs/http/ngx_http_limit_req_module.html#limit_req), Blazor WebAssembly apps may require a large `burst` parameter value to accommodate the relatively large number of requests made by an app. Initially, set the value to at least 60:
559+
When setting the [NGINX burst rate limit](https://www.nginx.com/blog/rate-limiting-nginx/#bursts) with [`limit_req`](https://nginx.org/docs/http/ngx_http_limit_req_module.html#limit_req) and [`limit_req_zone`](https://nginx.org/docs/http/ngx_http_limit_req_module.html), Blazor WebAssembly apps may require a large `burst`/`rate` parameter values to accommodate the relatively large number of requests made by an app. Initially, set the value to at least 60:
560560

561561
```
562562
http {
563+
limit_req_zone $binary_remote_addr zone=one:10m rate=60r/s;
563564
server {
564565
...
565566
@@ -681,13 +682,26 @@ The following guidance for GitHub Pages deployments of Blazor WebAssembly apps d
681682
* **Actions permissions**
682683
* **Allow enterprise actions, and select non-enterprise, actions and reusable workflows** > Enabled (selected)
683684
* **Allow actions created by GitHub** > Enabled (selected)
684-
* **Allow actions and reusable workflows** > `stevesandersonms/ghaction-rewrite-base-href@v1,`
685+
* **Allow actions and reusable workflows** > `stevesandersonms/ghaction-rewrite-base-href@{SHA HASH},`&dagger;
685686
* **Workflow permissions** > **Read repository contents and packages permissions**
686687
* **Pages** > **Build and deployment**
687688
* **Source** > **GitHub Actions**
688689
* Selected workflow: **Static HTML** and base your static deployment Action script on the [Xref Generator `static.yml` file](https://github.com/dotnet/blazor-samples/blob/main/.github/workflows/static.yml) for the Xref Generator tool. The configuration in the file is described in the next section.
689690
* **Custom domain**: Set if you intend to use a custom domain, which isn't covered by this guidance. For more information, see [Configuring a custom domain for your GitHub Pages site](https://docs.github.com/pages/configuring-a-custom-domain-for-your-github-pages-site).
690691
* **Enforce HTTPS** > Enabled (selected)
692+
693+
&dagger;The SHA hash (`{SHA HASH}` placeholder) represents the SHA hash for the latest `stevesandersonms/ghaction-rewrite-base-href` GitHub Action release version. By pinning to a specific version, there's less risk that a compromised latest release using a version moniker, such as `v1`, can jeopardize the deployment. Periodically, update the SHA to the latest release for the latest features and bug fixes.
694+
695+
To obtain the SHA hash:
696+
697+
1. Navigate to the [`SteveSandersonMS/ghaction-rewrite-base-href` Action GitHub repository](https://github.com/SteveSandersonMS/ghaction-rewrite-base-href).
698+
1. Select the release on the right-side of the page under **Releases**.
699+
1. Locate and select the short SHA hash (for example, `5b54862`).
700+
1. Either:
701+
* Take the full SHA from the URL in the browser's address bar.
702+
* Select the copy button on the right side of page ![Copy button](~/blazor/host-and-deploy/index/copy-button.svg) to put the SHA on your clipboard.
703+
704+
For more information, see [Using pre-written building blocks in your workflow: Using SHAs (GitHub documentation)](https://docs.github.com/actions/writing-workflows/choosing-what-your-workflow-does/using-pre-written-building-blocks-in-your-workflow#using-shas).
691705

692706
### Static deployment script configuration
693707

@@ -699,7 +713,7 @@ Configure the following entries in the script for your deployment:
699713
* Push path (`on:push:paths`): Set the push path to match the app's repo folder with a `**` wildcard. Example: `BlazorWebAssemblyXrefGenerator/**`
700714
* .NET SDK version (`dotnet-version` via the [`actions/setup-dotnet` Action](https://github.com/actions/setup-dotnet)): Currently, there's no way to set the version to "latest" (see [Allow specifying 'latest' as dotnet-version (`actions/setup-dotnet` #497)](https://github.com/actions/setup-dotnet/issues/497) to up-vote the feature request). Set the SDK version at least as high as the app's framework version.
701715
* Publish path (`dotnet publish` command): Set the publish folder path to the app's repo folder. Example: `dotnet publish BlazorWebAssemblyXrefGenerator -c Release`
702-
* Base HREF (`base_href` for the [`SteveSandersonMS/ghaction-rewrite-base-href` Action](https://github.com/SteveSandersonMS/ghaction-rewrite-base-href)): Set the base href for the app to the repository's name. Example: The Blazor sample's repository owner is `dotnet`. The Blazor sample's repository's name is `blazor-samples`. When the Xref Generator tool is deployed to GitHub Pages, its web address is based on the repository's name (`https://dotnet.github.io/blazor-samples/`). The base href of the app is `/blazor-samples/`, which is set into `base_href` for the `ghaction-rewrite-base-href` Action to write into the app's `wwwroot/index.html` `<base>` tag when the app is deployed. For more information, see <xref:blazor/host-and-deploy/index#app-base-path>.
716+
* Base HREF (`base_href` for the [`SteveSandersonMS/ghaction-rewrite-base-href` Action](https://github.com/SteveSandersonMS/ghaction-rewrite-base-href)): Set the SHA hash for the latest version of the Action (see the guidance in the [*GitHub Pages settings*](#github-pages-settings) section for instructions). Set the base href for the app to the repository's name. Example: The Blazor sample's repository owner is `dotnet`. The Blazor sample's repository's name is `blazor-samples`. When the Xref Generator tool is deployed to GitHub Pages, its web address is based on the repository's name (`https://dotnet.github.io/blazor-samples/`). The base href of the app is `/blazor-samples/`, which is set into `base_href` for the `ghaction-rewrite-base-href` Action to write into the app's `wwwroot/index.html` `<base>` tag when the app is deployed. For more information, see <xref:blazor/host-and-deploy/index#app-base-path>.
703717

704718
The GitHub-hosted Ubuntu (latest) server has a version of the .NET SDK pre-installed. You can remove the [`actions/setup-dotnet` Action](https://github.com/actions/setup-dotnet) step from the `static.yml` script if the pre-installed .NET SDK is sufficient to compile the app. To determine the .NET SDK installed for `ubuntu-latest`:
705719

aspnetcore/release-notes/aspnetcore-10/includes/blazor.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,14 @@ requestMessage.SetBrowserResponseStreamingEnabled(false);
122122
123123
For more information, see [`HttpClient` and `HttpRequestMessage` with Fetch API request options (*Call web API* article)](xref:blazor/call-web-api?view=aspnetcore-10.0#httpclient-and-httprequestmessage-with-fetch-api-request-options).
124124
125+
XXXXXXXXXXXXXXXXXXXX CHANGE EARLIER COVERAGE XXXXXXXXXXXXXXXXXXXX
126+
127+
In the "Ignore the query string and fragment when using `NavLinkMatch.All`" section, change
128+
`DisableMatchAllIgnoresLeftUriPart` to `EnableMatchAllForQueryStringAndFragmentSwitchKey`
129+
set to `true`.
130+
131+
Also make this change in the *Routing* article at Line 1633.
132+
133+
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
134+
125135
-->

aspnetcore/tutorials/first-mvc-app/adding-controller.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Part 2, add a controller to an ASP.NET Core MVC app
33
author: wadepickett
44
description: Part 2 of tutorial series on ASP.NET Core MVC.
55
ms.author: wpickett
6-
ms.date: 03/02/2025
6+
ms.date: 03/26/2025
77
monikerRange: '>= aspnetcore-3.1'
88
uid: tutorials/first-mvc-app/adding-controller
99
---
@@ -145,7 +145,7 @@ In the preceding URL:
145145

146146
In the preceding example:
147147

148-
* The third URL segment matched the route parameter `id`.
148+
* The third URL segment matched the route parameter `id` as defined in the routing template in the `Program.cs` file.
149149
* The `Welcome` method contains a parameter `id` that matched the URL template in the `MapControllerRoute` method.
150150
* The trailing `?` (in `id?`) indicates the `id` parameter is optional.
151151

0 commit comments

Comments
 (0)