Skip to content
Open
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-10.0@sha256:537a38efbafe5153db2db1c6cc8a1cad5286e91d0e5da9bb7b310d3897d1c6cb
FROM mcr.microsoft.com/devcontainers/dotnet:2-10.0@sha256:8f4d2e325d0c07af71374436657b2627eb13f35e974596ec425d71ad49cb0196
FROM mcr.microsoft.com/devcontainers/typescript-node:4-24-bookworm@sha256:5f21aff86db5eca30decdd418172f7a665eb55d288465d38021baf9c1260b6d6

COPY --from=mcr.microsoft.com/dotnet/nightly/sdk:10.0.102@sha256:9ce7683d4f21b1891fe6817487dd7913dbe25e7c17c5875302c2c8aef079125c /usr/share/dotnet /usr/share/dotnet
COPY --from=mcr.microsoft.com/dotnet/nightly/sdk:10.0.103@sha256:3c66fb1b8add76ed078024cad5d04d5114c25d4ae2aa83570479ae00d20f4d9a /usr/share/dotnet /usr/share/dotnet
52 changes: 26 additions & 26 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,38 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Aspire.Hosting.Azure" Version="13.1.0" />
<PackageVersion Include="Aspire.Hosting.Azure" Version="13.1.1" />
<PackageVersion Include="Aspire.Hosting.Docker" Version="13.1.0-preview.1.25616.3" />
<PackageVersion Include="Aspire.Hosting.Keycloak" Version="13.1.0-preview.1.25616.3" />
<PackageVersion Include="Aspire.Hosting.JavaScript" Version="13.1.0" />
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="13.1.0" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="13.1.0" />
<PackageVersion Include="Aspire.Hosting.JavaScript" Version="13.1.1" />
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="13.1.1" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="13.1.1" />
<PackageVersion Include="Aspire.Keycloak.Authentication" Version="13.1.0-preview.1.25616.3" />
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.1.0" />
<PackageVersion Include="Aspire.StackExchange.Redis" Version="13.1.0" />
<PackageVersion Include="Aspire.StackExchange.Redis.DistributedCaching" Version="13.1.0" />
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.1.1" />
<PackageVersion Include="Aspire.StackExchange.Redis" Version="13.1.1" />
<PackageVersion Include="Aspire.StackExchange.Redis.DistributedCaching" Version="13.1.1" />
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder" Version="13.1.1" />
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Minio" Version="13.1.1" />
<PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="4.1.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.2">
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="10.2.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.2.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.2.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="10.2.0" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.2.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="10.3.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.3.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.3.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="10.3.0" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.3.0" />
<PackageVersion Include="Microsoft.Kiota.Bundle" Version="1.21.3" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.4.1" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.1.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
<PackageVersion Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.3.1" />
<PackageVersion Include="Respawn" Version="7.0.0" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.10.0" />
Expand All @@ -44,16 +44,16 @@
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.0" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.12.36" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.12.44" />
<PackageVersion Include="Testcontainers.Redis" Version="4.10.0" />
<PackageVersion Include="TUnit.AspNetCore" Version="1.13.11" />
<PackageVersion Include="Verify.TUnit" Version="31.11.0" />
<PackageVersion Include="TUnit.AspNetCore" Version="1.16.4" />
<PackageVersion Include="Verify.TUnit" Version="31.13.1" />
<PackageVersion Include="Vogen" Version="8.0.4" />
<PackageVersion Include="TngTech.ArchUnitNET" Version="0.13.2" />
<PackageVersion Include="TUnit" Version="1.13.11" />
<PackageVersion Include="WolverineFx" Version="5.14.0" />
<PackageVersion Include="WolverineFx.EntityFrameworkCore" Version="5.14.0" />
<PackageVersion Include="WolverineFx.Postgresql" Version="5.14.0" />
<PackageVersion Include="TUnit" Version="1.16.4" />
<PackageVersion Include="WolverineFx" Version="5.16.2" />
<PackageVersion Include="WolverineFx.EntityFrameworkCore" Version="5.16.2" />
<PackageVersion Include="WolverineFx.Postgresql" Version="5.16.2" />
<PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
<PackageVersion Include="ZiggyCreatures.FusionCache" Version="2.5.0" />
<PackageVersion Include="ZiggyCreatures.FusionCache.Backplane.StackExchangeRedis" Version="2.5.0" />
Expand Down
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:4660b1ca8b28d6d1906fd644abe34b2ed81d15434d26d845ef0aced307cf4b6f AS base
FROM node:24-slim@sha256:a81a03dd965b4052269a57fac857004022b522a4bf06e7a739e25e18bce45af2 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:5878d06ae4c83d73285438255f705bb3f9a736f41cd24876ed25bb33faf76c7d AS sandbox-app
FROM nginx:alpine@sha256:1d13701a5f9f3fb01aaa88cef2344d65b6b5bf6b7d9fa4cf0dca557a8d7702ba 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
2 changes: 1 addition & 1 deletion Sandbox.AppHost/Sandbox.AppHost.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.1.0">
<Project Sdk="Aspire.AppHost.Sdk/13.1.1">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
14 changes: 7 additions & 7 deletions artifacts/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
keycloak:
image: 'quay.io/keycloak/keycloak:26.5@sha256:fb31a59deb46f746f2aaa25adc5da39ceccac4fd22d36a519562b0bf02e8df20'
image: 'quay.io/keycloak/keycloak:26.5@sha256:5a236ae4dd8ece77490115bace15a11a4d15e9cbcf58a490b95a7da2cd71d32a'
command:
- 'start'
- '--import-realm'
Expand Down Expand Up @@ -60,7 +60,7 @@ services:
networks:
- 'aspire'
loki:
image: 'grafana/loki:latest@sha256:847c287ada0e12603910589f42038c5cdaaad04e248bd1dc6c6e0920a235f427'
image: 'grafana/loki:latest@sha256:434c7effbd66dbf69c2665fe4b2125549ecf7b45039ac28595d4034031cf47ce'
command:
- '--config.file=/etc/loki/loki.yml'
- '--config.expand-env=true'
Expand All @@ -86,7 +86,7 @@ services:
networks:
- 'aspire'
tempo:
image: 'grafana/tempo:latest@sha256:847855db7c056b64c2cb1aec877e414cb0e8647eb7ebe4cff3bd5d9779ee2f6e'
image: 'grafana/tempo:latest@sha256:30cee0ece2649dd2246db28cf94c93058a9a792031e46606d759f62f366478fd'
command:
- '--config.file=/etc/tempo/tempo.yml'
- '--config.expand-env=true'
Expand Down Expand Up @@ -143,7 +143,7 @@ services:
networks:
- 'aspire'
grafana:
image: 'grafana/grafana:latest@sha256:ba93c9d192e58b23e064c7f501d453426ccf4a85065bf25b705ab1e98602bfb1'
image: 'grafana/grafana:latest@sha256:9e1e77ade304069aee3196e9a4f210830e96e80ce9a2640891eccc324b152faf'
environment:
PROMETHEUS_ENDPOINT: 'http://prometheus:9090'
LOKI_ENDPOINT: 'http://loki:3100'
Expand All @@ -169,7 +169,7 @@ services:
networks:
- 'aspire'
otelcollector:
image: 'ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest@sha256:a7343f01869071ea3f4c5e1e97df1bb1b3c4d5c77247db80e053a80b9df530c4'
image: 'ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest@sha256:f6e429c1052ab50f85a7afa5f7e32f25931697751622b0e1f453d10f79a1df3c'
environment:
ASPIRE_OTLP_ENDPOINT: '${}'
ASPIRE_API_KEY: ''
Expand All @@ -188,7 +188,7 @@ services:
networks:
- 'aspire'
postgres:
image: 'docker.io/library/postgres:18.1@sha256:1090bc3a8ccfb0b55f78a494d76f8d603434f7e4553543d6e807bc7bd6bbd17f'
image: 'docker.io/library/postgres:18.2@sha256:b6b4d0b75c699a2c94dfc5a94fe09f38630f3b67ab0e1653ede1b7ac8e13c197'
environment:
POSTGRES_HOST_AUTH_METHOD: 'scram-sha-256'
POSTGRES_INITDB_ARGS: '--auth-host=scram-sha-256 --auth-local=scram-sha-256'
Expand All @@ -204,7 +204,7 @@ services:
networks:
- 'aspire'
cache:
image: 'docker.io/library/redis:8.4@sha256:c22af04bb576503bf16b3e34a1fd2fd82de0f765afd866d2e380145e0af30d78'
image: 'docker.io/library/redis:8.6@sha256:7b6fb55d8b0adcd77269dc52b3cfffe5f59ca5d43dec3c90dbe18aacce7942e1'
command:
- '-c'
- 'redis-server --requirepass $$REDIS_PASSWORD --save 60 1'
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.102",
"version": "10.0.103",
"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.28.2",
"packageManager": "pnpm@10.29.3",
"module": "true",
"license": "MIT",
"engines": {
Expand Down
Loading
Loading