Move server projects to src/ and add redirect middleware integration tests

Author: damianh

.github/workflows/ci.yml

@@ -30,3 +30,6 @@ jobs:
 
       - name: Build container
         run: dotnet build.cs container
+        
+      - name: Run tests
+        run: dotnet build.cs dotnet-test

.github/workflows/link-checker.yml

@@ -38,5 +38,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         with:
-          args: '--header ''x-origin-verify: ${{ secrets.ORIGIN_VERIFICATION_HEADER_VALUE }}'' --no-progress --max-concurrency 8 --skip-missing --accept 200,429 --exclude-path server/Docs.Web/wwwroot/_llms-txt --exclude-path server/Docs.Web/wwwroot/llms.txt --exclude-path server/Docs.Web/wwwroot/llms-full.txt --exclude-path server/Docs.Web/wwwroot/llms-small.txt --exclude-loopback --require-https --exclude sample.duendesoftware.com --exclude "docs.duendesoftware.com/404" --exclude sitemap --exclude "https://github.com/DuendeArchive/IdentityModel.AspNetCore/" --root-dir "$PWD/server/Docs.Web/wwwroot" server/Docs.Web/wwwroot/**'
+          args: '--header ''x-origin-verify: ${{ secrets.ORIGIN_VERIFICATION_HEADER_VALUE }}'' --no-progress --max-concurrency 8 --skip-missing --accept 200,429 --exclude-path server/src/Docs.Web/wwwroot/_llms-txt --exclude-path server/src/Docs.Web/wwwroot/llms.txt --exclude-path server/src/Docs.Web/wwwroot/llms-full.txt --exclude-path server/src/Docs.Web/wwwroot/llms-small.txt --exclude-loopback --require-https --exclude sample.duendesoftware.com --exclude "docs.duendesoftware.com/404" --exclude sitemap --exclude "https://github.com/DuendeArchive/IdentityModel.AspNetCore/" --root-dir "$PWD/server/src/Docs.Web/wwwroot" server/src/Docs.Web/wwwroot/**'
           fail: true

.gitignore

@@ -1,7 +1,7 @@
 # Astro build output
 astro/dist/
 astro/root/
-server/Docs.Web/wwwroot/
+server/src/Docs.Web/wwwroot/
 
 # generated types
 astro/.astro/

README.md

@@ -82,10 +82,13 @@ This project uses Astro + Starlight for the documentation site, served by ASP.NE
 │   ├── package.json
 │   └── tsconfig.json
 └── server/                   # ASP.NET Core server
-    ├── Docs.Web/             # Static file server
-    │   └── wwwroot/          # Astro build output (gitignored)
-    ├── Docs.AppHost/         # .NET Aspire orchestrator
-    └── Docs.ServiceDefaults/ # Shared configuration
+    ├── src/
+    │   ├── Docs.Web/             # Static file server
+    │   │   └── wwwroot/          # Astro build output (gitignored)
+    │   ├── Docs.AppHost/         # .NET Aspire orchestrator
+    │   └── Docs.ServiceDefaults/ # Shared configuration
+    └── tests/
+        └── Docs.Web.Tests/       # Integration tests
 ```
 
 Starlight looks for `.md` or `.mdx` files in the `astro/src/content/docs/` directory. Each file is exposed as a route based on its file name.

build.cs

@@ -14,12 +14,13 @@
 }
 
 var serverDir = Path.Combine(repoRoot, "server");
-var wwwrootDir = Path.Combine(serverDir, "Docs.Web", "wwwroot");
+var wwwrootDir = Path.Combine(serverDir, "src", "Docs.Web", "wwwroot");
 
 // Target names
 const string Restore = "restore";
 const string AstroBuild = "astro-build";
 const string DotnetBuild = "dotnet-build";
+const string DotnetTest = "dotnet-test";
 const string DotnetPublish = "dotnet-publish";
 const string Build = "build";
 const string Container = "container";
@@ -60,20 +61,25 @@ await RunAsync("docker",
 Target(DotnetBuild, dependsOn: [Restore], () =>
     RunAsync("dotnet", "build Docs.slnx --no-restore", workingDirectory: serverDir));
 
+Target(DotnetTest, dependsOn: [DotnetBuild], () =>
+    RunAsync("dotnet", "test Docs.slnx --no-build", workingDirectory: serverDir));
+
 Target(DotnetPublish, dependsOn: [Restore], () =>
-    RunAsync("dotnet", "publish Docs.Web/Docs.Web.csproj -c Release --no-restore",
+    RunAsync("dotnet", "publish src/Docs.Web/Docs.Web.csproj -c Release --no-restore",
         workingDirectory: serverDir));
 
 Target(Build, dependsOn: [AstroBuild, DotnetBuild]);
 
+Target(Default, dependsOn: [Build, DotnetTest]);
+
 // Container (no Dockerfile needed!)
 Target(Container, dependsOn: [AstroBuild], () =>
-    RunAsync("dotnet", "publish Docs.Web/Docs.Web.csproj -c Release /t:PublishContainer",
+    RunAsync("dotnet", "publish src/Docs.Web/Docs.Web.csproj -c Release /t:PublishContainer",
         workingDirectory: serverDir));
 
 // Dev
 Target(Aspire, () =>
-    RunAsync("dotnet", "run --project Docs.AppHost", workingDirectory: serverDir));
+    RunAsync("dotnet", "run --project src/Docs.AppHost", workingDirectory: serverDir));
 
 // Quality - Link check builds Astro; actual lychee runs in CI workflow due to secrets
 Target(LinkCheck, dependsOn: [AstroBuild], () =>
@@ -91,6 +97,4 @@ await RunAsync("docker",
         Directory.Delete(wwwrootDir, recursive: true);
 });
 
-Target(Default, dependsOn: [Build]);
-
 await RunTargetsAndExitAsync(args);

server/Docs.slnx

@@ -1,5 +1,10 @@
 <Solution>
-  <Project Path="Docs.ServiceDefaults/Docs.ServiceDefaults.csproj"/>
-  <Project Path="Docs.Web/Docs.Web.csproj"/>
-  <Project Path="Docs.AppHost/Docs.AppHost.csproj"/>
+  <Folder Name="/src/">
+    <Project Path="src/Docs.ServiceDefaults/Docs.ServiceDefaults.csproj"/>
+    <Project Path="src/Docs.Web/Docs.Web.csproj"/>
+    <Project Path="src/Docs.AppHost/Docs.AppHost.csproj"/>
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/Docs.Web.Tests/Docs.Web.Tests.csproj"/>
+  </Folder>
 </Solution>

server/Docs.AppHost/Docs.AppHost.csproj …ver/src/Docs.AppHost/Docs.AppHost.csprojserver/Docs.AppHost/Docs.AppHost.csproj renamed to server/src/Docs.AppHost/Docs.AppHost.csproj server/Docs.AppHost/Docs.AppHost.csproj renamed to server/src/Docs.AppHost/Docs.AppHost.csproj

@@ -1,7 +1,7 @@
 var builder = DistributedApplication.CreateBuilder(args);
 
 // Astro dev server (for local development only)
-_ = builder.AddJavaScriptApp("astro", "../astro")
+_ = builder.AddJavaScriptApp("astro", "../../astro")
     .WithHttpEndpoint(port: 4321, env: "PORT")
     .WithExternalHttpEndpoints();