Skip to content

Commit b9cde8d

Browse files
github-actions[bot]github-actions[bot]
authored
Merge pull request #2674 from dotnet/main
✅ Merge `main` into `live`
2 parents 1e1cb26 + cab7881 commit b9cde8d

File tree

157 files changed

+2725
-862
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+2725
-862
lines changed

‎.openpublishing.publish.config.json

+6
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@
4646
"branch": "main",
4747
"branch_mapping": {}
4848
},
49+
{
50+
"path_to_root": "aspire-devcontainer",
51+
"url": "https://github.com/dotnet/aspire-devcontainer",
52+
"branch": "main",
53+
"branch_mapping": {}
54+
},
4955
{
5056
"path_to_root": "aspire-docs-samples-solution",
5157
"url": "https://github.com/MicrosoftDocs/aspire-docs-samples",

‎.vscode/shared.code-snippets

-19
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,4 @@
11
{
2-
"Details and summary HTML": {
3-
"scope": "markdown",
4-
"prefix": "details",
5-
"body": [
6-
"<!-- markdownlint-disable MD033 -->",
7-
"<br/>",
8-
"<details>",
9-
"<summary id=\"$1\"><strong>Toggle $2.</strong></summary>",
10-
"<p aria-labelledby=\"$1\">",
11-
"",
12-
"$3",
13-
"",
14-
"</p>",
15-
"</details>",
16-
"<!-- markdownlint-enable MD033 -->",
17-
"$0"
18-
],
19-
"description": "Details and summary HTML"
20-
},
212
"Inline NuGet package reference": {
223
"scope": "markdown",
234
"prefix": "inline nuget",

‎docs/app-host/configuration.md

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ By default, the dashboard is automatically started by the app host. The dashboar
7575
| `ASPNETCORE_ENVIRONMENT` | `Production` | Configures the environment the dashboard runs as. For more information, see [Use multiple environments in ASP.NET Core](/aspnet/core/fundamentals/environments). |
7676
| `DOTNET_DASHBOARD_OTLP_ENDPOINT_URL` | `http://localhost:18889` if no gRPC endpoint is configured. | Configures the dashboard OTLP gRPC address. Used by the dashboard to receive telemetry over OTLP. Set on resources as the `OTEL_EXPORTER_OTLP_ENDPOINT` env var. The `OTEL_EXPORTER_OTLP_PROTOCOL` env var is `grpc`. Automatically generated with _launchSettings.json_ to have a random port on localhost. |
7777
| `DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL` | `null` | Configures the dashboard OTLP HTTP address. Used by the dashboard to receive telemetry over OTLP. If only `DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL` is configured then it is set on resources as the `OTEL_EXPORTER_OTLP_ENDPOINT` env var. The `OTEL_EXPORTER_OTLP_PROTOCOL` env var is `http/protobuf`. |
78+
| `DOTNET_DASHBOARD_CORS_ALLOWED_ORIGINS` | `null` | Overrides the CORS allowed origins configured in the dashboard. This setting replaces the default behavior of calculating allowed origins based on resource endpoints. |
7879
| `DOTNET_DASHBOARD_FRONTEND_BROWSERTOKEN` | Automatically generated 128-bit entropy token. | Configures the frontend browser token. This is the value that must be entered to access the dashboard when the auth mode is BrowserToken. If no browser token is specified then a new token is generated each time the app host is launched. |
7980

8081
## Internal

‎docs/app-host/snippets/AspireApp/AspireApp.AppHost/AspireApp.AppHost.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.1.0" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
@@ -17,8 +17,8 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0" />
21-
<PackageReference Include="Aspire.Hosting.Redis" Version="9.0.0" />
20+
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
21+
<PackageReference Include="Aspire.Hosting.Redis" Version="9.1.0" />
2222
</ItemGroup>
2323

2424
</Project>

‎docs/app-host/snippets/AspireApp/AspireApp.ResourceAppHost/AspireApp.ResourceAppHost.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.1.0" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
@@ -17,8 +17,8 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0" />
21-
<PackageReference Include="Aspire.Hosting.Redis" Version="9.0.0" />
20+
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
21+
<PackageReference Include="Aspire.Hosting.Redis" Version="9.1.0" />
2222
</ItemGroup>
2323

2424
</Project>

‎docs/app-host/snippets/AspireApp/AspireApp.ServiceDefaults/AspireApp.ServiceDefaults.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1212

1313
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
14-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
1515
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
1616
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
1717
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.0" />

‎docs/app-host/snippets/AspireApp/AspireApp.Web/AspireApp.Web.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="9.0.0" />
14+
<PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="9.1.0" />
1515
</ItemGroup>
1616

1717
</Project>

‎docs/authentication/keycloak-integration.md

-10
Original file line numberDiff line numberDiff line change
@@ -165,18 +165,8 @@ The realm import files are mounted at `/opt/keycloak/data/import` in the Keycloa
165165

166166
As an example, the following JSON file could be added to the app host project in a _/Realms_ folder—to serve as a source realm configuration file:
167167

168-
<!-- markdownlint-disable MD033 -->
169-
<br/>
170-
<details>
171-
<summary id='realm-json'><strong>Toggle realm JSON example.</strong></summary>
172-
<p aria-labelledby='realm-json'>
173-
174168
:::code language="json" source="snippets/AspireApp/AspireApp.AppHost/Realms/weathershop-realm.json":::
175169

176-
</p>
177-
</details>
178-
<!-- markdownlint-enable MD033 -->
179-
180170
### Hosting integration health checks
181171

182172
The Keycloak hosting integration doesn't currently support a health checks, nor does it automatically add them.

‎docs/authentication/snippets/AspireApp/AspireApp.AppHost/AspireApp.AppHost.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.1.0" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
@@ -17,8 +17,8 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0" />
21-
<PackageReference Include="Aspire.Hosting.Keycloak" Version="9.0.0-preview.5.24551.3" />
20+
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
21+
<PackageReference Include="Aspire.Hosting.Keycloak" Version="9.1.0-preview.1.24113.4 />
2222
</ItemGroup>
2323
2424
</Project>

‎docs/authentication/snippets/AspireApp/AspireApp.ServiceDefaults/AspireApp.ServiceDefaults.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1212

1313
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
14-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
1515
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
1616
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
1717
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.0" />

0 commit comments

Comments
 (0)