Skip to content

Commit 04a812b

Browse files
authored
Merge pull request #35681 from dotnet/main
2 parents 6bf1c19 + db376e6 commit 04a812b

File tree

29 files changed

+641
-264
lines changed

29 files changed

+641
-264
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,6 +1522,11 @@
15221522
"source_path": "aspnetcore/migration/identity.md",
15231523
"redirect_url": "/aspnet/core/migration/fx-to-core/examples/identity",
15241524
"redirect_document_id": false
1525+
},
1526+
{
1527+
"source_path": "aspnetcore/blazor/progressive-web-app.md",
1528+
"redirect_url": "/aspnet/core/blazor/progressive-web-app/",
1529+
"redirect_document_id": false
15251530
}
15261531
]
15271532
}

aspnetcore/blazor/components/css-isolation.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,26 @@ CSS isolation occurs at build time. Blazor rewrites CSS selectors to match marku
5858
Blazor Web Apps:
5959

6060
```html
61-
<link href="@Assets["{ASSEMBLY NAME}.styles.css"]" rel="stylesheet">
61+
<link href="@Assets["{PACKAGE ID/ASSEMBLY NAME}.styles.css"]" rel="stylesheet">
6262
```
6363

6464
Standalone Blazor WebAssembly apps:
6565

6666
```html
67-
<link href="{ASSEMBLY NAME}.styles.css" rel="stylesheet">
67+
<link href="{PACKAGE ID/ASSEMBLY NAME}.styles.css" rel="stylesheet">
6868
```
6969

7070
:::moniker-end
7171

7272
:::moniker range="< aspnetcore-9.0"
7373

7474
```html
75-
<link href="{ASSEMBLY NAME}.styles.css" rel="stylesheet">
75+
<link href="{PACKAGE ID/ASSEMBLY NAME}.styles.css" rel="stylesheet">
7676
```
7777

7878
:::moniker-end
7979

80-
The `{ASSEMBLY NAME}` placeholder is the project's assembly name.
80+
The `{PACKAGE ID/ASSEMBLY NAME}` placeholder is the project's package ID (`<PackageId>` in the project file) for a library or assembly name for an app.
8181

8282
:::moniker range="< aspnetcore-8.0"
8383

@@ -95,7 +95,7 @@ Within the bundled file, each component is associated with a scope identifier. F
9595
<h1 b-3xxtam6d07>
9696
```
9797

98-
The `{ASSEMBLY NAME}.styles.css` file uses the scope identifier to group a style declaration with its component. The following example provides the style for the preceding `<h1>` element:
98+
The `{PACKAGE ID/ASSEMBLY NAME}.styles.css` file uses the scope identifier to group a style declaration with its component. The following example provides the style for the preceding `<h1>` element:
9999

100100
```css
101101
/* /Components/Pages/Counter.razor.rz.scp.css */
@@ -104,11 +104,11 @@ h1[b-3xxtam6d07] {
104104
}
105105
```
106106

107-
At build time, a project bundle is created with the convention `obj/{CONFIGURATION}/{TARGET FRAMEWORK}/scopedcss/projectbundle/{ASSEMBLY NAME}.bundle.scp.css`, where the placeholders are:
107+
At build time, a project bundle is created with the convention `obj/{CONFIGURATION}/{TARGET FRAMEWORK}/scopedcss/projectbundle/{PACKAGE ID/ASSEMBLY NAME}.bundle.scp.css`, where the placeholders are:
108108

109109
* `{CONFIGURATION}`: The app's build configuration (for example, `Debug`, `Release`).
110110
* `{TARGET FRAMEWORK}`: The target framework (for example, `net6.0`).
111-
* `{ASSEMBLY NAME}`: The app's assembly name (for example, `BlazorSample`).
111+
* `{PACKAGE ID/ASSEMBLY NAME}`: The project's package ID (`<PackageId>` in the project file) for a library or assembly name for an app (for example, `BlazorSample`).
112112

113113
## Child component support
114114

aspnetcore/blazor/fundamentals/configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,12 @@ var hostname = builder.Configuration["HostName"];
300300

301301
## Cached configuration
302302

303-
Configuration files are cached for offline use. With [Progressive Web Applications (PWAs)](xref:blazor/progressive-web-app), you can only update configuration files when creating a new deployment. Editing configuration files between deployments has no effect because:
303+
Configuration files are cached for offline use. With [Progressive Web Applications (PWAs)](xref:blazor/progressive-web-app/index), you can only update configuration files when creating a new deployment. Editing configuration files between deployments has no effect because:
304304

305305
* Users have cached versions of the files that they continue to use.
306306
* The PWA's `service-worker.js` and `service-worker-assets.js` files must be rebuilt on compilation, which signal to the app on the user's next online visit that the app has been redeployed.
307307

308-
For more information on how background updates are handled by PWAs, see <xref:blazor/progressive-web-app#background-updates>.
308+
For more information on how background updates are handled by PWAs, see <xref:blazor/progressive-web-app/index#background-updates>.
309309

310310
## Options configuration
311311

0 commit comments

Comments
 (0)