diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 7177e87..b7bfab5 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,7 +19,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Restore dependencies run: dotnet restore - name: Build diff --git a/LICENSE b/LICENSE index 2d200d0..11f9aa6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 Ashton Abdiukov +Copyright (c) 2024-2026 Ashton Abdiukov Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index a2025b4..52bfe41 100644 --- a/README.md +++ b/README.md @@ -80,17 +80,17 @@ curl -X 'POST' \ ### Option 2: Using Visual Studio (recommended for development purposes) #### Requirements -- Visual Studio 2022 +- Visual Studio 2026 - With ASP.NET and web development installed from the Visual Studio Installer -- .NET 9 SDK +- .NET 10 SDK #### How to Run -1. Open the solution in Visual Studio 2022. +1. Open the solution in Visual Studio 2026. 2. Build and launch the Captcha.WebApi project. 3. The API can be accessed at [https://localhost:5280](https://localhost:5280). #### How to Test -1. Open the solution in Visual Studio 2022. +1. Open the solution in Visual Studio 2026. 2. Run the tests in Test Explorer. ## Acknowledgments diff --git a/src/Captcha.Core/Captcha.Core.csproj b/src/Captcha.Core/Captcha.Core.csproj index 2796141..38d4a67 100644 --- a/src/Captcha.Core/Captcha.Core.csproj +++ b/src/Captcha.Core/Captcha.Core.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable Captcha.Core @@ -13,8 +13,8 @@ - - + + diff --git a/src/Captcha.WebApi/Captcha.WebApi.csproj b/src/Captcha.WebApi/Captcha.WebApi.csproj index 66e7c8d..9bea07f 100644 --- a/src/Captcha.WebApi/Captcha.WebApi.csproj +++ b/src/Captcha.WebApi/Captcha.WebApi.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable Linux @@ -10,12 +10,12 @@ - - - - - - + + + + + + diff --git a/src/Captcha.WebApi/Dependency/ServiceRegistrations.cs b/src/Captcha.WebApi/Dependency/ServiceRegistrations.cs index 2e36c9b..a744491 100644 --- a/src/Captcha.WebApi/Dependency/ServiceRegistrations.cs +++ b/src/Captcha.WebApi/Dependency/ServiceRegistrations.cs @@ -3,7 +3,7 @@ namespace Captcha.WebApi.Dependency; using Captcha.Core.Mappers; using Captcha.Core.Services; using Controllers.Examples; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using OpenTelemetry.Resources; using OpenTelemetry.Trace; using Swashbuckle.AspNetCore.Filters; diff --git a/src/Captcha.WebApi/Dockerfile b/src/Captcha.WebApi/Dockerfile index bb4bc8d..0317cfe 100644 --- a/src/Captcha.WebApi/Dockerfile +++ b/src/Captcha.WebApi/Dockerfile @@ -1,15 +1,15 @@ # See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. # This stage is used when running from VS in fast mode (Default for Debug configuration) -FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble AS base - +FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base USER $APP_UID WORKDIR /app EXPOSE 8080 EXPOSE 8081 + # This stage is used to build the service project -FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["src/Captcha.WebApi/Captcha.WebApi.csproj", "src/Captcha.WebApi/"] @@ -28,4 +28,4 @@ RUN dotnet publish "./Captcha.WebApi.csproj" -c $BUILD_CONFIGURATION -o /app/pub FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "Captcha.WebApi.dll"] +ENTRYPOINT ["dotnet", "Captcha.WebApi.dll"] \ No newline at end of file diff --git a/tests/Captcha.FunctionalTests/Captcha.FunctionalTests.csproj b/tests/Captcha.FunctionalTests/Captcha.FunctionalTests.csproj index 22a0c43..615264c 100644 --- a/tests/Captcha.FunctionalTests/Captcha.FunctionalTests.csproj +++ b/tests/Captcha.FunctionalTests/Captcha.FunctionalTests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable Linux @@ -14,13 +14,13 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - - + + - + diff --git a/tests/Captcha.UnitTests/Captcha.UnitTests.csproj b/tests/Captcha.UnitTests/Captcha.UnitTests.csproj index 2b41084..8bc736d 100644 --- a/tests/Captcha.UnitTests/Captcha.UnitTests.csproj +++ b/tests/Captcha.UnitTests/Captcha.UnitTests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable false @@ -10,10 +10,10 @@ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive