Skip to content

Commit 95966c7

Browse files
ejsmithejsmith
committed
Updates
1 parent bd4fd97 commit 95966c7

File tree

5 files changed

+31
-27
lines changed

5 files changed

+31
-27
lines changed

‎Exceptionless.sln

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Tests", "test
2929
EndProject
3030
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Job", "src\Exceptionless.Job\Exceptionless.Job.csproj", "{788BA00C-FFBE-42A9-92A3-89E24FC137B5}"
3131
EndProject
32-
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker\docker-compose.dcproj", "{9F933018-9E8B-4649-8C9A-D217B5E1C184}"
33-
EndProject
3432
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "http", "http", "{97ED03A0-8C49-4B15-8D93-C56AF4DDC30F}"
3533
ProjectSection(SolutionItems) = preProject
3634
tests\http\admin.http = tests\http\admin.http
@@ -45,7 +43,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "http", "http", "{97ED03A0-8
4543
tests\http\webhooks.http = tests\http\webhooks.http
4644
EndProjectSection
4745
EndProject
48-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.AppHost", "src\Exceptionless.AppHost\Exceptionless.AppHost.csproj", "{E730BF07-50D3-48C4-9C39-45D8BCB2A35A}"
46+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.AppHost", "src\Exceptionless.AppHost\Exceptionless.AppHost.csproj", "{E730BF07-50D3-48C4-9C39-45D8BCB2A35A}"
4947
EndProject
5048
Global
5149
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -73,10 +71,6 @@ Global
7371
{788BA00C-FFBE-42A9-92A3-89E24FC137B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
7472
{788BA00C-FFBE-42A9-92A3-89E24FC137B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
7573
{788BA00C-FFBE-42A9-92A3-89E24FC137B5}.Release|Any CPU.Build.0 = Release|Any CPU
76-
{9F933018-9E8B-4649-8C9A-D217B5E1C184}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
77-
{9F933018-9E8B-4649-8C9A-D217B5E1C184}.Debug|Any CPU.Build.0 = Debug|Any CPU
78-
{9F933018-9E8B-4649-8C9A-D217B5E1C184}.Release|Any CPU.ActiveCfg = Release|Any CPU
79-
{9F933018-9E8B-4649-8C9A-D217B5E1C184}.Release|Any CPU.Build.0 = Release|Any CPU
8074
{E730BF07-50D3-48C4-9C39-45D8BCB2A35A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8175
{E730BF07-50D3-48C4-9C39-45D8BCB2A35A}.Debug|Any CPU.Build.0 = Debug|Any CPU
8276
{E730BF07-50D3-48C4-9C39-45D8BCB2A35A}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/Exceptionless.AppHost/ElasticsearchExtensions.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Text;
22
using Aspire.Hosting.Lifecycle;
3-
using Aspire.Hosting.Utils;
43
using Microsoft.Extensions.Configuration;
54

65
namespace Aspire.Hosting;
@@ -21,7 +20,7 @@ public static IResourceBuilder<ElasticsearchResource> AddElasticsearch(this IDis
2120
{
2221
var elasticsearch = new ElasticsearchResource(name);
2322
return builder.AddResource(elasticsearch)
24-
.WithHttpEndpoint(containerPort: 9200, hostPort: port, name: "http")
23+
.WithHttpEndpoint(port: 9200, targetPort: port, name: "http")
2524
.WithAnnotation(new ContainerImageAnnotation { Image = "docker.elastic.co/elasticsearch/elasticsearch", Tag = "8.12.2" })
2625
.WithEnvironment("discovery.type", "single-node")
2726
.WithEnvironment("xpack.security.enabled", "false")
@@ -52,7 +51,7 @@ public static IResourceBuilder<ElasticsearchResource> WithKibana(this IResourceB
5251
builder.ApplicationBuilder.AddResource(resource)
5352
.WithAnnotation(new ContainerImageAnnotation { Image = "docker.elastic.co/kibana/kibana", Tag = "8.12.2" })
5453
.WithEnvironment("XPACK_SECURITY_ENABLED", "false")
55-
.WithHttpEndpoint(containerPort: 5601, hostPort: hostPort, name: containerName)
54+
.WithHttpEndpoint(targetPort: 5601, port: hostPort, name: containerName)
5655
.ExcludeFromManifest();
5756

5857
return builder;
@@ -81,6 +80,8 @@ public string? ConnectionStringExpression
8180
}
8281
}
8382

83+
ReferenceExpression IResourceWithConnectionString.ConnectionStringExpression => throw new NotImplementedException();
84+
8485
/// <summary>
8586
/// Gets the connection string for the Elasticsearch server.
8687
/// </summary>

‎src/Exceptionless.AppHost/Exceptionless.AppHost.csproj

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<OutputType>Exe</OutputType>
54
<TargetFramework>net8.0</TargetFramework>
65
<ImplicitUsings>enable</ImplicitUsings>
76
<Nullable>enable</Nullable>
87
<IsAspireHost>true</IsAspireHost>
98
</PropertyGroup>
10-
11-
<ItemGroup>
12-
<PackageReference Include="Aspire.Hosting" Version="8.0.0-preview.4.24156.9" />
13-
</ItemGroup>
14-
159
<ItemGroup>
1610
<ProjectReference Include="..\Exceptionless.Job\Exceptionless.Job.csproj" />
1711
<ProjectReference Include="..\Exceptionless.Web\Exceptionless.Web.csproj" />
1812
</ItemGroup>
19-
20-
</Project>
13+
<ItemGroup>
14+
<PackageReference Include="Aspire.Hosting.Redis" Version="8.0.0-preview.5.24201.12" />
15+
<PackageReference Include="Aspire.Hosting.AppHost" Version="8.0.0-preview.5.24201.12" />
16+
<PackageReference Include="Aspire.Hosting.NodeJs" Version="8.0.0-preview.5.24201.12" />
17+
</ItemGroup>
18+
</Project>

‎src/Exceptionless.AppHost/Program.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
66
var cache = builder.AddRedis("Redis")
77
.WithRedisCommander();
88

9-
var job = builder.AddProject<Projects.Exceptionless_Job>("Jobs")
9+
var job = builder.AddProject<Projects.Exceptionless_Job>("Jobs", "AllJobs")
1010
.WithReference(cache)
11-
.WithReference(elastic)
12-
.WithLaunchProfile("AllJobs");
11+
.WithReference(elastic);
1312

14-
var api = builder.AddProject<Projects.Exceptionless_Web>("Api")
13+
var api = builder.AddProject<Projects.Exceptionless_Web>("Api", "Exceptionless API")
1514
.WithReference(cache)
16-
.WithReference(elastic)
17-
.WithLaunchProfile("Exceptionless API");
15+
.WithReference(elastic);
1816

1917
builder.AddNpmApp("Web", "../../src/Exceptionless.Web/ClientApp", "dev")
2018
.WithReference(api)
21-
.WithEndpoint(containerPort: 5173, scheme: "http", env: "PORT");
19+
.WithEndpoint(port: 5173, scheme: "http", env: "PORT");
2220

2321
builder.Build().Run();

‎src/Exceptionless.AppHost/Properties/launchSettings.json

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
{
22
"$schema": "https://json.schemastore.org/launchsettings.json",
33
"profiles": {
4+
"https": {
5+
"commandName": "Project",
6+
"dotnetRunMessages": true,
7+
"launchBrowser": true,
8+
"applicationUrl": "https://localhost:17224;http://localhost:15212",
9+
"environmentVariables": {
10+
"ASPNETCORE_ENVIRONMENT": "Development",
11+
"DOTNET_ENVIRONMENT": "Development",
12+
"DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21224",
13+
"DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22224"
14+
}
15+
},
416
"http": {
517
"commandName": "Project",
618
"dotnetRunMessages": true,
@@ -9,8 +21,9 @@
921
"environmentVariables": {
1022
"ASPNETCORE_ENVIRONMENT": "Development",
1123
"DOTNET_ENVIRONMENT": "Development",
12-
"DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16298"
24+
"DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16298",
25+
"DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:22077"
1326
}
1427
}
1528
}
16-
}
29+
}

0 commit comments

Comments
 (0)