Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/dotnet:2-9.0@sha256:bc9f53a02bd885a0d287bd3bb315c8cae6bb023f4f8db83a5797270f8039155e
FROM mcr.microsoft.com/devcontainers/typescript-node:4-22-bookworm@sha256:e3a386f77bc75f55cd8512de30b761df1d9f36317d0b1bebd897f0a76b55db3d
FROM mcr.microsoft.com/devcontainers/dotnet:2-9.0@sha256:807917e83addb90beab95b998f81359ca127204792be8216f38c3a9db88b4601
FROM mcr.microsoft.com/devcontainers/typescript-node:4-22-bookworm@sha256:9add39631671c93a836f678b6c11d5ba759b21204f8604619ed1674b5f874f70

COPY --from=mcr.microsoft.com/dotnet/nightly/sdk:10.0.100-rc.1@sha256:c4a834e5ad71e61d3d320f377fd61726dda2c614797b3b6426ce2486949589b2 /usr/share/dotnet /usr/share/dotnet
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
customSettings: 'minimumCoverageThresholds:lineCoverage=70'

- name: Upload .NET coverage report artifact
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
if: ${{ !cancelled() }}
with:
name: CoverageReport
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
DATABASE_URL: ${{ secrets.DATABASE_URL }}

- name: Upload E2E Results Artifact
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
if: ${{ !cancelled() }}
with:
name: playwright-report
Expand Down
44 changes: 22 additions & 22 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@
<PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="4.1.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.0">
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="10.1.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.0.0" />
<PackageVersion Include="Microsoft.Kiota.Bundle" Version="1.21.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.1.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="10.1.0" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.1.0" />
<PackageVersion Include="Microsoft.Kiota.Bundle" Version="1.21.1" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.1" />
<PackageVersion Include="Respawn" Version="7.0.0" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.9.0" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
Expand All @@ -44,22 +44,22 @@
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.11.1" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.11.10" />
<PackageVersion Include="Testcontainers.Redis" Version="4.9.0" />
<PackageVersion Include="Verify.TUnit" Version="31.8.0" />
<PackageVersion Include="Vogen" Version="8.0.3" />
<PackageVersion Include="TngTech.ArchUnitNET" Version="0.13.0" />
<PackageVersion Include="TUnit" Version="1.5.1" />
<PackageVersion Include="WolverineFx" Version="5.6.0" />
<PackageVersion Include="WolverineFx.EntityFrameworkCore" Version="5.6.0" />
<PackageVersion Include="WolverineFx.Postgresql" Version="5.6.0" />
<PackageVersion Include="Verify.TUnit" Version="31.9.0" />
<PackageVersion Include="Vogen" Version="8.0.4" />
<PackageVersion Include="TngTech.ArchUnitNET" Version="0.13.1" />
<PackageVersion Include="TUnit" Version="1.6.25" />
<PackageVersion Include="WolverineFx" Version="5.9.2" />
<PackageVersion Include="WolverineFx.EntityFrameworkCore" Version="5.9.2" />
<PackageVersion Include="WolverineFx.Postgresql" Version="5.9.2" />
<PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.0.2" />
<PackageVersion Include="ZiggyCreatures.FusionCache" Version="2.4.0" />
<PackageVersion Include="ZiggyCreatures.FusionCache" Version="2.5.0" />
<PackageVersion Include="ZiggyCreatures.FusionCache.Backplane.StackExchangeRedis"
Version="2.4.0" />
<PackageVersion Include="ZiggyCreatures.FusionCache.OpenTelemetry" Version="2.4.0" />
Version="2.5.0" />
<PackageVersion Include="ZiggyCreatures.FusionCache.OpenTelemetry" Version="2.5.0" />
<PackageVersion Include="ZiggyCreatures.FusionCache.Serialization.SystemTextJson"
Version="2.4.0" />
Version="2.5.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:24-slim@sha256:0afb7822fac7bf9d7c1bf3b6e6c496dee6b2b64d8dfa365501a3c68e8eba94b2 AS base
FROM node:24-slim@sha256:04d9cbb7297edb843581b9bb9bbed6d7efb459447d5b6ade8d8ef988e6737804 AS base
ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN corepack enable
Expand All @@ -15,7 +15,7 @@ RUN pnpm run -r build
RUN pnpm deploy --filter=./Sandbox.AngularWorkspace --prod /prod/sandbox-app
RUN ls /prod/sandbox-app

