Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Merge branch 'main' into 1353-upgrade-from-net-9-to-net-10-admin-api-and-web-app-services
Leendert de Borstb3946963c9d3
diff --cc .github/workflows/dotnet-integration-tests.ymlindex 6b6a55f83,303d6571c..7ad3baa26--- a/.github/workflows/dotnet-integration-tests.yml+++ b/.github/workflows/dotnet-integration-tests.yml@@@ -21,9 -31,10 +31,10 @@@ jobs- name: Setup .NETuses: actions/setup-dotnet@v4with:- dotnet-version: 9.0.x+ dotnet-version: 10.0.x- name: Install dependencies+ working-directory: apps/serverrun: dotnet workload install wasm-tools- name: Builddiff --cc .github/workflows/dotnet-unit-tests.ymlindex 74061871e,cc7942cf7..c1af693d2--- a/.github/workflows/dotnet-unit-tests.yml+++ b/.github/workflows/dotnet-unit-tests.yml@@@ -20,9 -28,10 +28,10 @@@ jobs- name: Setup .NETuses: actions/setup-dotnet@v4with:- dotnet-version: 9.0.x+ dotnet-version: 10.0.x- name: Install dependencies+ working-directory: apps/serverrun: dotnet workload install wasm-tools- name: Restore dependenciesdiff --cc .github/workflows/e2e-tests-server.ymlindex 6bba576ef,55cedffbc..e9489d31d--- a/.github/workflows/e2e-tests-server.yml+++ b/.github/workflows/e2e-tests-server.yml@@@ -65,45 -75,31 +75,31 @@@ jobs- name: Setup .NETuses: actions/setup-dotnet@v4with:- dotnet-version: 9.0.x+ dotnet-version: 10.0.x- - name: Install dependencies- working-directory: apps/server- run: dotnet workload install wasm-tools-- - name: Build- working-directory: apps/server- run: dotnet build-- - name: Start dev database- run: ./install.sh configure-dev-db start-- - name: Ensure browsers are installed- working-directory: apps/server- run: pwsh Tests/AliasVault.E2ETests/bin/Debug/net10.0/playwright.ps1 install --with-deps-- - name: Run ClientTests with retry (Shard ${{ matrix.shard }})- uses: nick-fields/retry@v3+ - name: Setup Node.js+ uses: actions/setup-node@v4with:- timeout_minutes: 60- max_attempts: 3- command: cd apps/server && dotnet test Tests/AliasVault.E2ETests --no-build --verbosity normal --filter "FullyQualifiedName~.E2ETests.Tests.Client.Shard${{ matrix.shard }}."+ node-version: '20'- browser-extension-tests:- timeout-minutes: 60- runs-on: ubuntu-latest- steps:- - uses: actions/checkout@v4-- - name: Setup .NET- uses: actions/setup-dotnet@v4+ - name: Setup Rust toolchain+ uses: dtolnay/rust-toolchain@stablewith:- dotnet-version: 10.0.x+ targets: wasm32-unknown-unknown- - name: Setup Node.js- uses: actions/setup-node@v4+ - name: Cache Rust dependencies+ uses: Swatinem/rust-cache@v2with:- node-version: '18'+ workspaces: core/rust++ - name: Install wasm-pack+ run: cargo install wasm-pack --locked++ - name: Build core libraries+ run: |+ cd ./core+ chmod +x build-and-distribute.sh+ ./build-and-distribute.sh --browser- name: Install dependenciesworking-directory: apps/server@@@ -124,9 -114,9 +114,9 @@@- name: Ensure browsers are installedworking-directory: apps/server- run: pwsh Tests/AliasVault.E2ETests/bin/Debug/net9.0/playwright.ps1 install --with-deps+ run: pwsh Tests/AliasVault.E2ETests/bin/Debug/net10.0/playwright.ps1 install --with-deps- - name: Run ExtensionTests with retry+ - name: Run ClientTests with retry (Shard ${{ matrix.shard }})uses: nick-fields/retry@v3with:timeout_minutes: 60diff --cc apps/server/AliasVault.Api/AliasVault.Api.csprojindex 68ee8e797,cae16f559..80cc3f2ea--- a/apps/server/AliasVault.Api/AliasVault.Api.csproj+++ b/apps/server/AliasVault.Api/AliasVault.Api.csproj@@@ -22,7 -22,11 +22,11 @@@<ItemGroup><PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" /><PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />- <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.4" />- <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">+ <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0-rc.2.25502.107" />++ <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-rc.2.25474.73">+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>+ <PrivateAssets>all</PrivateAssets>+ </PackageReference><PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556"><PrivateAssets>all</PrivateAssets><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>diff --cc apps/server/AliasVault.Client/Dockerfileindex cf1f6386f,d09401a79..c4214a4a6--- a/apps/server/AliasVault.Client/Dockerfile+++ b/apps/server/AliasVault.Client/Dockerfile@@@ -1,7 -1,35 +1,35 @@@-FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base+FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS baseWORKDIR /app+ # ============================================+ # Stage: Build core libraries+ # ============================================+ FROM rust:1-slim-bookworm AS core-builder++ # Install Node.js and wasm-pack (Rust already included in base image)+ RUN apt-get update && \+ apt-get install -y --no-install-recommends curl ca-certificates && \+ curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \+ apt-get install -y --no-install-recommends nodejs && \+ rustup target add wasm32-unknown-unknown && \+ cargo install wasm-pack --locked && \+ apt-get clean && \+ rm -rf /var/lib/apt/lists/*++ WORKDIR /src++ # Copy core library source files+ COPY core/ ./core/++ # Build core libraries (only browser target needed for Blazor WASM client)+ RUN cd ./core && \+ chmod +x build-and-distribute.sh && \+ ./build-and-distribute.sh --browser++ # ============================================+ # Stage: Build .NET application+ # ============================================-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0 AS buildARG TARGETARCHARG BUILD_CONFIGURATION=ReleaseENV DOTNET_CLI_TELEMETRY_OPTOUT=1diff --cc dockerfiles/all-in-one/Dockerfileindex fd14386e4,d8199f390..81b8fa61a--- a/dockerfiles/all-in-one/Dockerfile+++ b/dockerfiles/all-in-one/Dockerfile@@@ -1,13 -1,41 +1,41 @@@# Multi-stage build for AliasVault single container deployment# ============================================- # Stage 1: Build .NET applications+ # Stage 1: Build core libraries+ # ============================================+ FROM rust:1-slim-bookworm AS core-builder++ # Install Node.js and wasm-pack (Rust already included in base image)+ RUN apt-get update && \+ apt-get install -y --no-install-recommends curl ca-certificates && \+ curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \+ apt-get install -y --no-install-recommends nodejs && \+ rustup target add wasm32-unknown-unknown && \+ cargo install wasm-pack --locked && \+ apt-get clean && \+ rm -rf /var/lib/apt/lists/*++ WORKDIR /src++ # Copy core library source files+ COPY core/ ./core/++ # Build core libraries (only browser target needed for server apps)+ RUN cd ./core && \+ chmod +x build-and-distribute.sh && \+ ./build-and-distribute.sh --browser++ # ============================================+ # Stage 2: Build .NET applications# ============================================-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS dotnet-builder+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS dotnet-builder- # Install Python (required for WASM compilation)+ # Install Python (required for WASM compilation) and Node.js (required by JS bundler)RUN apt-get update && \- apt-get install -y --no-install-recommends python3 python3-pip && \+ apt-get install -y --no-install-recommends python3 python3-pip curl ca-certificates && \+ curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \+ apt-get install -y --no-install-recommends nodejs && \+ apt-get clean && \rm -rf /var/lib/apt/lists/*WORKDIR /src@@@ -60,13 -103,18 +103,18 @@@ RUN find /app -name "*.pdb" -delete &&# ============================================FROM alpine:3.19 AS s6-downloaderARG S6_OVERLAY_VERSION=3.2.0.2- RUN wget https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz && \- wget https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz+ ARG TARGETARCH+ RUN ARCH="${TARGETARCH}"; \+ if [ "$ARCH" = "amd64" ]; then ARCH="x86_64"; fi; \+ if [ "$ARCH" = "arm64" ]; then ARCH="aarch64"; fi; \+ wget https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz && \+ wget https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${ARCH}.tar.xz && \+ mv s6-overlay-${ARCH}.tar.xz s6-overlay-arch.tar.xz# ============================================- # Stage 3: Final runtime image+ # Stage 4: Final runtime image# ============================================-FROM mcr.microsoft.com/dotnet/aspnet:9.0-bookworm-slim+FROM mcr.microsoft.com/dotnet/aspnet:10.0-bookworm-slim# OCI Image LabelsLABEL org.opencontainers.image.source="https://github.com/aliasvault/aliasvault"