diff --git a/frameworks/CSharp/simplew/Benchmarks/Benchmarks.csproj b/frameworks/CSharp/simplew/Benchmarks/Benchmarks.csproj index 2b894596a8e..445685a0b85 100644 --- a/frameworks/CSharp/simplew/Benchmarks/Benchmarks.csproj +++ b/frameworks/CSharp/simplew/Benchmarks/Benchmarks.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 enable enable SimpleW @@ -14,7 +14,7 @@ - + diff --git a/frameworks/CSharp/simplew/Benchmarks/Program.cs b/frameworks/CSharp/simplew/Benchmarks/Program.cs index 2c69f462d1f..211c9c3976f 100644 --- a/frameworks/CSharp/simplew/Benchmarks/Program.cs +++ b/frameworks/CSharp/simplew/Benchmarks/Program.cs @@ -10,39 +10,25 @@ internal static class Program { public static async Task Main(string[] args) { - var server = new SimpleWServer(IPAddress.Any, 8080); - server.AddDynamicContent("/api"); - server.Start(); + SimpleWServer server = new(IPAddress.Any, 8080); - await Task.Delay(-1); + // minimal api + server.MapGet("/json", (HttpSession session) => { + return session.Response + .Json(new { message = "Hello, World!" }) + .AddHeader("Server", "SimpleW") + .AddHeader("Date", DateTime.Now.ToString("R")) + .NoCompression(); + }); + server.MapGet("/plaintext", (HttpSession session) => { + return session.Response + .Text("Hello, World!") + .AddHeader("Server", "SimpleW") + .AddHeader("Date", DateTime.Now.ToString("R")) + .NoCompression(); + }); + + await server.RunAsync(); } - - public class BenchmarksController : Controller { - [Route("GET", "/json")] - public object Json() { - return Response.MakeResponse( - new { message = "Hello, World!" }, // object will be serialized - addHeaders: new Dictionary() - { - { "Server", "SimpleW" }, - { "Date", DateTime.Now.ToString("R") } - } - // compress parameter is default to null, so no compression - ); - } - [Route("GET", "/plaintext")] - public object Plaintext() { - return Response.MakeResponse( - "Hello, World!", - "text/plain", - addHeaders: new Dictionary() - { - { "Server", "SimpleW" }, - { "Date", DateTime.Now.ToString("R") } - } - // compress parameter is default to null, so no compression - ); - } - } -} \ No newline at end of file +} diff --git a/frameworks/CSharp/simplew/README.md b/frameworks/CSharp/simplew/README.md index 3d380883ca7..6db827ae819 100644 --- a/frameworks/CSharp/simplew/README.md +++ b/frameworks/CSharp/simplew/README.md @@ -1,6 +1,6 @@ # SimpleW Tests on Linux -See the [SimpleW website](https://stratdev3.github.io/SimpleW/) for more information. +See the [SimpleW website](https://simplew.net) for more information. ## Infrastructure Software Versions @@ -10,9 +10,9 @@ See the [SimpleW website](https://stratdev3.github.io/SimpleW/) for more informa **Platforms** -* .NET 8/9 +* .NET 8/9/10 ## Paths & Source for Tests * [Plaintext](Benchmarks/Program.cs): "/api/plaintext" -* [JSON](Benchmarks/Tests/JsonResource.cs): "/api/json" \ No newline at end of file +* [JSON](Benchmarks/Tests/JsonResource.cs): "/api/json" diff --git a/frameworks/CSharp/simplew/benchmark_config.json b/frameworks/CSharp/simplew/benchmark_config.json index e1396429d39..c4786a83a39 100644 --- a/frameworks/CSharp/simplew/benchmark_config.json +++ b/frameworks/CSharp/simplew/benchmark_config.json @@ -1,5 +1,6 @@ { "framework": "simplew", + "maintainers": ["stratdev3"], "tests": [{ "default": { "plaintext_url": "/api/plaintext", @@ -12,7 +13,7 @@ "language": "C#", "orm": "None", "platform": ".NET", - "webserver": "Netcoreserver", + "webserver": "SimpleW", "os": "Linux", "database_os": "Linux", "display_name": "SimpleW", diff --git a/frameworks/CSharp/simplew/config.toml b/frameworks/CSharp/simplew/config.toml index e9d267af88a..f4db1641910 100644 --- a/frameworks/CSharp/simplew/config.toml +++ b/frameworks/CSharp/simplew/config.toml @@ -10,5 +10,5 @@ os = "Linux" database_os = "Linux" orm = "None" platform = ".NET" -webserver = "Netcoreserver" -versus = "None" \ No newline at end of file +webserver = "SimpleW" +versus = "None" diff --git a/frameworks/CSharp/simplew/simplew.dockerfile b/frameworks/CSharp/simplew/simplew.dockerfile index 8c473477a61..431ce7327fc 100644 --- a/frameworks/CSharp/simplew/simplew.dockerfile +++ b/frameworks/CSharp/simplew/simplew.dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build WORKDIR /source # copy csproj and restore as distinct layers @@ -10,7 +10,7 @@ COPY Benchmarks/ . RUN dotnet publish -c release -o /app -r linux-musl-x64 --no-restore --self-contained # final stage/image -FROM mcr.microsoft.com/dotnet/runtime-deps:9.0-alpine +FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-alpine ENV DOTNET_GCDynamicAdaptationMode=0 ENV DOTNET_ReadyToRun=0