Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions docs/ai/quickstarts/includes/ai-templates-github-models.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ To authenticate to GitHub models from your code, you'll need to [create a GitHub
The **AI Chat Web App** is almost ready to go as soon as it's created. However, you need to configure the app to use the personal access token you set up for GitHub Models. By default, the app template searches for this value in the project's local .NET user secrets. You can manage user secrets using either the Visual Studio UI or the .NET CLI.

> [!NOTE]
> If you enabled .NET Aspire for your app, skip to the [.NET Aspire configuration](#net-aspire-configuration) section.
> If you enabled Aspire for your app, skip to the [Aspire configuration](#aspire-configuration) section.

## [Visual Studio](#tab/configure-visual-studio)

Expand All @@ -117,9 +117,9 @@ The **AI Chat Web App** is almost ready to go as soon as it's created. However,

---

### .NET Aspire configuration
### Aspire configuration

To use the **AI Chat Web App** template with .NET Aspire orchestration, add the following configurations:
To use the **AI Chat Web App** template with Aspire orchestration, add the following configurations:

#### [Visual Studio](#tab/configure-visual-studio-aspire)

Expand Down
4 changes: 2 additions & 2 deletions docs/architecture/maui/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Below is a high-level overview of the architecture of the sample application.

The sample application ships with:

- .NET Aspire App Hosting & Orchestration
- Aspire App Hosting & Orchestration
- An Blazor web application developed with ASP.NET Core.
- A multi-platform app developed with .NET MAUI, which supports iOS, Android, macOS via Mac Catalyst, and Windows.

Expand All @@ -71,7 +71,7 @@ The sample application includes the following backend services:
- An ordering microservice, which is a domain-driven service that uses domain-driven design patterns.
- A basket microservice, which is a data-driven CRUD service that uses Redis Cache.

These backend services are implemented as microservices using ASP.NET Core, and are deployed as unique containers with .NET Aspire. Collectively, these backend services are referred to as the eShop reference application. Client apps communicate with the backend services through a Representational State Transfer (REST) web interface. For more information about microservices and containers, see [Containerized microservices](micro-services.md).
These backend services are implemented as microservices using ASP.NET Core, and are deployed as unique containers with Aspire. Collectively, these backend services are referred to as the eShop reference application. Client apps communicate with the backend services through a Representational State Transfer (REST) web interface. For more information about microservices and containers, see [Containerized microservices](micro-services.md).

## Multi-Platform app

Expand Down
4 changes: 2 additions & 2 deletions docs/azure/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ conceptualContent:
links:
- itemType: overview
url: /dotnet/aspire/get-started/aspire-overview
text: Build cloud native apps using .NET Aspire
text: Build cloud native apps using Aspire
- itemType: quickstart
url: /dotnet/aspire/get-started/build-your-first-aspire-app?tabs=visual-studio
text: Build your first .NET Aspire app
text: Build your first Aspire app
- itemType: quickstart
text: Run and debug a microservice in Kubernetes
url: /azure/dev-spaces/quickstart-netcore-visualstudio
Expand Down
2 changes: 1 addition & 1 deletion docs/breadcrumb/toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ items:
- name: Azure
tocHref: /dotnet/azure/
topicHref: /dotnet/azure/index
- name: .NET Aspire
- name: Aspire
tocHref: /dotnet/aspire/
topicHref: /dotnet/aspire/index
- name: Orleans
Expand Down
2 changes: 1 addition & 1 deletion docs/core/apps.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ms.custom: "updateeachrelease"

## Cloud apps

* [.NET Aspire](/dotnet/aspire)
* [Aspire](/dotnet/aspire)
* [Serverless functions](/azure/azure-functions/functions-create-first-function-vs-code?pivots=programming-language-csharp)
* [Web and microservices](/aspnet/core/introduction-to-aspnet-core#recommended-learning-path)

Expand Down
2 changes: 1 addition & 1 deletion docs/core/diagnostics/observability-otlp-example.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ms.custom: sfi-image-nochange

This is one of a series of examples to illustrate [.NET observability with OpenTelemetry](./observability-with-otel.md).

In addition to being a standard part of .NET Aspire, the Aspire Dashboard is available as a [standalone docker container](/dotnet/aspire/fundamentals/dashboard/standalone?tabs=powershell), which provides an OTLP endpoint telemetry can be sent to, and it will visualize the logs, metrics and traces. Using the dashboard in this way has no dependency on .NET Aspire, it will visualize telemetry from any application sending it telemetry via OTLP. It works equally well for applications written in Java, GoLang, Python etc. provided that they can send their telemetry to an OTLP endpoint.
In addition to being a standard part of Aspire, the Aspire Dashboard is available as a [standalone docker container](/dotnet/aspire/fundamentals/dashboard/standalone?tabs=powershell), which provides an OTLP endpoint telemetry can be sent to, and it will visualize the logs, metrics and traces. Using the dashboard in this way has no dependency on Aspire, it will visualize telemetry from any application sending it telemetry via OTLP. It works equally well for applications written in Java, GoLang, Python etc. provided that they can send their telemetry to an OTLP endpoint.

Using the Aspire Dashboard has less configuration and setup steps than using Open Source solutions such as [Prometheus, Grafana and Jaeger](./observability-prgrja-example.md), but unlike those tools, the Aspire Dashboard is intended as a developer visualization tool, and not for production monitoring.

Expand Down
24 changes: 12 additions & 12 deletions docs/core/diagnostics/observability-with-otel.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,27 +95,27 @@ This topic is continued with a couple of example walkthroughs for using OpenTele
- [Example: Use OpenTelemetry with Azure Monitor and Application Insights](./observability-applicationinsights.md)
- [Example: Use OpenTelemetry with Prometheus, Grafana, and Jaeger](./observability-prgrja-example.md)

## OpenTelemetry in .NET Aspire
## OpenTelemetry in Aspire

[.NET Aspire](/dotnet/aspire/get-started/aspire-overview) is a set of extensions to .NET to make it easy to create and work with distributed applications. One of the benefits of using .NET Aspire is that telemetry is built in, using the OpenTelemetry libraries for .NET. The default project templates for .NET Aspire contain a `ServiceDefaults` project, part of which is to setup and configure OTel. The Service Defaults project is referenced and initialized by each service in a .NET Aspire solution.
[Aspire](/dotnet/aspire/get-started/aspire-overview) is a set of extensions to .NET to make it easy to create and work with distributed applications. One of the benefits of using Aspire is that telemetry is built in, using the OpenTelemetry libraries for .NET. The default project templates for Aspire contain a `ServiceDefaults` project, part of which is to setup and configure OTel. The Service Defaults project is referenced and initialized by each service in an Aspire solution.

The Service Defaults project template includes the OTel SDK, ASP.NET, HttpClient and Runtime Instrumentation packages, and those are configured in the [`Extensions.cs`](https://github.com/dotnet/aspire/blob/main/src/Aspire.ProjectTemplates/templates/aspire-servicedefaults/9.5/Extensions.cs) file. For exporting telemetry .NET Aspire includes the OTLP exporter by default so that it can provide telemetry visualization using the Aspire Dashboard.
The Service Defaults project template includes the OTel SDK, ASP.NET, HttpClient and Runtime Instrumentation packages, and those are configured in the [`Extensions.cs`](https://github.com/dotnet/aspire/blob/main/src/Aspire.ProjectTemplates/templates/aspire-servicedefaults/9.5/Extensions.cs) file. For exporting telemetry, Aspire includes the OTLP exporter by default so that it can provide telemetry visualization using the Aspire Dashboard.

The Aspire Dashboard is designed to bring telemetry observation to the local debug cycle, which enables developers to not only ensure that the applications are producing telemetry, but also use that telemetry to diagnose those applications locally. Being able to observe the calls between services is proving to be just as useful at debug time as in production. The .NET Aspire dashboard is launched automatically when you F5 the `AppHost` Project from Visual Studio or `dotnet run` the `AppHost` project.
The Aspire Dashboard is designed to bring telemetry observation to the local debug cycle, which enables developers to not only ensure that the applications are producing telemetry, but also use that telemetry to diagnose those applications locally. Being able to observe the calls between services is proving to be just as useful at debug time as in production. The Aspire dashboard is launched automatically when you <kbd>F5</kbd> the `AppHost` Project from Visual Studio or `dotnet run` the `AppHost` project.

[![Aspire Dashboard](./media/aspire-dashboard-thumb.png)](./media/aspire-dashboard.png#lightbox)

For more details on .NET Aspire see:
For more details on Aspire see:

- [Aspire Overview](/dotnet/aspire/get-started/aspire-overview)
- [Telemetry in Aspire](/dotnet/aspire/fundamentals/telemetry)
- [Aspire Dashboard](/dotnet/aspire/fundamentals/dashboard/explore)

### Reusing Service Defaults project without .NET Aspire Orchestration
### Reuse Service Defaults project without Aspire Orchestration

Probably the easiest way to configure OTel for ASP.NET projects is to use the Aspire Service Defaults project, even if not using the rest of .NET Aspire such as the AppHost for orchestration. The Service Defaults project is available as a project template via Visual Studio or `dotnet new`. It configures OTel and sets up the OTLP exporter. You can then use the [OTel environment variables](https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#exporter-configuration) to configure the OTLP endpoint to send telemetry to, and provide the resource properties for the application.
Probably the easiest way to configure OTel for ASP.NET projects is to use the Aspire Service Defaults project, even if not using the rest of Aspire such as the AppHost for orchestration. The Service Defaults project is available as a project template via Visual Studio or `dotnet new`. It configures OTel and sets up the OTLP exporter. You can then use the [OTel environment variables](https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#exporter-configuration) to configure the OTLP endpoint to send telemetry to, and provide the resource properties for the application.

The steps to use *ServiceDefaults* outside .NET Aspire are:
The steps to use *ServiceDefaults* outside Aspire are:

- Add the *ServiceDefaults* project to the solution using Add New Project in Visual Studio, or use `dotnet new aspire-servicedefaults --output ServiceDefaults`.
- Reference the *ServiceDefaults* project from your ASP.NET application. In Visual Studio use **Add** > **Project Reference** and select the *ServiceDefaults* project.
Expand All @@ -132,8 +132,8 @@ app.MapGet("/", () => "Hello World!");
app.Run();
```

Service Defaults can setup the following additional functionality if required via `AddServiceDefaults()` or the specific functions:
Service Defaults can set up the following additional functionality, if required, via `AddServiceDefaults()` or the specific functions:

- Health checks with `/health` and `/alive` endpoints
- Service discovery which will be a no-op without the rest of .NET Aspire
- Configuring resilience for HttpClient which will retry the request in the case of failures
- Health checks with `/health` and `/alive` endpoints.
- Service discovery, which will be a no-op without the rest of Aspire.
- Configuring resilience for `HttpClient`, which retries requests in the case of failures.
2 changes: 1 addition & 1 deletion docs/core/extensions/generic-host.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ When you call either <xref:Microsoft.Extensions.Hosting.IHostBuilder.Build?displ

If you're building for the web or writing a distributed application, you might need to use a different host builder. Consider the following list of additional host builders:

- <xref:Aspire.Hosting.DistributedApplicationBuilder>: A builder for creating distributed apps. For more information, see [.NET Aspire](/dotnet/aspire).
- <xref:Aspire.Hosting.DistributedApplicationBuilder>: A builder for creating distributed apps. For more information, see [Aspire](/dotnet/aspire).
- <xref:Microsoft.AspNetCore.Builder.WebApplicationBuilder>: A builder for web applications and services. For more information, see [ASP.NET Core](/aspnet/core).
- <xref:Microsoft.AspNetCore.Hosting.WebHostBuilder>: A builder for `IWebHost`. For more information, see [ASP.NET Core web host](/aspnet/core/fundamentals/host/web-host).

Expand Down
2 changes: 1 addition & 1 deletion docs/core/extensions/service-discovery.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,4 @@ If service discovery was added to the host using the `AddServiceDiscoveryCore` e

## See also

- [Service discovery in .NET Aspire](/dotnet/aspire/service-discovery/overview)
- [Service discovery in Aspire](/dotnet/aspire/service-discovery/overview)
2 changes: 1 addition & 1 deletion docs/core/project-sdk/msbuild-props.md
Original file line number Diff line number Diff line change
Expand Up @@ -1509,7 +1509,7 @@ For more information, see [Enable or disable extensions](../testing/unit-testing

When you use the [MSTest project SDK](../testing/unit-testing-mstest-sdk.md), you can use the `EnableAspireTesting` property to bring in all the dependencies and default `using` directives you need for testing with `Aspire` and `MSTest`. This property is available in MSTest 3.4 and later versions.

For more information, see [Test with .NET Aspire](../testing/unit-testing-mstest-sdk.md#test-with-net-aspire).
For more information, see [Test with Aspire](../testing/unit-testing-mstest-sdk.md#test-with-aspire).

### EnablePlaywright

Expand Down
4 changes: 2 additions & 2 deletions docs/core/project-sdk/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ You can also author your own SDK that can be distributed via NuGet.
</Project>
```

The `Project/Sdk` attribute and `Sdk` element enable additive SDKs. Consider the following example, where the .NET Aspire SDK (`Aspire.AppHost.Sdk`) is added to the project atop the `Microsoft.NET.Sdk`:
The `Project/Sdk` attribute and `Sdk` element enable additive SDKs. Consider the following example, where the Aspire SDK (`Aspire.AppHost.Sdk`) is added to the project atop the `Microsoft.NET.Sdk`:

```xml
<Project Sdk="Microsoft.NET.Sdk">
Expand All @@ -53,7 +53,7 @@ The `Project/Sdk` attribute and `Sdk` element enable additive SDKs. Consider the
</Project>
```

In the preceding project file, both SDKs are used to resolve dependencies in an additive nature. For more information, see [.NET Aspire SDK](/dotnet/aspire/fundamentals/dotnet-aspire-sdk).
In the preceding project file, both SDKs are used to resolve dependencies in an additive nature. For more information, see [Aspire SDK](/dotnet/aspire/fundamentals/dotnet-aspire-sdk).

To specify an SDK that comes from NuGet, include the version at the end of the name, or specify the name and version in the *global.json* file.

Expand Down
4 changes: 2 additions & 2 deletions docs/core/testing/unit-testing-mstest-sdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ You can also disable an extension that's coming from the selected profile. For e

Outside of the selection of the runner and runner-specific extensions, `MSTest.Sdk` also provides additional features to simplify and enhance your testing experience.

### Test with .NET Aspire
### Test with Aspire

.NET Aspire is an opinionated, cloud-ready stack for building observable, production ready, distributed applications. .NET Aspire is delivered through a collection of NuGet packages that handle specific cloud-native concerns. For more information, see the [.NET Aspire docs](/dotnet/aspire/get-started/aspire-overview).
Aspire is an opinionated, cloud-ready stack for building observable, production ready, distributed applications. Aspire is delivered through a collection of NuGet packages that handle specific cloud-native concerns. For more information, see the [Aspire docs](/dotnet/aspire/get-started/aspire-overview).

> [!NOTE]
> This feature is available from MSTest.Sdk 3.4.0
Expand Down
4 changes: 2 additions & 2 deletions docs/core/whats-new/dotnet-10/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ The .NET 10 SDK includes support for [Microsoft.Testing.Platform](../../testing/

For more information, see [What's new in the SDK for .NET 10](sdk.md).

## .NET Aspire
## Aspire

For information about what's new in .NET Aspire, see [.NET Aspire — what's new?](/dotnet/aspire/whats-new/).
For information about what's new in Aspire, see [Aspire — what's new?](/dotnet/aspire/whats-new/).

## ASP.NET Core

Expand Down
4 changes: 2 additions & 2 deletions docs/core/whats-new/dotnet-8/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ For information about what's new in the .NET SDK, code analysis, and diagnostics

C# 12 shipped with the .NET 8 SDK. For more information, see [What's new in C# 12](../../../csharp/whats-new/csharp-12.md).

## .NET Aspire
## Aspire

.NET Aspire is an opinionated, cloud-ready stack for building observable, production ready, distributed applications.​ .NET Aspire is delivered through a collection of NuGet packages that handle specific cloud-native concerns, and is available in preview for .NET 8. For more information, see [.NET Aspire](/dotnet/aspire).
Aspire is an opinionated, cloud-ready stack for building observable, production ready, distributed applications.​ Aspire is delivered through a collection of NuGet packages that handle specific cloud-native concerns, and is available in preview for .NET 8. For more information, see [Aspire](/dotnet/aspire).

## ASP.NET Core

Expand Down
4 changes: 2 additions & 2 deletions docs/core/whats-new/dotnet-9/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ The latest release introduces significant new capabilities for tokenizers:
- WordPiece
- Bert (based on WordPiece) for Bert-supported models like optimum--all-MiniLM-L6-v2

## .NET Aspire
## Aspire

.NET Aspire is a set of powerful tools, templates, and packages for building observable, production ready apps.​ .NET Aspire's latest release includes improvements to the dashboard and resource lifecycle management. It also adds new integrations and APIs for more flexibility during development. .NET Aspire 9 works with both .NET 9 and .NET 8 apps. For more information, see [What's new in .NET Aspire 9](/dotnet/aspire/whats-new/dotnet-aspire-9-release-candidate-1).
Aspire is a set of powerful tools, templates, and packages for building observable, production ready apps.​ Aspire's latest release includes improvements to the dashboard and resource lifecycle management. It also adds new integrations and APIs for more flexibility during development. Aspire 9 works with both .NET 9 and .NET 8 apps. For more information, see [What's new in Aspire 9](/dotnet/aspire/whats-new/dotnet-aspire-9-release-candidate-1).

## ASP.NET Core

Expand Down
12 changes: 2 additions & 10 deletions docs/csharp/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@ additionalContent:
- url: ../azure/index.yml
text: Azure for .NET developers
- url: /dotnet/aspire
text: .NET Aspire
text: Aspire
- url: /dotnet/aspire/get-started/quickstart-build-your-first-aspire-app
text: Build cloud-native apps with .NET Aspire
text: Build cloud-native apps with Aspire
- url: ../azure/migration/app-service.md?preserve-view=true&view=azure-dotnet
text: Migrate on-premises .NET web apps or services
- url: ../azure/key-azure-services.md
Expand Down Expand Up @@ -306,14 +306,6 @@ additionalContent:
summary: API reference documentation for ASP.NET Core
url: ../../api/index.md
# Card
- title: ".NET Aspire API reference"
summary: Reference documentation for .NET Aspire
url: ../../api/index.md?view=dotnet-aspire-9.0&preserve-view=true
# Card
- title: "ML.NET API reference"
summary: API reference documentation for ML.NET
url: ../../api/index.md
# Card
- title: ".NET Framework API reference"
summary: API reference documentation for .NET Framework
url: ../../api/index.md?view=netframework-4.8&preserve-view=true
Expand Down
Loading