-
Notifications
You must be signed in to change notification settings - Fork 480
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into validate-arguments-of-public-methods#aspire-…
…hosting-nodejs
- Loading branch information
Showing
111 changed files
with
3,844 additions
and
165 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
playground/BrowserTelemetry/BrowserTelemetry.AppHost/BrowserTelemetry.AppHost.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| <IsAspireHost>true</IsAspireHost> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Include="..\..\KnownResourceNames.cs" Link="KnownResourceNames.cs" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" /> | ||
| <ProjectReference Include="..\BrowserTelemetry.Web\BrowserTelemetry.Web.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
16 changes: 16 additions & 0 deletions
16
playground/BrowserTelemetry/BrowserTelemetry.AppHost/Program.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // 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); | ||
|
|
||
| builder.AddProject<Projects.BrowserTelemetry_Web>("web") | ||
| .WithExternalHttpEndpoints(); | ||
|
|
||
| // This project is only added in playground projects to support development/debugging | ||
| // of the dashboard. It is not required in end developer code. Comment out this code | ||
| // to test end developer dashboard launch experience. Refer to Directory.Build.props | ||
| // for the path to the dashboard binary (defaults to the Aspire.Dashboard bin output | ||
| // in the artifacts dir). | ||
| builder.AddProject<Projects.Aspire_Dashboard>(KnownResourceNames.AspireDashboard); | ||
|
|
||
| builder.Build().Run(); |
44 changes: 44 additions & 0 deletions
44
playground/BrowserTelemetry/BrowserTelemetry.AppHost/Properties/launchSettings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| { | ||
| "$schema": "http://json.schemastore.org/launchsettings.json", | ||
| "profiles": { | ||
| "https": { | ||
| "commandName": "Project", | ||
| "dotnetRunMessages": true, | ||
| "launchBrowser": true, | ||
| "applicationUrl": "https://localhost:15887;http://localhost:15888", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development", | ||
| "DOTNET_ENVIRONMENT": "Development", | ||
| "DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL": "https://localhost:16175", | ||
| "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:17037", | ||
| "DOTNET_ASPIRE_SHOW_DASHBOARD_RESOURCES": "true" | ||
| } | ||
| }, | ||
| "http": { | ||
| "commandName": "Project", | ||
| "dotnetRunMessages": true, | ||
| "launchBrowser": true, | ||
| "applicationUrl": "http://localhost:15888", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development", | ||
| "DOTNET_ENVIRONMENT": "Development", | ||
| "DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL": "http://localhost:16175", | ||
| "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:17037", | ||
| "DOTNET_ASPIRE_SHOW_DASHBOARD_RESOURCES": "true", | ||
| "ASPIRE_ALLOW_UNSECURED_TRANSPORT": "true" | ||
| } | ||
| }, | ||
| "generate-manifest": { | ||
| "commandName": "Project", | ||
| "launchBrowser": true, | ||
| "dotnetRunMessages": true, | ||
| "commandLineArgs": "--publisher manifest --output-path aspire-manifest.json", | ||
| "applicationUrl": "http://localhost:15888", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development", | ||
| "DOTNET_ENVIRONMENT": "Development", | ||
| "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16175" | ||
| } | ||
| } | ||
| } | ||
| } |
8 changes: 8 additions & 0 deletions
8
playground/BrowserTelemetry/BrowserTelemetry.AppHost/appsettings.Development.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "Logging": { | ||
| "LogLevel": { | ||
| "Default": "Information", | ||
| "Microsoft.AspNetCore": "Warning" | ||
| } | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
playground/BrowserTelemetry/BrowserTelemetry.AppHost/appsettings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "Logging": { | ||
| "LogLevel": { | ||
| "Default": "Information", | ||
| "Microsoft.AspNetCore": "Warning", | ||
| "Aspire.Hosting.Dcp": "Warning" | ||
| } | ||
| } | ||
| } |
37 changes: 37 additions & 0 deletions
37
playground/BrowserTelemetry/BrowserTelemetry.Web/BrowserTelemetry.Web.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="NpmInstall" Inputs="package.json" Outputs="node_modules/.install-stamp"> | ||
| <!-- | ||
| Use npm install or npm ci depending on RestorePackagesWithLockFile value. | ||
| Uncomment the following lines if you want to use this feature: | ||
| <PropertyGroup> | ||
| <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile> | ||
| </PropertyGroup> | ||
| --> | ||
| <Exec Command="npm ci" Condition="'$(RestorePackagesWithLockFile)' == 'true'" /> | ||
| <Exec Command="npm install" Condition="'$(RestorePackagesWithLockFile)' != 'true'" /> | ||
|
|
||
| <!-- Write the stamp file, so incremental builds work --> | ||
| <Touch Files="node_modules/.install-stamp" AlwaysCreate="true" /> | ||
| </Target> | ||
|
|
||
| <!-- | ||
| 2. Run npm run build before building the .NET project. | ||
| MSBuild runs NpmInstall before this task because of the DependsOnTargets attribute. | ||
| --> | ||
| <Target Name="NpmRunBuild" DependsOnTargets="NpmInstall" BeforeTargets="BeforeBuild" Condition="'$(Configuration)' == 'Debug' "> | ||
| <Exec Command="npm run build" /> | ||
| </Target> | ||
|
|
||
| </Project> |
4 changes: 4 additions & 0 deletions
4
playground/BrowserTelemetry/BrowserTelemetry.Web/Pages/Index.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| @page | ||
| <div class="container"> | ||
| <p>Hello world</p> | ||
| </div> |
18 changes: 18 additions & 0 deletions
18
playground/BrowserTelemetry/BrowserTelemetry.Web/Pages/Index.cshtml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| using Microsoft.AspNetCore.Mvc.RazorPages; | ||
|
|
||
| namespace BrowserTelemetry.Web.Pages; | ||
|
|
||
| public class IndexModel : PageModel | ||
| { | ||
| private readonly ILogger<IndexModel> _logger; | ||
|
|
||
| public IndexModel(ILogger<IndexModel> logger) | ||
| { | ||
| _logger = logger; | ||
| } | ||
|
|
||
| public void OnGet() | ||
| { | ||
|
|
||
| } | ||
| } |
40 changes: 40 additions & 0 deletions
40
playground/BrowserTelemetry/BrowserTelemetry.Web/Pages/Shared/_Layout.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| @using System.Diagnostics | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <title>@ViewData["Title"] - BrowserTelemetry</title> | ||
| <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous"> | ||
| <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" /> | ||
|
|
||
| @if (Activity.Current is { } currentActivity) | ||
| { | ||
| <meta name="traceparent" content="@currentActivity.Id" /> | ||
| } | ||
| </head> | ||
| <body> | ||
| <header> | ||
| <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3"> | ||
| <div class="container"> | ||
| <a class="navbar-brand" asp-area="" asp-page="/Index">BrowserTelemetry</a> | ||
| </div> | ||
| </nav> | ||
| </header> | ||
| <div class="container"> | ||
| <main role="main" class="pb-3"> | ||
| @RenderBody() | ||
| </main> | ||
| </div> | ||
| @await RenderSectionAsync("Scripts", required: false) | ||
| <script src="scripts/bundle.js"></script> | ||
| @if (Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_ENDPOINT") is { Length: > 0 } endpointUrl) | ||
| { | ||
| var headers = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_HEADERS"); | ||
| var attributes = Environment.GetEnvironmentVariable("OTEL_RESOURCE_ATTRIBUTES"); | ||
| <script> | ||
| BrowserTelemetry.initializeTelemetry('@endpointUrl', '@headers', '@attributes'); | ||
| </script> | ||
| } | ||
| </body> | ||
| </html> |
48 changes: 48 additions & 0 deletions
48
playground/BrowserTelemetry/BrowserTelemetry.Web/Pages/Shared/_Layout.cshtml.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* Please see documentation at https://learn.microsoft.com/aspnet/core/client-side/bundling-and-minification | ||
| for details on configuring this project to bundle and minify static web assets. */ | ||
|
|
||
| a.navbar-brand { | ||
| white-space: normal; | ||
| text-align: center; | ||
| word-break: break-all; | ||
| } | ||
|
|
||
| a { | ||
| color: #0077cc; | ||
| } | ||
|
|
||
| .btn-primary { | ||
| color: #fff; | ||
| background-color: #1b6ec2; | ||
| border-color: #1861ac; | ||
| } | ||
|
|
||
| .nav-pills .nav-link.active, .nav-pills .show > .nav-link { | ||
| color: #fff; | ||
| background-color: #1b6ec2; | ||
| border-color: #1861ac; | ||
| } | ||
|
|
||
| .border-top { | ||
| border-top: 1px solid #e5e5e5; | ||
| } | ||
| .border-bottom { | ||
| border-bottom: 1px solid #e5e5e5; | ||
| } | ||
|
|
||
| .box-shadow { | ||
| box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); | ||
| } | ||
|
|
||
| button.accept-policy { | ||
| font-size: 1rem; | ||
| line-height: inherit; | ||
| } | ||
|
|
||
| .footer { | ||
| position: absolute; | ||
| bottom: 0; | ||
| width: 100%; | ||
| white-space: nowrap; | ||
| line-height: 60px; | ||
| } |
3 changes: 3 additions & 0 deletions
3
playground/BrowserTelemetry/BrowserTelemetry.Web/Pages/_ViewImports.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| @using BrowserTelemetry.Web | ||
| @namespace BrowserTelemetry.Web.Pages | ||
| @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers |
3 changes: 3 additions & 0 deletions
3
playground/BrowserTelemetry/BrowserTelemetry.Web/Pages/_ViewStart.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| @{ | ||
| Layout = "_Layout"; | ||
| } |
Oops, something went wrong.