Switch to minimal hosting and actions

Directory.Build.props

@@ -7,13 +7,8 @@
     <Copyright>Martin Costello (c) $([System.DateTime]::Now.ToString(yyyy))</Copyright>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <LangVersion>preview</LangVersion>
+    <LangVersion>latest</LangVersion>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <!--
-      HACK Disable due to CS0105 for System when using global usings.
-      See https://github.com/dotnet/roslyn/issues/54255.
-    -->
-    <NoWarn>$(NoWarn);CS0105</NoWarn>
     <Nullable>enable</Nullable>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/martincostello/dotnet-minimal-api-integration-testing</PackageProjectUrl>
@@ -27,4 +22,14 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)GlobalUsings.cs" />
   </ItemGroup>
+  <!--
+    HACK Workaround for issues building with file-scoped
+    namespaces in Visual Studio 2022 17.0 Preview 2.
+  -->
+  <ItemGroup Condition="'$(BuildingInsideVisualStudio)' == 'true'">
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.0.0-3.21373.8">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>

GlobalUsings.cs

@@ -1,12 +1,7 @@
 // Copyright (c) Martin Costello, 2021. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
-global using System;
-global using System.Collections.Generic;
 global using System.Globalization;
-global using System.Linq;
-global using System.Threading;
-global using System.Threading.Tasks;
 
 #if TEST_PROJECT
 global using Shouldly;

NuGet.config

@@ -2,6 +2,8 @@
 <configuration>
   <packageSources>
     <add key="aspnet-contrib" value="https://www.myget.org/F/aspnet-contrib/api/v3/index.json" />
+    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
+    <add key="roslyn" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

TodoApp.sln

@@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		global.json = global.json
+		GlobalUsings.cs = GlobalUsings.cs
 		LICENSE = LICENSE
 		NuGet.config = NuGet.config
 		README.md = README.md

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.6.21355.2",
+    "version": "6.0.100-rc.1.21379.12",
     "allowPrerelease": false,
     "rollForward": "latestMajor"
   }

src/TodoApp/ApiModule.cs

@@ -1,105 +1,98 @@
 // Copyright (c) Martin Costello, 2021. All rights reserved.
 // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.
 
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.DependencyInjection;
+using System.Security.Claims;
 using TodoApp.Models;
 using TodoApp.Services;
 
