Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.0.*
dotnet-version: 10.0.*
dotnet-quality: ga
- name: Build Reason
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.0.*
dotnet-version: 10.0.*
dotnet-quality: ga

- name: Version
Expand All @@ -62,7 +62,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.0.*
dotnet-version: 10.0.*
dotnet-quality: ga

- name: Start Services
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copilot-setup-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.0.*
dotnet-version: 10.0.*
dotnet-quality: ga

- name: Start Services
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/elasticsearch-docker-7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.0.*
dotnet-version: 10.0.*
dotnet-quality: ga
- name: Build Reason
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/elasticsearch-docker-8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.0.*
dotnet-version: 10.0.*
dotnet-quality: ga
- name: Build Reason
env:
Expand Down
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"streetsidesoftware.code-spell-checker",
"tintoy.msbuild-project-tools",
"humao.rest-client",
"ms-kubernetes-tools.vscode-kubernetes-tools",
"svelte.svelte-vscode",
"bradlc.vscode-tailwindcss",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"microsoft-aspire.aspire-vscode",
"ms-kubernetes-tools.vscode-kubernetes-tools",
"ms-playwright.playwright",
"selemondev.vscode-shadcn-svelte",
"vitest.explorer"
Expand Down
225 changes: 107 additions & 118 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,120 +1,109 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Aspire",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Exceptionless.AppHost/bin/Debug/net9.0/Exceptionless.AppHost.dll",
"args": [],
"cwd": "${workspaceFolder}/src/Exceptionless.AppHost",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"AppMode": "Development"
}
},
{
"name": "Web",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Exceptionless.Web/bin/Debug/net9.0/Exceptionless.Web.dll",
"args": [],
"cwd": "${workspaceFolder}/src/Exceptionless.Web",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"AppMode": "Development"
}
},
{
"name": "Job",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Exceptionless.Job/bin/Debug/net9.0/Exceptionless.Job.dll",
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
"console": "internalConsole",
"env": {
"AppMode": "Development"
}
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach"
},
{
"name": "frontend: Attach to Chrome",
"port": 9222,
"request": "attach",
"type": "chrome",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp"
},
{
"name": "frontend: Attach to Edge",
"port": 9222,
"request": "attach",
"type": "msedge",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp"
},
{
"type": "msedge",
"request": "launch",
"name": "frontend: Web (Edge)",
"url": "http://localhost:5173/next",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp",
"preLaunchTask": "npm run dev"
},
{
"type": "msedge",
"request": "launch",
"name": "frontend: Web Dev Api (Edge)",
"url": "http://localhost:5173/next",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp",
"preLaunchTask": "npm run dev:api"
},
{
"type": "msedge",
"request": "launch",
"name": "frontend: Storybook (Edge)",
"url": "http://localhost:6006",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp",
"preLaunchTask": "npm run storybook"
},
{
"type": "chrome",
"request": "launch",
"name": "frontend: Web (Chrome)",
"url": "http://localhost:5173/next",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp",
"preLaunchTask": "npm run dev"
},
{
"type": "chrome",
"request": "launch",
"name": "frontend: Web Dev Api (Chrome)",
"url": "http://localhost:5173/next",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp",
"preLaunchTask": "npm run dev:api"
},
{
"type": "chrome",
"request": "launch",
"name": "frontend: Storybook (Chrome)",
"url": "http://localhost:6006",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp",
"preLaunchTask": "npm run storybook"
}
]
"version": "0.2.0",
"configurations": [
{
"type": "aspire",
"request": "launch",
"name": "Aspire",
"program": "${workspaceFolder}/src/Exceptionless.AppHost/Exceptionless.AppHost.csproj"
},
{
"name": "Web",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Exceptionless.Web/bin/Debug/net10.0/Exceptionless.Web.dll",
"args": [],
"cwd": "${workspaceFolder}/src/Exceptionless.Web",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"AppMode": "Development"
}
},
{
"name": "Job",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Exceptionless.Job/bin/Debug/net10.0/Exceptionless.Job.dll",
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
"console": "internalConsole",
"env": {
"AppMode": "Development"
}
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach"
},
{
"name": "frontend: Attach to Chrome",
"port": 9222,
"request": "attach",
"type": "chrome",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp"
},
{
"name": "frontend: Attach to Edge",
"port": 9222,
"request": "attach",
"type": "msedge",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp"
},
{
"type": "msedge",
"request": "launch",
"name": "frontend: Web (Edge)",
"url": "http://localhost:5173/next",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp",
"preLaunchTask": "npm run dev"
},
{
"type": "msedge",
"request": "launch",
"name": "frontend: Web Dev Api (Edge)",
"url": "http://localhost:5173/next",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp",
"preLaunchTask": "npm run dev:api"
},
{
"type": "msedge",
"request": "launch",
"name": "frontend: Storybook (Edge)",
"url": "http://localhost:6006",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp",
"preLaunchTask": "npm run storybook"
},
{
"type": "chrome",
"request": "launch",
"name": "frontend: Web (Chrome)",
"url": "http://localhost:5173/next",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp",
"preLaunchTask": "npm run dev"
},
{
"type": "chrome",
"request": "launch",
"name": "frontend: Web Dev Api (Chrome)",
"url": "http://localhost:5173/next",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp",
"preLaunchTask": "npm run dev:api"
},
{
"type": "chrome",
"request": "launch",
"name": "frontend: Storybook (Chrome)",
"url": "http://localhost:6006",
"webRoot": "${workspaceFolder}/src/Exceptionless.Web/ClientApp",
"preLaunchTask": "npm run storybook"
}
]
}
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
WORKDIR /app

