diff --git a/eng/Dependencies.props b/eng/Dependencies.props index a9dae44b5f1e..ceb9057a4deb 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -13,6 +13,22 @@ and are generated based on the last package release. + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index f607d4aa3c2d..90bcc20358b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -206,6 +206,20 @@ $(MicrosoftNETCoreAppRuntimewinx64Version) + + 1.9.0 + 1.9.0 + 1.9.0 + 1.9.0 + 1.9.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.1.0 + 6.0.0 6.1.3 diff --git a/src/Components/Samples/Aspire/AspireApp1.ApiService/AspireApp1.ApiService.csproj b/src/Components/Samples/Aspire/AspireApp1.ApiService/AspireApp1.ApiService.csproj new file mode 100644 index 000000000000..d63a64ba4bbd --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.ApiService/AspireApp1.ApiService.csproj @@ -0,0 +1,27 @@ + + + + net10.0 + enable + enable + true + + + + + + + + + + + + + + + + + + + + diff --git a/src/Components/Samples/Aspire/AspireApp1.ApiService/Program.cs b/src/Components/Samples/Aspire/AspireApp1.ApiService/Program.cs new file mode 100644 index 000000000000..a621bc423fc7 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.ApiService/Program.cs @@ -0,0 +1,48 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +var builder = WebApplication.CreateBuilder(args); + +// Add service defaults & Aspire client integrations. +builder.AddServiceDefaults(); + +// Add services to the container. +builder.Services.AddProblemDetails(); + +// Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi +builder.Services.AddOpenApi(); + +var app = builder.Build(); + +// Configure the HTTP request pipeline. +app.UseExceptionHandler(); + +if (app.Environment.IsDevelopment()) +{ + app.MapOpenApi(); +} + +string[] summaries = ["Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"]; + +app.MapGet("/weatherforecast", () => +{ + var forecast = Enumerable.Range(1, 5).Select(index => + new WeatherForecast + ( + DateOnly.FromDateTime(DateTime.Now.AddDays(index)), + Random.Shared.Next(-20, 55), + summaries[Random.Shared.Next(summaries.Length)] + )) + .ToArray(); + return forecast; +}) +.WithName("GetWeatherForecast"); + +app.MapDefaultEndpoints(); + +app.Run(); + +record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary) +{ + public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); +} diff --git a/src/Components/Samples/Aspire/AspireApp1.ApiService/Properties/launchSettings.json b/src/Components/Samples/Aspire/AspireApp1.ApiService/Properties/launchSettings.json new file mode 100644 index 000000000000..8b46b21be7ff --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.ApiService/Properties/launchSettings.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": false, + "applicationUrl": "http://localhost:5551", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": false, + "applicationUrl": "https://localhost:7496;http://localhost:5551", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/src/Components/Samples/Aspire/AspireApp1.ApiService/appsettings.Development.json b/src/Components/Samples/Aspire/AspireApp1.ApiService/appsettings.Development.json new file mode 100644 index 000000000000..0c208ae9181e --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.ApiService/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/src/Components/Samples/Aspire/AspireApp1.ApiService/appsettings.json b/src/Components/Samples/Aspire/AspireApp1.ApiService/appsettings.json new file mode 100644 index 000000000000..10f68b8c8b4f --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.ApiService/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/src/Components/Samples/Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj b/src/Components/Samples/Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj new file mode 100644 index 000000000000..f23c722d8944 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj @@ -0,0 +1,46 @@ + + + + + + Exe + net10.0 + enable + enable + true + 305cc722-e514-4d8f-878b-a656f87e31d7 + true + true + + + + + + + + + + + + + + + + + + + + + true + + + true + + + + + + diff --git a/src/Components/Samples/Aspire/AspireApp1.AppHost/Program.cs b/src/Components/Samples/Aspire/AspireApp1.AppHost/Program.cs new file mode 100644 index 000000000000..0ef65366aba1 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.AppHost/Program.cs @@ -0,0 +1,17 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +var builder = DistributedApplication.CreateBuilder(args); + +var cache = builder.AddRedis("cache"); + +var apiService = builder.AddProject("apiservice"); + +builder.AddProject("webfrontend") + .WithExternalHttpEndpoints() + .WithReference(cache) + .WaitFor(cache) + .WithReference(apiService) + .WaitFor(apiService); + +builder.Build().Run(); diff --git a/src/Components/Samples/Aspire/AspireApp1.AppHost/Properties/launchSettings.json b/src/Components/Samples/Aspire/AspireApp1.AppHost/Properties/launchSettings.json new file mode 100644 index 000000000000..e14aeb2db665 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.AppHost/Properties/launchSettings.json @@ -0,0 +1,29 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:17202;http://localhost:15121", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21047", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22054" + } + }, + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:15121", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19030", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20180" + } + } + } +} diff --git a/src/Components/Samples/Aspire/AspireApp1.AppHost/appsettings.Development.json b/src/Components/Samples/Aspire/AspireApp1.AppHost/appsettings.Development.json new file mode 100644 index 000000000000..0c208ae9181e --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.AppHost/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/src/Components/Samples/Aspire/AspireApp1.AppHost/appsettings.json b/src/Components/Samples/Aspire/AspireApp1.AppHost/appsettings.json new file mode 100644 index 000000000000..31c092aa4501 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.Dcp": "Warning" + } + } +} diff --git a/src/Components/Samples/Aspire/AspireApp1.ServiceDefaults/AspireApp1.ServiceDefaults.csproj b/src/Components/Samples/Aspire/AspireApp1.ServiceDefaults/AspireApp1.ServiceDefaults.csproj new file mode 100644 index 000000000000..76e806203373 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.ServiceDefaults/AspireApp1.ServiceDefaults.csproj @@ -0,0 +1,33 @@ + + + + net10.0 + enable + enable + true + Library + + true + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Components/Samples/Aspire/AspireApp1.ServiceDefaults/Extensions.cs b/src/Components/Samples/Aspire/AspireApp1.ServiceDefaults/Extensions.cs new file mode 100644 index 000000000000..1b055334aeac --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.ServiceDefaults/Extensions.cs @@ -0,0 +1,122 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.HealthChecks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.HealthChecks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.ServiceDiscovery; +using OpenTelemetry; +using OpenTelemetry.Metrics; +using OpenTelemetry.Trace; + +namespace Microsoft.Extensions.Hosting; + +// Adds common .NET Aspire services: service discovery, resilience, health checks, and OpenTelemetry. +// This project should be referenced by each service project in your solution. +// To learn more about using this project, see https://aka.ms/dotnet/aspire/service-defaults +public static class Extensions +{ + public static TBuilder AddServiceDefaults(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.ConfigureOpenTelemetry(); + + builder.AddDefaultHealthChecks(); + + builder.Services.AddServiceDiscovery(); + + builder.Services.ConfigureHttpClientDefaults(http => + { + // Turn on resilience by default + http.AddStandardResilienceHandler(); + + // Turn on service discovery by default + http.AddServiceDiscovery(); + }); + + // Uncomment the following to restrict the allowed schemes for service discovery. + // builder.Services.Configure(options => + // { + // options.AllowedSchemes = ["https"]; + // }); + + return builder; + } + + public static TBuilder ConfigureOpenTelemetry(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.Logging.AddOpenTelemetry(logging => + { + logging.IncludeFormattedMessage = true; + logging.IncludeScopes = true; + }); + + builder.Services.AddOpenTelemetry() + .WithMetrics(metrics => + { + metrics.AddAspNetCoreInstrumentation() + .AddHttpClientInstrumentation() + .AddRuntimeInstrumentation(); + }) + .WithTracing(tracing => + { + tracing.AddSource(builder.Environment.ApplicationName) + .AddAspNetCoreInstrumentation() + // Uncomment the following line to enable gRPC instrumentation (requires the OpenTelemetry.Instrumentation.GrpcNetClient package) + //.AddGrpcClientInstrumentation() + .AddHttpClientInstrumentation(); + }); + + builder.AddOpenTelemetryExporters(); + + return builder; + } + + private static TBuilder AddOpenTelemetryExporters(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]); + + if (useOtlpExporter) + { + builder.Services.AddOpenTelemetry().UseOtlpExporter(); + } + + // Uncomment the following lines to enable the Azure Monitor exporter (requires the Azure.Monitor.OpenTelemetry.AspNetCore package) + //if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"])) + //{ + // builder.Services.AddOpenTelemetry() + // .UseAzureMonitor(); + //} + + return builder; + } + + public static TBuilder AddDefaultHealthChecks(this TBuilder builder) where TBuilder : IHostApplicationBuilder + { + builder.Services.AddHealthChecks() + // Add a default liveness check to ensure app is responsive + .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]); + + return builder; + } + + public static WebApplication MapDefaultEndpoints(this WebApplication app) + { + // Adding health checks endpoints to applications in non-development environments has security implications. + // See https://aka.ms/dotnet/aspire/healthchecks for details before enabling these endpoints in non-development environments. + if (app.Environment.IsDevelopment()) + { + // All health checks must pass for app to be considered ready to accept traffic after starting + app.MapHealthChecks("/health"); + + // Only health checks tagged with the "live" tag must pass for app to be considered alive + app.MapHealthChecks("/alive", new HealthCheckOptions + { + Predicate = r => r.Tags.Contains("live") + }); + } + + return app; + } +} diff --git a/src/Components/Samples/Aspire/AspireApp1.ServiceDefaults/Properties/launchSettings.json b/src/Components/Samples/Aspire/AspireApp1.ServiceDefaults/Properties/launchSettings.json new file mode 100644 index 000000000000..ee66c919599a --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.ServiceDefaults/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "AspireApp1.ServiceDefaults": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:57684;http://localhost:57685" + } + } +} \ No newline at end of file diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/AspireApp1.Web.csproj b/src/Components/Samples/Aspire/AspireApp1.Web/AspireApp1.Web.csproj new file mode 100644 index 000000000000..13194b0b090c --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/AspireApp1.Web.csproj @@ -0,0 +1,23 @@ + + + + $(DefaultNetCoreTargetFramework) + false + enable + enable + true + + + + + + + + + + + + + + + diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Components/App.razor b/src/Components/Samples/Aspire/AspireApp1.Web/Components/App.razor new file mode 100644 index 000000000000..1f2477d2a829 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Components/App.razor @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Components/Layout/MainLayout.razor b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Layout/MainLayout.razor new file mode 100644 index 000000000000..5a24bb137113 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Layout/MainLayout.razor @@ -0,0 +1,23 @@ +@inherits LayoutComponentBase + +
+
+ +
+ +
+
+ About +
+ +
+ @Body +
+
+
+ +
+ An unhandled error has occurred. + Reload + 🗙 +
diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Components/Layout/MainLayout.razor.css b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Layout/MainLayout.razor.css new file mode 100644 index 000000000000..038baf178b48 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Layout/MainLayout.razor.css @@ -0,0 +1,96 @@ +.page { + position: relative; + display: flex; + flex-direction: column; +} + +main { + flex: 1; +} + +.sidebar { + background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); +} + +.top-row { + background-color: #f7f7f7; + border-bottom: 1px solid #d6d5d5; + justify-content: flex-end; + height: 3.5rem; + display: flex; + align-items: center; +} + + .top-row ::deep a, .top-row ::deep .btn-link { + white-space: nowrap; + margin-left: 1.5rem; + text-decoration: none; + } + + .top-row ::deep a:hover, .top-row ::deep .btn-link:hover { + text-decoration: underline; + } + + .top-row ::deep a:first-child { + overflow: hidden; + text-overflow: ellipsis; + } + +@media (max-width: 640.98px) { + .top-row { + justify-content: space-between; + } + + .top-row ::deep a, .top-row ::deep .btn-link { + margin-left: 0; + } +} + +@media (min-width: 641px) { + .page { + flex-direction: row; + } + + .sidebar { + width: 250px; + height: 100vh; + position: sticky; + top: 0; + } + + .top-row { + position: sticky; + top: 0; + z-index: 1; + } + + .top-row.auth ::deep a:first-child { + flex: 1; + text-align: right; + width: 0; + } + + .top-row, article { + padding-left: 2rem !important; + padding-right: 1.5rem !important; + } +} + +#blazor-error-ui { + background: lightyellow; + bottom: 0; + box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + display: none; + left: 0; + padding: 0.6rem 1.25rem 0.7rem 1.25rem; + position: fixed; + width: 100%; + z-index: 1000; +} + + #blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; + } diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Components/Layout/NavMenu.razor b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Layout/NavMenu.razor new file mode 100644 index 000000000000..52b09e541bb5 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Layout/NavMenu.razor @@ -0,0 +1,29 @@ +
+
+ AspireApp1 +
+
+ + + +
+ +
diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Components/Layout/NavMenu.razor.css b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Layout/NavMenu.razor.css new file mode 100644 index 000000000000..1338edb61e3e --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Layout/NavMenu.razor.css @@ -0,0 +1,102 @@ +.navbar-toggler { + appearance: none; + cursor: pointer; + width: 3.5rem; + height: 2.5rem; + color: white; + position: absolute; + top: 0.5rem; + right: 1rem; + border: 1px solid rgba(255, 255, 255, 0.1); + background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1); +} + +.navbar-toggler:checked { + background-color: rgba(255, 255, 255, 0.5); +} + +.top-row { + min-height: 3.5rem; + background-color: rgba(0,0,0,0.4); +} + +.navbar-brand { + font-size: 1.1rem; +} + +.bi { + display: inline-block; + position: relative; + width: 1.25rem; + height: 1.25rem; + margin-right: 0.75rem; + top: -1px; + background-size: cover; +} + +.bi-house-door-fill { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E"); +} + +.bi-plus-square-fill { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E"); +} + +.bi-list-nested { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E"); +} + +.nav-item { + font-size: 0.9rem; + padding-bottom: 0.5rem; +} + + .nav-item:first-of-type { + padding-top: 1rem; + } + + .nav-item:last-of-type { + padding-bottom: 1rem; + } + + .nav-item ::deep a { + color: #d7d7d7; + border-radius: 4px; + height: 3rem; + display: flex; + align-items: center; + line-height: 3rem; + } + +.nav-item ::deep a.active { + background-color: rgba(255,255,255,0.37); + color: white; +} + +.nav-item ::deep a:hover { + background-color: rgba(255,255,255,0.1); + color: white; +} + +.nav-scrollable { + display: none; +} + +.navbar-toggler:checked ~ .nav-scrollable { + display: block; +} + +@media (min-width: 641px) { + .navbar-toggler { + display: none; + } + + .nav-scrollable { + /* Never collapse the sidebar for wide screens */ + display: block; + + /* Allow sidebar to scroll for tall menus */ + height: calc(100vh - 3.5rem); + overflow-y: auto; + } +} diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Components/Pages/Counter.razor b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Pages/Counter.razor new file mode 100644 index 000000000000..e9fbe006cae8 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Pages/Counter.razor @@ -0,0 +1,23 @@ +@page "/counter" +@rendermode InteractiveServer +@using System.Diagnostics.Metrics + +Counter + +

Counter

+ +

Current count: @currentCount

+ + + +@code { + private int currentCount = 0; + private static readonly Meter s_meter = new("AspireApp1.Web.Counter", "1.0.0"); + private static readonly Counter s_counterIncrements = s_meter.CreateCounter("counter.increments", "Increments", "Number of counter increments"); + + private void IncrementCount() + { + currentCount++; + s_counterIncrements.Add(1, new KeyValuePair("current_value", currentCount)); + } +} diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Components/Pages/Error.razor b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Pages/Error.razor new file mode 100644 index 000000000000..fcaa7c6ef678 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Pages/Error.razor @@ -0,0 +1,38 @@ +@page "/Error" +@using System.Diagnostics + +Error + +

Error.

+

An error occurred while processing your request.

+ +@if (ShowRequestId) +{ +

+ Request ID: @requestId +

+} + +

Development Mode

+

+ Swapping to Development environment will display more detailed information about the error that occurred. +

+

+ The Development environment shouldn't be enabled for deployed applications. + It can result in displaying sensitive information from exceptions to end users. + For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development + and restarting the app. +

+ +@code{ + [CascadingParameter] + public HttpContext? HttpContext { get; set; } + + private string? requestId; + private bool ShowRequestId => !string.IsNullOrEmpty(requestId); + + protected override void OnInitialized() + { + requestId = Activity.Current?.Id ?? HttpContext?.TraceIdentifier; + } +} diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Components/Pages/Home.razor b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Pages/Home.razor new file mode 100644 index 000000000000..9001e0bd2727 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Pages/Home.razor @@ -0,0 +1,7 @@ +@page "/" + +Home + +

Hello, world!

+ +Welcome to your new app. diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Components/Pages/Weather.razor b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Pages/Weather.razor new file mode 100644 index 000000000000..16302bd96167 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Pages/Weather.razor @@ -0,0 +1,49 @@ +@page "/weather" +@attribute [StreamRendering(true)] +@attribute [OutputCache(Duration = 5)] + +@inject WeatherApiClient WeatherApi + +Weather + +

Weather

+ +

This component demonstrates showing data loaded from a backend API service.

+ +@if (forecasts == null) +{ +

Loading...

+} +else +{ + + + + + + + + + + + @foreach (var forecast in forecasts) + { + + + + + + + } + +
DateTemp. (C)Temp. (F)Summary
@forecast.Date.ToShortDateString()@forecast.TemperatureC@forecast.TemperatureF@forecast.Summary
+} + +@code { + private WeatherForecast[]? forecasts; + + protected override async Task OnInitializedAsync() + { + forecasts = await WeatherApi.GetWeatherAsync(); + } +} diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Components/Routes.razor b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Routes.razor new file mode 100644 index 000000000000..f756e19dfbc8 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Components/Routes.razor @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Components/_Imports.razor b/src/Components/Samples/Aspire/AspireApp1.Web/Components/_Imports.razor new file mode 100644 index 000000000000..7546f279db90 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Components/_Imports.razor @@ -0,0 +1,11 @@ +@using System.Net.Http +@using System.Net.Http.Json +@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using static Microsoft.AspNetCore.Components.Web.RenderMode +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.AspNetCore.OutputCaching +@using Microsoft.JSInterop +@using AspireApp1.Web +@using AspireApp1.Web.Components diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Program.cs b/src/Components/Samples/Aspire/AspireApp1.Web/Program.cs new file mode 100644 index 000000000000..b62e6bdb0d8b --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Program.cs @@ -0,0 +1,57 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Security.Cryptography.Xml; +using AspireApp1.Web; +using AspireApp1.Web.Components; +using OpenTelemetry.Metrics; +using Microsoft.Extensions.Hosting; + +var builder = WebApplication.CreateBuilder(args); + +// Add service defaults & Aspire client integrations. +builder.AddServiceDefaults(); +//builder.AddRedisOutputCache("cache"); + +// Add custom meter to OpenTelemetry +builder.Services.ConfigureOpenTelemetryMeterProvider(meterProvider => +{ + meterProvider.AddMeter("AspireApp1.Web.Counter"); + meterProvider.AddMeter("Microsoft.AspNetCore.Components.Rendering"); + meterProvider.AddMeter("Microsoft.AspNetCore.Components.Server.Circuits"); +}); + +// Add services to the container. +builder.Services.AddRazorComponents() + .AddInteractiveServerComponents(); + +builder.Services.AddHttpClient(client => + { + // This URL uses "https+http://" to indicate HTTPS is preferred over HTTP. + // Learn more about service discovery scheme resolution at https://aka.ms/dotnet/sdschemes. + client.BaseAddress = new("https+http://apiservice"); + }); + +var app = builder.Build(); + +if (!app.Environment.IsDevelopment()) +{ + app.UseExceptionHandler("/Error", createScopeForErrors: true); + // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); +} + +app.UseHttpsRedirection(); + +app.UseAntiforgery(); + +app.UseOutputCache(); + +app.MapStaticAssets(); + +app.MapRazorComponents() + .AddInteractiveServerRenderMode(); + +app.MapDefaultEndpoints(); + +app.Run(); diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/Properties/launchSettings.json b/src/Components/Samples/Aspire/AspireApp1.Web/Properties/launchSettings.json new file mode 100644 index 000000000000..eb8e37b9d358 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/Properties/launchSettings.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:5155", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:7020;http://localhost:5155", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/WeatherApiClient.cs b/src/Components/Samples/Aspire/AspireApp1.Web/WeatherApiClient.cs new file mode 100644 index 000000000000..d66882b5f4a7 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/WeatherApiClient.cs @@ -0,0 +1,34 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Net.Http; + +namespace AspireApp1.Web; + +public class WeatherApiClient(HttpClient httpClient) +{ + public async Task GetWeatherAsync(int maxItems = 10, CancellationToken cancellationToken = default) + { + List? forecasts = null; + + await foreach (var forecast in httpClient.GetFromJsonAsAsyncEnumerable("/weatherforecast", cancellationToken)) + { + if (forecasts?.Count >= maxItems) + { + break; + } + if (forecast is not null) + { + forecasts ??= []; + forecasts.Add(forecast); + } + } + + return forecasts?.ToArray() ?? []; + } +} + +public record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary) +{ + public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); +} diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/appsettings.Development.json b/src/Components/Samples/Aspire/AspireApp1.Web/appsettings.Development.json new file mode 100644 index 000000000000..0c208ae9181e --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/appsettings.json b/src/Components/Samples/Aspire/AspireApp1.Web/appsettings.json new file mode 100644 index 000000000000..10f68b8c8b4f --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/wwwroot/app.css b/src/Components/Samples/Aspire/AspireApp1.Web/wwwroot/app.css new file mode 100644 index 000000000000..7fe3230100f2 --- /dev/null +++ b/src/Components/Samples/Aspire/AspireApp1.Web/wwwroot/app.css @@ -0,0 +1,56 @@ +html, body { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; +} + +a, .btn-link { + color: #006bb7; +} + +.btn-primary { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} + +.btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus { + box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb; +} + +.content { + padding-top: 1.1rem; +} + +h1:focus { + outline: none; +} + +.valid.modified:not([type=checkbox]) { + outline: 1px solid #26b050; +} + +.invalid { + outline: 1px solid #e51550; +} + +.validation-message { + color: #e51550; +} + +.blazor-error-boundary { + background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121; + padding: 1rem 1rem 1rem 3.7rem; + color: white; +} + + .blazor-error-boundary::after { + content: "An error has occurred." + } + +.form-floating > .form-control-plaintext::placeholder, .form-floating > .form-control::placeholder { + color: var(--bs-secondary-color); + text-align: end; +} + +.form-floating > .form-control-plaintext:focus::placeholder, .form-floating > .form-control:focus::placeholder { + text-align: start; +} diff --git a/src/Components/Samples/Aspire/AspireApp1.Web/wwwroot/favicon.png b/src/Components/Samples/Aspire/AspireApp1.Web/wwwroot/favicon.png new file mode 100644 index 000000000000..8422b5969593 Binary files /dev/null and b/src/Components/Samples/Aspire/AspireApp1.Web/wwwroot/favicon.png differ