Skip to content

Commit

Permalink
Merge pull request #33654 from dotnet/main
Browse files Browse the repository at this point in the history
Merge to Live
  • Loading branch information
Rick-Anderson authored Sep 19, 2024
2 parents 95aaf28 + 1658e76 commit 81af8ac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 3 additions & 0 deletions aspnetcore/blazor/fundamentals/startup.md
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,9 @@ In advanced programming scenarios, the `configureRuntime` function with the `dot
* Configures the .NET WebAssembly runtime.
* Changes the behavior of a C library.

> [!NOTE]
> A documentation request is pending in the `dotnet/runtime` GitHub repository for more information on environment variables that configure the .NET WebAssembly runtime or affect the behavior of C libraries. Although the documentation request is pending, more information and cross-links to additional resources are available in the request, [Question/request for documentation on .NET WASM runtime env vars (`dotnet/runtime` #98225)](https://github.com/dotnet/runtime/issues/98225).
The `configureRuntime` function can also be used to [enable integration with a browser profiler](https://github.com/dotnet/runtime/blob/main/src/mono/wasm/features.md#profiling).

For the placeholders in the following examples that set an environment variable:
Expand Down
5 changes: 1 addition & 4 deletions aspnetcore/host-and-deploy/azure-apps/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ App settings in the Azure Portal permit you to set environment variables for the

When an app setting is created or modified in the Azure Portal and the **Save** button is selected, the Azure App is restarted. The environment variable is available to the app after the service restarts.

When an app uses the [Generic Host](xref:fundamentals/host/generic-host), environment variables are loaded into the app's configuration when <xref:Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder%2A> is called to build the host. For more information, see <xref:fundamentals/host/generic-host> and the [Environment Variables Configuration Provider](xref:fundamentals/configuration/index#environment-variables).
Environment variables are loaded into the app's configuration when [CreateBuilder](/dotnet/api/microsoft.aspnetcore.builder.webapplication.createbuilder) is called to build the host. For more information, see the [Environment Variables Configuration Provider](xref:fundamentals/configuration/index#environment-variables).

:::moniker-end
:::moniker range="< aspnetcore-3.0"
Expand Down Expand Up @@ -239,9 +239,6 @@ When the operation completes, the latest .NET Core preview is installed. Verify
>
> The command returns `True` when the x64 preview runtime is installed.
> [!NOTE]
> **ASP.NET Core Extensions** enables additional functionality for ASP.NET Core on Azure App Services, such as enabling Azure logging. The extension is installed automatically when deploying from Visual Studio. If the extension isn't installed, install it for the app.
**Use the preview site extension with an ARM template**

If an ARM template is used to create and deploy apps, the `Microsoft.Web/sites/siteextensions` resource type can be used to add the site extension to a web app. In the following example, the ASP.NET Core 5.0 (x64) Runtime site extension (`AspNetCoreRuntime.5.0.x64`) is added to the app:
Expand Down

0 comments on commit 81af8ac

Please sign in to comment.