COPY ./*.slnx ./NuGet.Config ./
Expand Down Expand Up @@ -35,7 +35,7 @@ RUN dotnet publish -c Release -o out

# job

FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS job
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS job
WORKDIR /app
COPY --from=job-publish /app/src/Exceptionless.Job/out ./

Expand All @@ -52,7 +52,7 @@ RUN dotnet publish -c Release -o out /p:SkipSpaPublish=true

# api

FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS api
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS api
WORKDIR /app
COPY --from=api-publish /app/src/Exceptionless.Web/out ./

Expand All @@ -72,7 +72,7 @@ RUN dotnet publish -c Release -o out

# app

FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS app
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS app

WORKDIR /app
COPY --from=app-publish /app/src/Exceptionless.Web/out ./
Expand Down Expand Up @@ -146,7 +146,7 @@ USER elasticsearch

RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
chmod +x dotnet-install.sh && \
./dotnet-install.sh --channel 9.0 --runtime aspnetcore && \
./dotnet-install.sh --channel 10.0 --runtime aspnetcore && \
rm dotnet-install.sh

EXPOSE 8080 9200
Expand Down Expand Up @@ -206,7 +206,7 @@ USER elasticsearch

RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
chmod +x dotnet-install.sh && \
./dotnet-install.sh --channel 9.0 --runtime aspnetcore && \
./dotnet-install.sh --channel 10.0 --runtime aspnetcore && \
rm dotnet-install.sh

EXPOSE 8080 9200
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.100-rc*",
"version": "10.0.100",
"rollForward": "latestMinor"
}
}
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Product>Exceptionless</Product>
<MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
Expand Down
12 changes: 5 additions & 7 deletions src/Exceptionless.AppHost/Exceptionless.AppHost.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UserSecretsId>a9c2ddcc-e51d-4cd1-9782-96e1d74eec87</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.2" />
<PackageReference Include="Aspire.Hosting.NodeJs" Version="9.5.2" />
<PackageReference Include="Aspire.Hosting.Redis" Version="9.5.2" />
<PackageReference Include="Aspire.Hosting.JavaScript" Version="13.0.0" />
<PackageReference Include="Aspire.Hosting.Redis" Version="13.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.Elasticsearch" Version="9.0.0" />
<PackageReference Include="Foundatio.Minio" Version="12.0.0" />
</ItemGroup>
Expand All @@ -20,4 +18,4 @@
<ProjectReference Include="..\Exceptionless.Web\Exceptionless.Web.csproj" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static IResourceBuilder<ElasticsearchResource> WithKibana(this IResourceB
{
containerName ??= $"{builder.Resource.Name}-kibana";

builder.ApplicationBuilder.Services.TryAddLifecycleHook<KibanaConfigWriterHook>();
builder.ApplicationBuilder.Services.TryAddEventingSubscriber<KibanaConfigWriterHook>();

var resource = new KibanaResource(containerName);
var resourceBuilder = builder.ApplicationBuilder.AddResource(resource)
Expand Down
Loading
Loading