Skip to content

Commit bba4495

Browse files
sebastienrossebastienros
authored
Merge branch 'main' into validate-arguments-of-public-methods#aspire-hosting-nodejs
2 parents 7cccc3a + ea10ec2 commit bba4495

File tree

111 files changed

+3844
-165
lines changed

Some content is hidden

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

111 files changed

+3844
-165
lines changed

‎Aspire.sln‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "playground", "playground",
1313
playground\README.md = playground\README.md
1414
EndProjectSection
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceDefaults", "playground\TestShop\ServiceDefaults\ServiceDefaults.csproj", "{C7B2309C-073A-4552-A508-A69768B64C6F}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestShop.ServiceDefaults", "playground\TestShop\TestShop.ServiceDefaults\TestShop.ServiceDefaults.csproj", "{C7B2309C-073A-4552-A508-A69768B64C6F}"
1717
EndProject
1818
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CatalogService", "playground\TestShop\CatalogService\CatalogService.csproj", "{6D04BB34-1CC6-4FF3-A02A-1FFAC2A7A4F3}"
1919
EndProject
@@ -507,6 +507,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "python", "python", "{7123AB
507507
EndProject
508508
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.AppHost", "playground\python\Python.AppHost\Python.AppHost.csproj", "{173BDA6E-F175-4457-BF64-58CD184E9A81}"
509509
EndProject
510+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.Playground.Tests", "tests\Aspire.Playground.Tests\Aspire.Playground.Tests.csproj", "{8C07B9BF-87F4-450D-92FA-E03CF763013B}"
511+
EndProject
510512
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Elasticsearch.Tests", "tests\Aspire.Hosting.Elasticsearch.Tests\Aspire.Hosting.Elasticsearch.Tests.csproj", "{62D8C73C-DAB3-4B9E-A508-34C886C374F9}"
511513
EndProject
512514
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{C424395C-1235-41A4-BF55-07880A04368C}"
@@ -569,6 +571,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.Hosting.NodeJs.Tests
569571
EndProject
570572
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.Hosting.RabbitMQ.Tests", "tests\Aspire.Hosting.RabbitMQ.Tests\Aspire.Hosting.RabbitMQ.Tests.csproj", "{872AC635-B880-4FAC-BB43-4FD97D7B1209}"
571573
EndProject
574+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BrowserTelemetry", "BrowserTelemetry", "{15966C27-17FA-4A46-A172-55985411540A}"
575+
EndProject
576+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserTelemetry.AppHost", "playground\BrowserTelemetry\BrowserTelemetry.AppHost\BrowserTelemetry.AppHost.csproj", "{29946391-F2E9-4DEA-92A2-6FAAC1508446}"
577+
EndProject
578+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserTelemetry.Web", "playground\BrowserTelemetry\BrowserTelemetry.Web\BrowserTelemetry.Web.csproj", "{091EA540-355B-4763-9980-5F83F0BB6F11}"
579+
EndProject
572580
Global
573581
GlobalSection(SolutionConfigurationPlatforms) = preSolution
574582
Debug|Any CPU = Debug|Any CPU
@@ -1387,6 +1395,10 @@ Global
13871395
{173BDA6E-F175-4457-BF64-58CD184E9A81}.Debug|Any CPU.Build.0 = Debug|Any CPU
13881396
{173BDA6E-F175-4457-BF64-58CD184E9A81}.Release|Any CPU.ActiveCfg = Release|Any CPU
13891397
{173BDA6E-F175-4457-BF64-58CD184E9A81}.Release|Any CPU.Build.0 = Release|Any CPU
1398+
{8C07B9BF-87F4-450D-92FA-E03CF763013B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1399+
{8C07B9BF-87F4-450D-92FA-E03CF763013B}.Debug|Any CPU.Build.0 = Debug|Any CPU
1400+
{8C07B9BF-87F4-450D-92FA-E03CF763013B}.Release|Any CPU.ActiveCfg = Release|Any CPU
1401+
{8C07B9BF-87F4-450D-92FA-E03CF763013B}.Release|Any CPU.Build.0 = Release|Any CPU
13901402
{62D8C73C-DAB3-4B9E-A508-34C886C374F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13911403
{62D8C73C-DAB3-4B9E-A508-34C886C374F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
13921404
{62D8C73C-DAB3-4B9E-A508-34C886C374F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1499,6 +1511,14 @@ Global
14991511
{872AC635-B880-4FAC-BB43-4FD97D7B1209}.Debug|Any CPU.Build.0 = Debug|Any CPU
15001512
{872AC635-B880-4FAC-BB43-4FD97D7B1209}.Release|Any CPU.ActiveCfg = Release|Any CPU
15011513
{872AC635-B880-4FAC-BB43-4FD97D7B1209}.Release|Any CPU.Build.0 = Release|Any CPU
1514+
{29946391-F2E9-4DEA-92A2-6FAAC1508446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1515+
{29946391-F2E9-4DEA-92A2-6FAAC1508446}.Debug|Any CPU.Build.0 = Debug|Any CPU
1516+
{29946391-F2E9-4DEA-92A2-6FAAC1508446}.Release|Any CPU.ActiveCfg = Release|Any CPU
1517+
{29946391-F2E9-4DEA-92A2-6FAAC1508446}.Release|Any CPU.Build.0 = Release|Any CPU
1518+
{091EA540-355B-4763-9980-5F83F0BB6F11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1519+
{091EA540-355B-4763-9980-5F83F0BB6F11}.Debug|Any CPU.Build.0 = Debug|Any CPU
1520+
{091EA540-355B-4763-9980-5F83F0BB6F11}.Release|Any CPU.ActiveCfg = Release|Any CPU
1521+
{091EA540-355B-4763-9980-5F83F0BB6F11}.Release|Any CPU.Build.0 = Release|Any CPU
15021522
EndGlobalSection
15031523
GlobalSection(SolutionProperties) = preSolution
15041524
HideSolutionNode = FALSE
@@ -1742,6 +1762,7 @@ Global
17421762
{D5B392A4-29CD-41F9-8847-0C211C832713} = {C424395C-1235-41A4-BF55-07880A04368C}
17431763
{7123AB7A-A4FD-4F64-8B05-D2DD0C3E2ABC} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
17441764
{173BDA6E-F175-4457-BF64-58CD184E9A81} = {7123AB7A-A4FD-4F64-8B05-D2DD0C3E2ABC}
1765+
{8C07B9BF-87F4-450D-92FA-E03CF763013B} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
17451766
{62D8C73C-DAB3-4B9E-A508-34C886C374F9} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
17461767
{C424395C-1235-41A4-BF55-07880A04368C} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
17471768
{830A89EC-4029-4753-B25A-068BAE37DEC7} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
@@ -1773,6 +1794,9 @@ Global
17731794
{1419BDCB-47EB-43EB-9149-C935B7208A72} = {90A70EFA-F26A-49E0-A375-DB461E4E0E25}
17741795
{50450FBB-CD10-4281-B22C-7FF86CEE9D9F} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
17751796
{872AC635-B880-4FAC-BB43-4FD97D7B1209} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
1797+
{15966C27-17FA-4A46-A172-55985411540A} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
1798+
{29946391-F2E9-4DEA-92A2-6FAAC1508446} = {15966C27-17FA-4A46-A172-55985411540A}
1799+
{091EA540-355B-4763-9980-5F83F0BB6F11} = {15966C27-17FA-4A46-A172-55985411540A}
17761800
EndGlobalSection
17771801
GlobalSection(ExtensibilityGlobals) = postSolution
17781802
SolutionGuid = {6DCEDFEC-988E-4CB3-B45B-191EB5086E0C}

‎Directory.Packages.props‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<Import Project="eng/Versions.props" Condition="'$(MajorVersion)' == '' and Exists('eng/Versions.props')" />
66
<PropertyGroup>
77
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
8+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
89
<TestcontainersPackageVersion>3.9.0</TestcontainersPackageVersion>
910
</PropertyGroup>
1011
<ItemGroup>
@@ -21,7 +22,6 @@
2122
<PackageVersion Include="Azure.AI.OpenAI" Version="2.0.0-beta.2" />
2223
<PackageVersion Include="Azure.Data.Tables" Version="12.9.0" />
2324
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
24-
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
2525
<PackageVersion Include="Azure.Messaging.EventHubs.Processor" Version="5.11.4" />
2626
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.18.1" />
2727
<PackageVersion Include="Azure.Search.Documents" Version="11.6.0" />
@@ -168,6 +168,8 @@
168168
<PackageVersion Include="Microsoft.Orleans.Server" Version="8.2.0" />
169169
<PackageVersion Include="Microsoft.Orleans.Sdk" Version="8.2.0" />
170170
<!-- Pinned version for Component Governance - Remove when root dependencies are updated -->
171-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
171+
<PackageVersion Include="Azure.Core" Version="1.42.0" />
172+
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
173+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" /> <!-- https://github.com/Azure/azure-cosmos-dotnet-v3/pull/3313 -->
172174
</ItemGroup>
173175
</Project>

‎playground/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/Program.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@
1313
.WithExternalHttpEndpoints()
1414
.WithReference(blobs);
1515

16+
#if !SKIP_DASHBOARD_REFERENCE
1617
// This project is only added in playground projects to support development/debugging
1718
// of the dashboard. It is not required in end developer code. Comment out this code
18-
// to test end developer dashboard launch experience. Refer to Directory.Build.props
19-
// for the path to the dashboard binary (defaults to the Aspire.Dashboard bin output
20-
// in the artifacts dir).
19+
// or build with `/p:SkipDashboardReference=true`, to test end developer
20+
// dashboard launch experience, Refer to Directory.Build.props for the path to
21+
// the dashboard binary (defaults to the Aspire.Dashboard bin output in the
22+
// artifacts dir).
2123
builder.AddProject<Projects.Aspire_Dashboard>(KnownResourceNames.AspireDashboard);
24+
#endif
2225

2326
builder.Build().Run();
2427

‎playground/BrowserTelemetry/BrowserTelemetry.AppHost/BrowserTelemetry.AppHost.csproj‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
<IsAspireHost>true</IsAspireHost>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<Compile Include="..\..\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" />
17+
<ProjectReference Include="..\BrowserTelemetry.Web\BrowserTelemetry.Web.csproj" />
18+
</ItemGroup>
19+
20+
</Project>

‎playground/BrowserTelemetry/BrowserTelemetry.AppHost/Program.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
var builder = DistributedApplication.CreateBuilder(args);
5+
6+
builder.AddProject<Projects.BrowserTelemetry_Web>("web")
7+
.WithExternalHttpEndpoints();
8+
9+
// This project is only added in playground projects to support development/debugging
10+
// of the dashboard. It is not required in end developer code. Comment out this code
11+
// to test end developer dashboard launch experience. Refer to Directory.Build.props
12+
// for the path to the dashboard binary (defaults to the Aspire.Dashboard bin output
13+
// in the artifacts dir).
14+
builder.AddProject<Projects.Aspire_Dashboard>(KnownResourceNames.AspireDashboard);
15+
16+
builder.Build().Run();

‎playground/BrowserTelemetry/BrowserTelemetry.AppHost/Properties/launchSettings.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"$schema": "http://json.schemastore.org/launchsettings.json",
3+
"profiles": {
4+
"https": {
5+
"commandName": "Project",
6+
"dotnetRunMessages": true,
7+
"launchBrowser": true,
8+
"applicationUrl": "https://localhost:15887;http://localhost:15888",
9+
"environmentVariables": {
10+
"ASPNETCORE_ENVIRONMENT": "Development",
11+
"DOTNET_ENVIRONMENT": "Development",
12+
"DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL": "https://localhost:16175",
13+
"DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:17037",
14+
"DOTNET_ASPIRE_SHOW_DASHBOARD_RESOURCES": "true"
15+
}
16+
},
17+
"http": {
18+
"commandName": "Project",
19+
"dotnetRunMessages": true,
20+
"launchBrowser": true,
21+
"applicationUrl": "http://localhost:15888",
22+
"environmentVariables": {
23+
"ASPNETCORE_ENVIRONMENT": "Development",
24+
"DOTNET_ENVIRONMENT": "Development",
25+
"DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL": "http://localhost:16175",
26+
"DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:17037",
27+
"DOTNET_ASPIRE_SHOW_DASHBOARD_RESOURCES": "true",
28+
"ASPIRE_ALLOW_UNSECURED_TRANSPORT": "true"
29+
}
30+
},
31+
"generate-manifest": {
32+
"commandName": "Project",
33+
"launchBrowser": true,
34+
"dotnetRunMessages": true,
35+
"commandLineArgs": "--publisher manifest --output-path aspire-manifest.json",
36+
"applicationUrl": "http://localhost:15888",
37+
"environmentVariables": {
38+
"ASPNETCORE_ENVIRONMENT": "Development",
39+
"DOTNET_ENVIRONMENT": "Development",
40+
"DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16175"
41+
}
42+
}
43+
}
44+
}

‎playground/BrowserTelemetry/BrowserTelemetry.AppHost/appsettings.Development.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"Logging": {
3+
"LogLevel": {
4+
"Default": "Information",
5+
"Microsoft.AspNetCore": "Warning"
6+
}
7+
}
8+
}

‎playground/BrowserTelemetry/BrowserTelemetry.AppHost/appsettings.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"Logging": {
3+
"LogLevel": {
4+
"Default": "Information",
5+
"Microsoft.AspNetCore": "Warning",
6+
"Aspire.Hosting.Dcp": "Warning"
7+
}
8+
}
9+
}

‎playground/BrowserTelemetry/BrowserTelemetry.Web/BrowserTelemetry.Web.csproj‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
11+
</ItemGroup>
12+
13+
<Target Name="NpmInstall" Inputs="package.json" Outputs="node_modules/.install-stamp">
14+
<!--
15+
Use npm install or npm ci depending on RestorePackagesWithLockFile value.
16+
Uncomment the following lines if you want to use this feature:
17+
18+
<PropertyGroup>
19+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
20+
</PropertyGroup>
21+
-->
22+
<Exec Command="npm ci" Condition="'$(RestorePackagesWithLockFile)' == 'true'" />
23+
<Exec Command="npm install" Condition="'$(RestorePackagesWithLockFile)' != 'true'" />
24+
25+
<!-- Write the stamp file, so incremental builds work -->
26+
<Touch Files="node_modules/.install-stamp" AlwaysCreate="true" />
27+
</Target>
28+
29+
<!--
30+
2. Run npm run build before building the .NET project.
31+
MSBuild runs NpmInstall before this task because of the DependsOnTargets attribute.
32+
-->
33+
<Target Name="NpmRunBuild" DependsOnTargets="NpmInstall" BeforeTargets="BeforeBuild" Condition="'$(Configuration)' == 'Debug' ">
34+
<Exec Command="npm run build" />
35+
</Target>
36+
37+
</Project>

‎playground/BrowserTelemetry/BrowserTelemetry.Web/Pages/Index.cshtml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@page
2+
<div class="container">
3+
<p>Hello world</p>
4+
</div>

0 commit comments

Comments
 (0)