Merge pull request #9558 from CypherPotato/master

update sisk version

frameworks/CSharp/sisk/benchmark_config.json

@@ -1,21 +1,41 @@
 {
-  "framework": "sisk",
-  "tests": [{
-    "default": {
-      "plaintext_url": "/plaintext",
-      "json_url": "/json",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "None",
-      "framework": "Sisk",
-      "language": "C#",
-      "orm": "Raw",
-      "platform": ".NET",
-      "webserver": "Sisk",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "Sisk Framework"
-    }
-  }]
-}
+    "framework": "sisk",
+    "tests": [
+        {
+            "default": {
+                "plaintext_url": "/plaintext",
+                "json_url": "/json",
+                "port": 8080,
+                "approach": "Realistic",
+                "classification": "Micro",
+                "database": "None",
+                "framework": "Sisk",
+                "language": "C#",
+                "orm": "Raw",
+                "platform": ".NET",
+                "webserver": "HttpListener",
+                "os": "Linux",
+                "database_os": "Linux",
+                "display_name": "Sisk Framework"
+            }
+        },
+        {
+            "cadente": {
+                "plaintext_url": "/plaintext",
+                "json_url": "/json",
+                "port": 8080,
+                "approach": "Realistic",
+                "classification": "Platform",
+                "database": "None",
+                "framework": "Sisk",
+                "language": "C#",
+                "orm": "Raw",
+                "platform": ".NET",
+                "webserver": "Cadente",
+                "os": "Linux",
+                "database_os": "Linux",
+                "display_name": "Sisk Framework (Cadente)"
+            }
+        }
+    ]
+}

frameworks/CSharp/sisk/config.toml

@@ -5,11 +5,24 @@ name = "sisk"
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 approach = "Realistic"
-classification = "Fullstack"
+classification = "Micro"
 database = "None"
 database_os = "Linux"
 os = "Linux"
 orm = "Raw"
 platform = ".NET"
-webserver = "Sisk"
+webserver = "HttpListener"
+versus = "None"
+
+[cadente]
+urls.plaintext = "/plaintext"
+urls.json = "/json"
+approach = "Realistic"
+classification = "Platform"
+database = "None"
+database_os = "Linux"
+os = "Linux"
+orm = "Raw"
+platform = ".NET"
+webserver = "Cadente"
 versus = "None"

frameworks/CSharp/sisk/sisk-cadente.dockerfile

@@ -0,0 +1,19 @@
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+WORKDIR /source
+
+# copy csproj and restore as distinct layers
+COPY sisk-cadente/*.csproj .
+RUN dotnet restore -r linux-musl-x64
+
+# copy and publish app and libraries
+COPY sisk-cadente/ .
+RUN dotnet publish -c release -o /app -r linux-musl-x64
+
+# final stage/image
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
+WORKDIR /app
+COPY --from=build /app .
+
+ENTRYPOINT ["dotnet", "./sisk.dll"]
+
+EXPOSE 8080

frameworks/CSharp/sisk/sisk-cadente/Program.cs

@@ -0,0 +1,36 @@
+using System.Text;
+using System.Text.Json;
+using Sisk.Cadente;
+
+var host = new HttpHost ( 8080, session => {
+    var request = session.Request;
+
+    if (request.Path == "/plaintext") {
+        SerializePlainTextResponse ( session.Response );
+    }
+    else if (request.Path == "/json") {
+        SerializeJsonResponse ( session.Response );
+    }
+    else {
+        session.Response.StatusCode = 404;
+    }
+} );
+
+host.Start ();
+Thread.Sleep ( Timeout.Infinite );
+
+static void SerializePlainTextResponse ( HttpResponse response ) {
+    var contentBytes = Encoding.UTF8.GetBytes ( "Hello, world!" );
+
+    response.Headers.Add ( new HttpHeader ( "Content-Type", "text/plain" ) );
+    response.ResponseStream = new MemoryStream ( contentBytes );
+}
+
+static void SerializeJsonResponse ( HttpResponse response ) {
+    var contentBytes = JsonSerializer.SerializeToUtf8Bytes ( new {
+        message = "Hello, world!"
+    } );
+
+    response.Headers.Add ( new HttpHeader ( "Content-Type", "application/json; charset=utf-8" ) );
+    response.ResponseStream = new MemoryStream ( contentBytes );
+}

frameworks/CSharp/sisk/sisk-cadente/sisk.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<ServerGarbageCollection>true</ServerGarbageCollection>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <PackageReference Include="Sisk.Cadente" Version="0.1.42-alpha1" />
+	</ItemGroup>
+
+</Project>

frameworks/CSharp/sisk/sisk/Program.cs

@@ -1,26 +1,22 @@
-using Sisk.Core.Http;
+using System.Net.Http.Json;
+using Sisk.Core.Http;
 using Sisk.Core.Routing;
-using System.Net.Http.Json;
 
-var app = HttpServer.CreateBuilder(host =>
-{
-    host.UseListeningPort("http://+:8080/");
-});
+var app = HttpServer.CreateBuilder ( host => {
+    host.UseListeningPort ( "http://+:8080/" );
+} ).Build ();
 
-app.Router.SetRoute(RouteMethod.Get, "/plaintext", PlainText);
-app.Router.SetRoute(RouteMethod.Get, "/json", Json);
+app.Router.SetRoute ( RouteMethod.Get, "/plaintext", PlainText );
+app.Router.SetRoute ( RouteMethod.Get, "/json", Json );
 
-app.Start();
+app.Start ();
 
-static HttpResponse PlainText(HttpRequest request)
-{
-    return new HttpResponse().WithContent("Hello, world!");
+static HttpResponse PlainText ( HttpRequest request ) {
+    return new HttpResponse ( "Hello, world!" );
 }
 
-static HttpResponse Json(HttpRequest request)
-{
-    return new HttpResponse().WithContent(JsonContent.Create(new
-    {
+static HttpResponse Json ( HttpRequest request ) {
+    return new HttpResponse ( JsonContent.Create ( new {
         message = "Hello, world!"
-    }));
+    } ) );
 }

frameworks/CSharp/sisk/sisk/sisk.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
@@ -9,7 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Sisk.HttpServer" Version="0.16.2" />
+		<PackageReference Include="Sisk.HttpServer" Version="1.4.0-beta3" />
 	</ItemGroup>
 
 </Project>