diff --git a/Dockerfile b/Dockerfile index c4dfefb..434b038 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base WORKDIR /app ENV ASPNETCORE_URLS=http://+:80 ENV FileStorageOptions__Path=/app/files diff --git a/SecureSend.Application/SecureSend.Application.csproj b/SecureSend.Application/SecureSend.Application.csproj index ec97a3d..6018bea 100644 --- a/SecureSend.Application/SecureSend.Application.csproj +++ b/SecureSend.Application/SecureSend.Application.csproj @@ -1,18 +1,14 @@  - - net7.0 + net8.0 enable enable - - + - - - + \ No newline at end of file diff --git a/SecureSend.Domain/SecureSend.Domain.csproj b/SecureSend.Domain/SecureSend.Domain.csproj index 3cd045a..4656a3e 100644 --- a/SecureSend.Domain/SecureSend.Domain.csproj +++ b/SecureSend.Domain/SecureSend.Domain.csproj @@ -1,14 +1,11 @@  - - net7.0 + net8.0 enable enable - - + - - + \ No newline at end of file diff --git a/SecureSend.Infrastructure/SecureSend.Infrastructure.csproj b/SecureSend.Infrastructure/SecureSend.Infrastructure.csproj index 7c267f9..e258c10 100644 --- a/SecureSend.Infrastructure/SecureSend.Infrastructure.csproj +++ b/SecureSend.Infrastructure/SecureSend.Infrastructure.csproj @@ -1,24 +1,16 @@  - - net7.0 + net8.0 enable enable - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + + - - - - + \ No newline at end of file diff --git a/SecureSend.PostgresMigrations/SecureSend.PostgresMigrations.csproj b/SecureSend.PostgresMigrations/SecureSend.PostgresMigrations.csproj index 0864ab2..a4f666b 100644 --- a/SecureSend.PostgresMigrations/SecureSend.PostgresMigrations.csproj +++ b/SecureSend.PostgresMigrations/SecureSend.PostgresMigrations.csproj @@ -1,13 +1,10 @@ - - - net7.0 - enable - enable - - - - - - - + + net8.0 + enable + enable + + + + + \ No newline at end of file diff --git a/SecureSend.SqlServerMigrations/SecureSend.SqlServerMigrations.csproj b/SecureSend.SqlServerMigrations/SecureSend.SqlServerMigrations.csproj index c6524ee..c30bc4e 100644 --- a/SecureSend.SqlServerMigrations/SecureSend.SqlServerMigrations.csproj +++ b/SecureSend.SqlServerMigrations/SecureSend.SqlServerMigrations.csproj @@ -1,14 +1,11 @@ - - - net7.0 - enable - enable - SecureSend.SqlServerMigration - - - - - - - + + net8.0 + enable + enable + SecureSend.SqlServerMigration + + + + + \ No newline at end of file diff --git a/SecureSend.Test/Domain/SecureSendUploadTests.cs b/SecureSend.Test/Domain/SecureSendUploadTests.cs index 69ff9a2..7efa84d 100644 --- a/SecureSend.Test/Domain/SecureSendUploadTests.cs +++ b/SecureSend.Test/Domain/SecureSendUploadTests.cs @@ -79,7 +79,7 @@ public void RemoveFile_Succeeds() [Fact] public void VerifyHash_Throws_InvalidPasswordException() { - var exception = Record.Exception(() => upload.PasswordHash.VerifyHash("wrong password")); + var exception = Record.Exception(() => upload!.PasswordHash!.VerifyHash("wrong password")); Assert.NotNull(exception); Assert.IsType(exception); } @@ -87,6 +87,6 @@ public void VerifyHash_Throws_InvalidPasswordException() [Fact] public void VerifyHash_Succeeds() { - upload.PasswordHash.VerifyHash("testing"); + upload!.PasswordHash!.VerifyHash("testing"); } } \ No newline at end of file diff --git a/SecureSend.Test/SecureSend.Test.csproj b/SecureSend.Test/SecureSend.Test.csproj index 31e4622..5567d2a 100644 --- a/SecureSend.Test/SecureSend.Test.csproj +++ b/SecureSend.Test/SecureSend.Test.csproj @@ -1,33 +1,25 @@ - - - net7.0 - enable - enable - - false - true - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - - - + + net8.0 + enable + enable + false + true + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + \ No newline at end of file diff --git a/SecureSend.sln b/SecureSend.sln index 7a48e32..6314bda 100644 --- a/SecureSend.sln +++ b/SecureSend.sln @@ -1,21 +1,21 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.5.33530.505 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecureSend", "SecureSend\SecureSend.csproj", "{EB9A5562-34AB-4CAB-B488-5E68C4218270}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecureSend.Domain", "SecureSend.Domain\SecureSend.Domain.csproj", "{F0487577-AF18-46AC-9478-DBA2498F2308}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecureSend.Domain", "SecureSend.Domain\SecureSend.Domain.csproj", "{F0487577-AF18-46AC-9478-DBA2498F2308}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecureSend.Application", "SecureSend.Application\SecureSend.Application.csproj", "{B5B5EA9A-8A59-4493-A64B-E9894266B6BA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecureSend.Application", "SecureSend.Application\SecureSend.Application.csproj", "{B5B5EA9A-8A59-4493-A64B-E9894266B6BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecureSend.Infrastructure", "SecureSend.Infrastructure\SecureSend.Infrastructure.csproj", "{9E79BF8F-C9D8-4E0A-995C-AE5D4B0DEACD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecureSend.Infrastructure", "SecureSend.Infrastructure\SecureSend.Infrastructure.csproj", "{9E79BF8F-C9D8-4E0A-995C-AE5D4B0DEACD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecureSend.SqlServerMigrations", "SecureSend.SqlServerMigrations\SecureSend.SqlServerMigrations.csproj", "{39CE0185-967A-45CD-8083-FEE3E69BC907}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecureSend.SqlServerMigrations", "SecureSend.SqlServerMigrations\SecureSend.SqlServerMigrations.csproj", "{39CE0185-967A-45CD-8083-FEE3E69BC907}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecureSend.PostgresMigrations", "SecureSend.PostgresMigrations\SecureSend.PostgresMigrations.csproj", "{EBF94ECB-C3A4-4F80-8F34-31F8A82B1E81}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecureSend.PostgresMigrations", "SecureSend.PostgresMigrations\SecureSend.PostgresMigrations.csproj", "{EBF94ECB-C3A4-4F80-8F34-31F8A82B1E81}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecureSend.Test", "SecureSend.Test\SecureSend.Test.csproj", "{B83D3323-5B39-486B-9D5A-18F03D830F3C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecureSend.Test", "SecureSend.Test\SecureSend.Test.csproj", "{B83D3323-5B39-486B-9D5A-18F03D830F3C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/SecureSend/Controllers/SecureSendController.cs b/SecureSend/Controllers/SecureSendController.cs index 03dc4c8..3337b87 100644 --- a/SecureSend/Controllers/SecureSendController.cs +++ b/SecureSend/Controllers/SecureSendController.cs @@ -30,7 +30,7 @@ public async Task ViewSecureUpload([FromBody] ViewSecureUpload qu public async Task DownloadFile([FromQuery] DownloadFile file, CancellationToken token) { var fileStream = await _sender.Send(file, token); - Response.Headers.Add("Content-Disposition", $"attachment;filename={HttpUtility.UrlEncode(fileStream.FileName)}"); + Response.Headers.Append("Content-Disposition", $"attachment;filename={HttpUtility.UrlEncode(fileStream.FileName)}"); return new FileStreamResult(fileStream.FileStream, fileStream.ContentType); } diff --git a/SecureSend/SecureSend.csproj b/SecureSend/SecureSend.csproj index 6d37c5c..46dc1db 100644 --- a/SecureSend/SecureSend.csproj +++ b/SecureSend/SecureSend.csproj @@ -1,58 +1,47 @@  - - net7.0 + net8.0 enable - true - Latest - false - ClientApp\ - $(DefaultItemExcludes);$(SpaRoot)node_modules\** - https://localhost:3000 - npm run dev - enable - + true + Latest + false + ClientApp\ + $(DefaultItemExcludes);$(SpaRoot)node_modules\** + https://localhost:3000 + npm run dev + enable - - - - - - - - - - - - - - - - - - - - - %(DistFiles.Identity) - PreserveNewest - true - - - - + + + + + + + + + + + + + + + + + + %(DistFiles.Identity) + PreserveNewest + true + + + - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + + - - - + \ No newline at end of file