-namespace TodoApp
+namespace TodoApp;
+
+public static class ApiModule
 {
-    public static class ApiModule
+    public static IEndpointRouteBuilder MapApiRoutes(this IEndpointRouteBuilder builder)
     {
-        private const string ItemCompletePath = "/api/items/{id}/complete";
-        private const string ItemPath = "/api/items/{id}";
-        private const string ItemsPath = "/api/items";
-
-        public static IEndpointRouteBuilder MapApiRoutes(this IEndpointRouteBuilder builder)
-        {
-            builder.MapPost(ItemsPath, async (context) =>
+        // Get all Todo items
+        builder.MapGet("/api/items", async (
+            ITodoService service,
+            ClaimsPrincipal user,
+            CancellationToken cancellationToken) =>
+                await service.GetListAsync(user.GetUserId(), cancellationToken))
+            .RequireAuthorization();
+
+        // Get a specific Todo item
+        builder.MapGet("/api/items/{id}", async (
+            Guid id,
+            ClaimsPrincipal user,
+            ITodoService service,
+            CancellationToken cancellationToken) =>
+            {
+                var model = await service.GetAsync(user.GetUserId(), id, cancellationToken);
+                return model is null ? Results.Problem(statusCode: StatusCodes.Status404NotFound) : Results.Json(model);
+            })
+            .Produces<TodoItemModel>()
+            .ProducesProblem(StatusCodes.Status404NotFound)
+            .RequireAuthorization();
+
+        // Create a new Todo item
+        builder.MapPost("/api/items", async (
+            CreateTodoItemModel model,
+            ClaimsPrincipal user,
+            ITodoService service,
+            CancellationToken cancellationToken) =>
             {
-                var model = await context.Request.ReadFromJsonAsync<CreateTodoItemModel>();
-
                 if (model is null || string.IsNullOrWhiteSpace(model.Text))
                 {
-                    context.Response.StatusCode = StatusCodes.Status400BadRequest;
-                    return;
+                    return Results.Problem(statusCode: StatusCodes.Status400BadRequest);
                 }
 
-                var userId = context.GetUserId();
-                var service = context.RequestServices.GetRequiredService<ITodoService>();
-
-                var id = await service.AddItemAsync(userId, model.Text, context.RequestAborted);
-
-                context.Response.StatusCode = StatusCodes.Status201Created;
-                context.Response.GetTypedHeaders().Location = new Uri($"/api/items/{id}", UriKind.Relative);
-
-                await context.Response.WriteAsJsonAsync(new { id });
-            }).RequireAuthorization();
-
-            builder.MapGet(ItemsPath, async (context) =>
-            {
-                var userId = context.GetUserId();
-                var service = context.GetTodoService();
-
-                var model = await service.GetListAsync(userId, context.RequestAborted);
-
-                await context.Response.WriteAsJsonAsync(model);
-            }).RequireAuthorization();
-
-            builder.MapGet(ItemPath, async (context) =>
-            {
-                var itemId = context.GetItemId();
-                var userId = context.GetUserId();
-                var service = context.GetTodoService();
-
-                var model = await service.GetAsync(userId, itemId, context.RequestAborted);
-
-                if (model is null)
-                {
-                    context.Response.StatusCode = StatusCodes.Status404NotFound;
-                    return;
-                }
+                var id = await service.AddItemAsync(user.GetUserId(), model.Text, cancellationToken);
 
-                await context.Response.WriteAsJsonAsync(model);
-            }).RequireAuthorization();
+                return Results.Created($"/api/items/{id}", new { id });
+            })
+            .Produces(StatusCodes.Status201Created)
+            .ProducesProblem(StatusCodes.Status400BadRequest)
+            .RequireAuthorization();
 
-            builder.MapPost(ItemCompletePath, async (context) =>
+        // Mark a Todo item as completed
+        builder.MapPost("/api/items/{id}/complete", async (
+            Guid id,
+            ClaimsPrincipal user,
+            ITodoService service,
+            CancellationToken cancellationToken) =>
             {
-                var itemId = context.GetItemId();
-                var userId = context.GetUserId();
-                var service = context.GetTodoService();
-
-                var result = await service.CompleteItemAsync(userId, itemId, context.RequestAborted);
+                var wasCompleted = await service.CompleteItemAsync(user.GetUserId(), id, cancellationToken);
 
-                context.Response.StatusCode = result switch
+                return wasCompleted switch
                 {
-                    true => StatusCodes.Status204NoContent,
-                    false => StatusCodes.Status400BadRequest,
-                    _ => StatusCodes.Status404NotFound,
+                    true => Results.NoContent(),
+                    false => Results.Problem(statusCode: StatusCodes.Status400BadRequest),
+                    _ => Results.Problem(statusCode: StatusCodes.Status404NotFound),
                 };
-            }).RequireAuthorization();
-
-            builder.MapDelete(ItemPath, async (context) =>
+            })
+            .Produces(StatusCodes.Status204NoContent)
+            .ProducesProblem(StatusCodes.Status400BadRequest)
+            .ProducesProblem(StatusCodes.Status404NotFound)
+            .RequireAuthorization();
+
+        // Delete a Todo item
+        builder.MapDelete("/api/items/{id}", async (
+            Guid id,
+            ClaimsPrincipal user,
+            ITodoService service,
+            CancellationToken cancellationToken) =>
             {
-                var itemId = context.GetItemId();
-                var userId = context.GetUserId();
-                var service = context.GetTodoService();
-
-                var result = await service.DeleteItemAsync(userId, itemId, context.RequestAborted);
-
-                context.Response.StatusCode = result ? StatusCodes.Status204NoContent : StatusCodes.Status404NotFound;
-            }).RequireAuthorization();
-
-            return builder;
-        }
-
-        private static string GetItemId(this HttpContext context)
-            => (string)context.GetRouteValue("id")!;
-
-        private static ITodoService GetTodoService(this HttpContext context)
-            => context.RequestServices.GetRequiredService<ITodoService>();
+                var wasDeleted = await service.DeleteItemAsync(user.GetUserId(), id, cancellationToken);
+                return wasDeleted ? Results.NoContent() : Results.Problem(statusCode: StatusCodes.Status404NotFound);
+            })
+            .Produces(StatusCodes.Status204NoContent)
+            .ProducesProblem(StatusCodes.Status404NotFound)
+            .RequireAuthorization();
+
+        // Redirect to Open API/Swagger documentation
+        builder.MapGet("/api", () => Results.Redirect("/swagger-ui/index.html"))
+               .ExcludeFromApiExplorer()
+               .RequireAuthorization();
+
+        return builder;
     }
 }