FROM nginx:alpine@sha256:b3c656d55d7ad751196f21b7fd2e8d4da9cb430e32f646adcf92441b72f82b14 AS sandbox-app
FROM nginx:alpine@sha256:8491795299c8e739b7fcc6285d531d9812ce2666e07bd3dd8db00020ad132295 AS sandbox-app
COPY --from=build /prod/sandbox-app/default.conf.template /etc/nginx/templates/default.conf.template
COPY --from=build /prod/sandbox-app/dist/sandbox-app/browser /usr/share/nginx/html
EXPOSE 80
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ export class ValidationMessagePipe implements PipeTransform {
return '';
}
const message = error.message ?? (this.messages[error.kind] ?? this.messages['invalid'])(error);
return showFieldName && error.field ? `${error.field().name()}: ${message}` : message;
return showFieldName && error.fieldTree ? `${error.fieldTree().name()}: ${message}` : message;
}
}
12 changes: 6 additions & 6 deletions artifacts/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ services:
networks:
- 'aspire'
loki:
image: 'grafana/loki:latest@sha256:fad94db64eeb0e14544953789c942453df68a860b6f760d867f06c5b31f461ab'
image: 'grafana/loki:latest@sha256:cd6e176883a90c21755f0315688668991634143423f75bdedfef41441b0fdc3c'
command:
- '--config.file=/etc/loki/loki.yml'
- '--config.expand-env=true'
Expand All @@ -83,7 +83,7 @@ services:
networks:
- 'aspire'
tempo:
image: 'grafana/tempo:latest@sha256:60037fe4cc0a184952bc17cdf7d17590afa2f58db1f7a8549aecdad99a7447e1'
image: 'grafana/tempo:latest@sha256:2d1abe9c98923572581173e95e894069a6fd38d577311dd6246295c9e6474025'
command:
- '--config.file=/etc/tempo/tempo.yml'
- '--config.expand-env=true'
Expand All @@ -109,7 +109,7 @@ services:
networks:
- 'aspire'
prometheus:
image: 'prom/prometheus:latest@sha256:d936808bdea528155c0154a922cd42fd75716b8bb7ba302641350f9f3eaeba09'
image: 'prom/prometheus:latest@sha256:2b6f734e372c1b4717008f7d0a0152316aedd4d13ae17ef1e3268dbfaf68041b'
command:
- '--web.enable-otlp-receiver'
- '--web.enable-remote-write-receiver'
Expand Down Expand Up @@ -138,7 +138,7 @@ services:
networks:
- 'aspire'
grafana:
image: 'grafana/grafana:latest@sha256:70d9599b186ce287be0d2c5ba9a78acb2e86c1a68c9c41449454d0fc3eeb84e8'
image: 'grafana/grafana:latest@sha256:2175aaa91c96733d86d31cf270d5310b278654b03f5718c59de12a865380a31f'
environment:
PROMETHEUS_ENDPOINT: 'http://prometheus:9090'
LOKI_ENDPOINT: 'http://loki:3100'
Expand All @@ -164,7 +164,7 @@ services:
networks:
- 'aspire'
otelcollector:
image: 'ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest@sha256:b14234c4bc1b7364629af272e564913bb57bdc9736d45b8b6db5ab3417dc75f9'
image: 'ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest@sha256:38c349c3b7a2fd7ea46700cde8fa13d35b699ef2ce245bdf34dae2a413512f76'
environment:
PROMETHEUS_ENDPOINT: 'http://prometheus:9090/api/v1/otlp'
LOKI_ENDPOINT: 'http://loki:3100/otlp'
Expand All @@ -180,7 +180,7 @@ services:
networks:
- 'aspire'
postgres:
image: 'docker.io/library/postgres:18.1@sha256:5ec39c188013123927f30a006987c6b0e20f3ef2b54b140dfa96dac6844d883f'
image: 'docker.io/library/postgres:18.1@sha256:38d5c9d522037d8bf0864c9068e4df2f8a60127c6489ab06f98fdeda535560f9'
environment:
POSTGRES_HOST_AUTH_METHOD: 'scram-sha-256'
POSTGRES_INITDB_ARGS: '--auth-host=scram-sha-256 --auth-local=scram-sha-256'
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": "10.0.100",
"version": "10.0.101",
"rollForward": "latestFeature"
},
"test": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "sandbox",
"packageManager": "pnpm@10.24.0",
"packageManager": "pnpm@10.26.1",
"module": "true",
"license": "MIT",
"engines": {
Expand Down
Loading
Loading