Skip to content

Commit 835f5f3

Browse files
Jack-EdwardsJack-Edwards
authored
Merge pull request #738 from Crypter-File-Transfer/stable
Merge 'stable' into 'main'
2 parents eb2c1d2 + 5614e87 commit 835f5f3

26 files changed

Lines changed: 87 additions & 96 deletions

‎.github/dependabot.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# To get started with Dependabot version updates, you'll need to specify which
2-
# package ecosystems to update and where the package manifests are located.
3-
# Please see the documentation for all configuration options:
4-
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5-
61
version: 2
72
updates:
83
- package-ecosystem: "nuget"
9-
directory: "/" # Find the .sln file
4+
directory: "/"
105
schedule:
116
interval: "monthly"
7+
8+
- package-ecosystem: "github-actions"
9+
directory: "/"
10+
schedule:
11+
interval: "monthly"

‎.github/workflows/build-and-push-web.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,33 @@ jobs:
3131

3232
steps:
3333
- name: Checkout repository
34-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
34+
uses: actions/checkout@v4
3535

3636
- name: Replace tokens in configuration
3737
working-directory: ${{ env.project_root }}
3838
run: |
3939
sed -i 's|${API_BASE_URL}|${{ vars.API_BASE_URL }}|g' wwwroot/appsettings.json
4040
4141
- name: Set up Docker Buildx
42-
uses: docker/setup-buildx-action@v2
42+
uses: docker/setup-buildx-action@v3
4343

4444
- name: Log in to the Container registry
45-
uses: docker/login-action@v2
45+
uses: docker/login-action@v3
4646
with:
4747
registry: ${{ env.registry }}
4848
username: ${{ github.actor }}
4949
password: ${{ secrets.GITHUB_TOKEN }}
5050

5151
- name: Extract metadata (tags, labels) for Docker
5252
id: meta
53-
uses: docker/metadata-action@v4
53+
uses: docker/metadata-action@v5
5454
with:
5555
flavor: |
5656
latest=${{ (github.event_name == 'workflow_dispatch' && 'true') || 'auto' }}
5757
images: ${{ env.registry }}/${{ vars.WEB_IMAGE_NAME }}
5858

5959
- name: Build and push Docker image
60-
uses: docker/build-push-action@v4
60+
uses: docker/build-push-action@v6
6161
with:
6262
context: .
6363
file: ./Crypter.Web/Dockerfile

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout repository
27-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
27+
uses: actions/checkout@v4
2828

2929
# Initializes the CodeQL tools for scanning.
3030
- name: Initialize CodeQL
@@ -36,15 +36,15 @@ jobs:
3636
# Prefix the list here with "+" to use these queries and those in the config file.
3737
# queries: ./path/to/local/query, your-org/your-repo/queries@main
3838

39-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
39+
- uses: actions/checkout@v4
4040
- name: Setup .NET
41-
uses: actions/setup-dotnet@v3
41+
uses: actions/setup-dotnet@v4
4242
with:
4343
dotnet-version: 9.0.x
4444

45-
- uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d #v3
45+
- uses: pnpm/action-setup@v4
4646
with:
47-
version: 8
47+
version: 9
4848

4949
- name: Install wasm-tools
5050
run: dotnet workload install wasm-tools

‎.github/workflows/deploy-to-environment.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
25+
uses: actions/checkout@v4
2626

2727
- name: Stop service
28-
uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
28+
uses: appleboy/ssh-action@v1.2.0
2929
with:
3030
host: ${{ secrets.APPSERVER_SSH_HOST }}
3131
port: ${{ secrets.APPSERVER_SSH_PORT }}
@@ -39,7 +39,7 @@ jobs:
3939
script_stop: true
4040

4141
- name: Push latest systemctl service file
42-
uses: appleboy/scp-action@v0.1.4
42+
uses: appleboy/scp-action@v0.1.7
4343
with:
4444
host: ${{ secrets.APPSERVER_SSH_HOST }}
4545
port: ${{ secrets.APPSERVER_SSH_PORT }}
@@ -50,7 +50,7 @@ jobs:
5050
strip_components: 2
5151

5252
- name: Reload systemctl daemon
53-
uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
53+
uses: appleboy/ssh-action@v1.2.0
5454
with:
5555
host: ${{ secrets.APPSERVER_SSH_HOST }}
5656
port: ${{ secrets.APPSERVER_SSH_PORT }}
@@ -59,7 +59,7 @@ jobs:
5959
script: systemctl --user daemon-reload
6060

6161
- name: Push latest Docker Compose file
62-
uses: appleboy/scp-action@v0.1.4
62+
uses: appleboy/scp-action@v0.1.7
6363
with:
6464
host: ${{ secrets.APPSERVER_SSH_HOST }}
6565
port: ${{ secrets.APPSERVER_SSH_PORT }}
@@ -70,7 +70,7 @@ jobs:
7070

7171
- name: Push latest Docker Compose override file if deploying to Development server
7272
if: github.event.inputs.environment == 'development'
73-
uses: appleboy/scp-action@v0.1.4
73+
uses: appleboy/scp-action@v0.1.7
7474
with:
7575
host: ${{ secrets.APPSERVER_SSH_HOST }}
7676
port: ${{ secrets.APPSERVER_SSH_PORT }}
@@ -80,7 +80,7 @@ jobs:
8080
target: crypter-web-container/
8181

8282
- name: Pull latest images
83-
uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
83+
uses: appleboy/ssh-action@v1.2.0
8484
with:
8585
host: ${{ secrets.APPSERVER_SSH_HOST }}
8686
port: ${{ secrets.APPSERVER_SSH_PORT }}
@@ -90,7 +90,7 @@ jobs:
9090
script_stop: true
9191

9292
- name: Migrate database
93-
uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
93+
uses: appleboy/ssh-action@v1.2.0
9494
with:
9595
host: ${{ secrets.APPSERVER_SSH_HOST }}
9696
port: ${{ secrets.APPSERVER_SSH_PORT }}
@@ -100,7 +100,7 @@ jobs:
100100
script_stop: true
101101

102102
- name: Start service
103-
uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
103+
uses: appleboy/ssh-action@v1.2.0
104104
with:
105105
host: ${{ secrets.APPSERVER_SSH_HOST }}
106106
port: ${{ secrets.APPSERVER_SSH_PORT }}

‎.github/workflows/pr-build-api.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111

1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
14+
uses: actions/checkout@v4
1515

1616
- name: Set up Docker Buildx
17-
uses: docker/setup-buildx-action@v2
17+
uses: docker/setup-buildx-action@v3
1818

1919
- name: Build image
20-
uses: docker/build-push-action@v4
20+
uses: docker/build-push-action@v6
2121
with:
2222
context: .
2323
file: ./Crypter.API/Dockerfile

‎.github/workflows/pr-build-web.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111

1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
14+
uses: actions/checkout@v4
1515

1616
- name: Set up Docker Buildx
17-
uses: docker/setup-buildx-action@v2
17+
uses: docker/setup-buildx-action@v3
1818

1919
- name: Build image
20-
uses: docker/build-push-action@v4
20+
uses: docker/build-push-action@v6
2121
with:
2222
context: .
2323
file: ./Crypter.Web/Dockerfile

‎.github/workflows/unit-test.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
12+
- uses: actions/checkout@v4
1313

14-
- uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d #v3
14+
- uses: pnpm/action-setup@v4
1515
with:
16-
version: 8
16+
version: 9
1717

1818
- name: Setup .NET
19-
uses: actions/setup-dotnet@v3
19+
uses: actions/setup-dotnet@v4
2020
with:
21-
dotnet-version: 8.0.x
21+
dotnet-version: 9.0.x
2222

2323
- name: Restore dependencies
2424
run: dotnet restore Crypter.Test
@@ -33,14 +33,14 @@ jobs:
3333
runs-on: ubuntu-latest
3434

3535
steps:
36-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
36+
- uses: actions/checkout@v4
3737

38-
- uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d #v3
38+
- uses: pnpm/action-setup@v4
3939
with:
40-
version: 8
40+
version: 9
4141

4242
- name: Setup .NET
43-
uses: actions/setup-dotnet@v3
43+
uses: actions/setup-dotnet@v4
4444
with:
4545
dotnet-version: 9.0.x
4646

‎Crypter.API/Crypter.API.csproj‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>disable</ImplicitUsings>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -18,16 +18,11 @@
1818
<ProjectReference Include="..\Crypter.Core\Crypter.Core.csproj" />
1919
</ItemGroup>
2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>
25-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
26-
<PrivateAssets>all</PrivateAssets>
27-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28-
</PackageReference>
29-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
30-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
31-
<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
25+
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
26+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
3227
</ItemGroup>
3328
</Project>

‎Crypter.API/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
22
WORKDIR /source/
33

4-
RUN dotnet tool install --global dotnet-ef --version 8.0.*
4+
RUN dotnet tool install --global dotnet-ef --version 9.0.*
55
ENV PATH="${PATH}:/root/.dotnet/tools"
66

77
COPY ../*.sln ./
@@ -24,7 +24,7 @@ COPY Crypter.DataAccess/. ./Crypter.DataAccess/
2424
RUN dotnet publish Crypter.API --configuration release --no-self-contained /p:TreatWarningsAsErrors=true /warnaserror --output /app/
2525
RUN dotnet-ef migrations bundle --project Crypter.DataAccess --startup-project Crypter.API --configuration release --no-build --target-runtime linux-x64 --output /app/efbundle --verbose
2626

27-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
27+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
2828
WORKDIR /app
2929
COPY --from=build /app ./
3030
CMD ["dotnet", "Crypter.API.dll"]

‎Crypter.API/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ This should also aid developers in deciding where to add a new API endpoint or w
5353
* PUT /api/user/key/private
5454

5555
* User Recovery
56-
* GET /api/user/recovery?email={emailAdress}
56+
* GET /api/user/recovery?email={emailAddress}
5757
* POST /api/user/recovery
5858

5959
* User Settings

0 commit comments

Comments
 (0)