@team-supercharge/oasg 18.0.2 → 18.2.0

package/README.md

@@ -128,39 +128,42 @@ include:
 
 The table below gives an overview of the changes (breaking, non-breaking, bug fixes) introduced in various major versions. For the resolution of breaking changes please consult the [Migration Guide](#migration-guide).
 
-| Component                    |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
-|------------------------------|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
-| **Internal**                 | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
-| _Core_                       |✨  |💥  |✨  |🐛  |💥  |✨  |🐛  |✨  |➖  |✨  |🐛  |🐛  |➖  |💥  |💥  |✨  |💥  |🆕  |
-| _Linter_                     |➖  |➖  |🐛  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |➖  |➖  |🐛  |➖  |✨  |💥  |🆕  |
-| **Client Targets**           | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
-| `android`                    |✨  |➖  |➖  |➖  |🐛  |💥  |➖  |➖  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `angular`                    |➖  |➖  |✨  |➖  |🐛  |💥  |➖  |➖  |➖  |🐛  |➖  |➖  |➖  |💥  |➖  |➖  |➖  |🆕  |
-| `dotnet`                     |➖  |➖  |➖  |➖  |🆕  |
-| `feign`                      |➖  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |🐛  |🆕  |
-| `feign-kotlin`               |➖  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `plain-java`                 |➖  |🐛  |🆕  |
-| `flutter`                    |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `ios`                        |➖  |➖  |➖  |➖  |➖  |💥  |🐛  |➖  |➖  |➖  |✨  |➖  |💥  |➖  |➖  |✨  |🆕  |
-| `apple-swift`                |➖  |➖  |🆕  |
-| `kmp`                        |✨  |✨  |➖  |➖  |🆕  |
-| `python`                     |➖  |➖  |🆕  |
-| `python-legacy`              |➖  |➖  |💥  |➖  |🐛  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `react`                      |💥  |➖  |🐛  |🐛  |➖  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `typescript-axios`           |✨  |➖  |🆕  |
-| `typescript-fetch`           |✨  |➖  |🆕  |
-| **Server Targets**           | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
-| `nestjs`                     |✨  |🐛  |💥  |💥  |➖  |💥  |✨  |➖  |➖  |🐛  |➖  |➖  |✨  |🆕  |
-| `python-fastapi`             |➖  |➖  |➖  |➖  |🆕  |
-| `python-fastapi-raw-request` |➖  |➖  |➖  |➖  |🆕  |
-| `spring`                     |➖  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |➖  |✨  |➖  |🆕  |
-| `spring-kotlin`              |➖  |✨  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |✨  |➖  |🆕  |
-| **Misc Targets**             | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
-| `contract-testing`           |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `openapi`                    |➖  |➖  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |✨  |➖  |🆕  |
-| `stubby`                     |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |➖  |➖  |🆕  |
-| `postman`                    |➖  |➖  |➖  |🆕  |
-| `msw`                        |🆕  |
+| Component                        |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+|----------------------------------|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
+| **Internal**                     | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
+| _Core_                           |✨  |💥  |✨  |🐛  |💥  |✨  |🐛  |✨  |➖  |✨  |🐛  |🐛  |➖  |💥  |💥  |✨  |💥  |🆕  |
+| _Linter_                         |➖  |➖  |🐛  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |➖  |➖  |🐛  |➖  |✨  |💥  |🆕  |
+| **Client Targets**               | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
+| `android`                        |✨  |➖  |➖  |➖  |🐛  |💥  |➖  |➖  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `angular`                        |➖  |➖  |✨  |➖  |🐛  |💥  |➖  |➖  |➖  |🐛  |➖  |➖  |➖  |💥  |➖  |➖  |➖  |🆕  |
+| `dotnet`                         |✨  |➖  |➖  |➖  |🆕  |
+| `dotnet-system-text-json`        |🆕➖|
+| `dotnet-webapi`                  |✨  |➖  |🆕➖|
+| `dotnet-webapi-system-text-json` |🆕➖|
+| `feign`                          |➖  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |🐛  |🆕  |
+| `feign-kotlin`                   |➖  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `plain-java`                     |➖  |🐛  |🆕  |
+| `flutter`                        |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `ios`                            |➖  |➖  |➖  |➖  |➖  |💥  |🐛  |➖  |➖  |➖  |✨  |➖  |💥  |➖  |➖  |✨  |🆕  |
+| `apple-swift`                    |➖  |➖  |🆕  |
+| `kmp`                            |✨  |✨  |➖  |➖  |🆕  |
+| `python`                         |➖  |➖  |🆕  |
+| `python-legacy`                  |➖  |➖  |💥  |➖  |🐛  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `react`                          |💥  |➖  |🐛  |🐛  |➖  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `typescript-axios`               |✨  |➖  |🆕  |
+| `typescript-fetch`               |✨  |➖  |🆕  |
+| **Server Targets**               | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
+| `nestjs`                         |✨  |🐛  |💥  |💥  |➖  |💥  |✨  |➖  |➖  |🐛  |➖  |➖  |✨  |🆕  |
+| `python-fastapi`                 |➖  |➖  |➖  |➖  |🆕  |
+| `python-fastapi-raw-request`     |➖  |➖  |➖  |➖  |🆕  |
+| `spring`                         |➖  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |➖  |✨  |➖  |🆕  |
+| `spring-kotlin`                  |➖  |✨  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |✨  |➖  |🆕  |
+| **Misc Targets**                 | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
+| `contract-testing`               |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `openapi`                        |➖  |➖  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |✨  |➖  |🆕  |
+| `stubby`                         |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |➖  |➖  |🆕  |
+| `postman`                        |➖  |➖  |➖  |🆕  |
+| `msw`                            |🆕  |
 
 **Legend:**
 
@@ -1190,6 +1193,192 @@ Validations from OpenAPI spec:
 | apiKey              | Api key of nuget source (If not specified, provide the CI_JOB_TOKEN)           | N        | -       |
 | generatorCustomArgs | Custom arguments of the generator (--global-property, --additional-properties) | N        | -       |
 
+#### `dotnet-system-text-json`
+
+An AOT-oriented C# **client library**. Unlike `dotnet` (which uses the
+`csharp-functions` generator and produces an Azure Functions app serialized with
+Newtonsoft.Json), this target uses the `csharp` generator's `generichost`
+library: an `HttpClient` + .NET Generic Host (dependency-injection) **host API**,
+serialized with **System.Text.Json source generation** (a `JsonSerializerContext`
+per model — no Newtonsoft, no reflection-based serialization).
+
+The generated project targets **.NET 10** and is marked
+`<IsAotCompatible>true</IsAotCompatible>`, so the trim/AOT analyzers run against
+consumers.
+
+```json
+{
+  "id": "dotnet-system-text-json",
+  "type": "dotnet-system-text-json",
+  "source": "source-merged",
+  "sourceUrl": "https://api.nuget.org/v3/index.json",
+  "apiKey": "apiKey",
+  "packageName": "packageName"
+}
+```
+
+| Parameter           | Description                                                                    | Required | Default |
+| ------------------- | ------------------------------------------------------------------------------ | -------- | ------- |
+| sourceUrl           | Url to where the package will be published                                     | Y        | -       |
+| apiKey              | Api key of nuget source                                                        | Y        | -       |
+| packageName         | Name of the generated package                                                  | Y        | -       |
+| generatorCustomArgs | Custom arguments of the generator (--global-property, --additional-properties) | N        | -       |
+
+> **AOT status — AOT-capable, not certified warning-clean.** Newtonsoft is gone
+> and every generated **model** has a source-generated `JsonSerializerContext`,
+> which is the core requirement for trimming/Native AOT. However, the upstream
+> `generichost` serialization is a deliberate **hybrid**: the JSON options
+> combine the source-gen model contexts with a reflection
+> `DefaultJsonTypeInfoResolver()` fallback (plus a reflection
+> `JsonStringEnumConverter`) to handle types the contexts don't cover —
+> `List<T>` responses, dictionaries, primitives, enums. Because of that fallback
+> the build emits `IL2026`/`IL3050` trim/AOT analyzer warnings.
+>
+> These warnings are inherent to the generator (unchanged through 7.17.0), not
+> something a template override fixes cleanly: removing the fallback would break
+> at runtime for any uncovered type, and routing calls so the analyzer goes
+> quiet would only hide that risk. So a consumer can use this package and its
+> source-gen model paths are AOT-safe, but a full Native-AOT publish is **not
+> guaranteed** for every spec shape. `<IsAotCompatible>true</IsAotCompatible>`
+> is set so consumers see those analyzer warnings rather than discovering the
+> gaps at runtime.
+
+#### `dotnet-webapi-system-text-json`
+
+A server-stub library (`aspnetcore` generator, `buildTarget=library`) serialized
+with **System.Text.Json**, targeting **.NET 10** and marked
+`<IsAotCompatible>true</IsAotCompatible>`. Operations are exposed as
+**minimal-API endpoints** (Native-AOT compatible) rather than MVC controllers.
+
+```json
+{
+  "id": "dotnet-webapi-system-text-json",
+  "type": "dotnet-webapi-system-text-json",
+  "source": "source-merged",
+  "sourceUrl": "https://api.nuget.org/v3/index.json",
+  "apiKey": "apiKey",
+  "packageName": "packageName"
+}
+```
+
+| Parameter                   | Description                                                                    | Required | Default |
+| --------------------------- | ------------------------------------------------------------------------------ | -------- | ------- |
+| sourceUrl                   | Url to where the package will be published                                     | Y        | -       |
+| packageName                 | Name of the generated package                                                  | Y        | -       |
+| apiKey                      | Api key of nuget source (If not specified, provide the CI_JOB_TOKEN)           | N        | -       |
+| withWolverineImplementation | Make the minimal-API endpoints invoke Wolverine directly (see below)           | N        | `false` |
+| generatorCustomArgs         | Custom arguments of the generator (--global-property, --additional-properties) | N        | -       |
+
+> **Minimal API + Native AOT.** A single `EndpointRouteBuilderExtensions.cs`
+> (generated once via a `files` SupportingFiles template) holds an `I{ApiName}`
+> interface per API, a `Map{ApiName}Endpoints()` per API, and an aggregate
+> `MapAll{PackageName}Endpoints()` that calls them all — mapping the operations as
+> minimal-API endpoints delegating to the DI-resolved implementation. The host
+> implements each `I{ApiName}` and calls `app.MapAll{PackageName}Endpoints()`; the
+> abstract MVC controllers are suppressed.
+>
+> The package builds AOT-clean: it sets `<EnableRequestDelegateGenerator>` so the
+> minimal-API `Map*()` calls are statically generated (no reflection-based request
+> delegates), each model emits a source-generated `JsonSerializerContext` used by
+> its `ToJson()` (no Newtonsoft, no reflection `JsonSerializer`), and there is no
+> reflection-based enum converter. Building the package under the AOT analyzer
+> (`<IsAotCompatible>`) raises no IL2026/IL3050 warnings.
+>
+> Enums (de)serialize by their wire value (e.g. `"available"`): each generated enum
+> carries `[JsonConverter(typeof(JsonStringEnumConverter<T>))]` with per-member
+> `[JsonStringEnumMemberName]`, which the source generator honours.
+>
+> **JSON registration.** The package generates a `{PackageName}JsonSerializerContext`
+> (a source-generated `JsonSerializerContext` over every model, request/response type
+> and inline enum) plus an `Add{PackageName}JsonOptions()` extension that registers it
+> on the minimal-API JSON resolver chain. Call it in Program.cs:
+>
+> ```csharp
+> builder.Services.Add{PackageName}JsonOptions();
+> ```
+>
+> This is **required when the host is published with Native AOT** (`PublishAot=true`),
+> because AOT removes the reflection JSON fallback and the endpoints must resolve every
+> DTO through source generation. For a reflection-based (JIT) host it is harmless (the
+> reflection resolver already covers everything), but registering it still gives faster,
+> allocation-free metadata, so calling it unconditionally is recommended.
+
+##### `withWolverineImplementation`
+
+When `true`, the generated minimal-API endpoints invoke [Wolverine](https://wolverinefx.net)
+**directly** instead of delegating to the `I{ApiName}` interfaces — there are no
+`I{ApiName}` interfaces in this mode. The single `EndpointRouteBuilderExtensions.cs`
+instead contains:
+
+- **A request wrapper per operation** — `public record AddPetRequest(Pet pet);`,
+  `public record GetPetByIdRequest(long petId);`, etc. Each bundles **all** of the
+  operation's parameters (path, query, header, body), so two operations never
+  collide on a shared request/response type and every parameter is carried
+  (including for file uploads).
+- **`Map{ApiName}Endpoints()`** (one per API), plus an aggregate
+  **`MapAll{PackageName}Endpoints()`** that calls them all — each endpoint invokes
+  the request through Wolverine and returns the result:
+  ```csharp
+  endpoints.MapPost("/api/v3/pet",
+      async ([FromBody] Pet pet, [FromServices] IMessageBus messageBus, CancellationToken ct) =>
+          Results.Ok(await messageBus.InvokeAsync<Pet>(new AddPetRequest(pet), ct)));
+  ```
+  Operations with no response body return `Results.NoContent()`; secured
+  operations get `.RequireAuthorization()`.
+- **`ConfigureWolverineMessaging(this WolverineOptions options, string localQueueName = "PackageName")`** —
+  one method that routes every request type in the assembly to a local queue (the
+  queue name is a parameter).
+
+The `WolverineFx` package reference is added automatically.
+
+**Host wiring** the consumer provides:
+
+```csharp
+builder.Host.UseWolverine(opts =>
+{
+    opts.ConfigureWolverineMessaging();            // or pass a custom queue name
+
+    // Static codegen (see below). Pre-generate with `dotnet run -- codegen write`.
+    opts.CodeGeneration.TypeLoadMode = JasperFx.CodeGeneration.TypeLoadMode.Static;
+});
+
+var app = builder.Build();
+app.MapAll{PackageName}Endpoints();                // aggregate; or call Map{ApiName}Endpoints() individually
+```
+
+The host also provides a **handler for each `*Request` type** (Wolverine discovers
+them by convention), e.g. `public Task<Pet> Handle(AddPetRequest request) { ... }`.
+
+**Static codegen.** Set `TypeLoadMode.Static` in the host (above) so Wolverine
+does **not** compile handler code at runtime, and pre-generate it as part of your
+build/deploy, e.g. `dotnet run -- codegen write` (or, to opt back into runtime
+compilation, drop that line and reference `WolverineFx.RuntimeCompilation`).
+
+**No retries / error handling.** Wolverine scopes retry rules per message type on
+the **handler**, not on the routing options, so `ConfigureWolverineMessaging`
+does not set a retry policy. Disable retries per handler where you want
+fail-fast, e.g.:
+
+```csharp
+public static class AddPetRequestHandler
+{
+    public static void Configure(HandlerChain chain) => chain.OnAnyException().Discard();
+    public Task<Pet> Handle(AddPetRequest request) { ... }
+}
+```
+
+With no retries, a handler exception propagates straight back through
+`InvokeAsync` into the endpoint, where you map it to an HTTP response host-side
+(`IExceptionHandler` + `AddProblemDetails()`).
+
+> **File uploads.** The wrapper carries every parameter, so a file operation's
+> path/query parameters reach the handler alongside the body (unlike sending the
+> body alone). The body itself is carried as a `System.IO.Stream`, which works
+> for the in-process local-queue routing used here (passed by reference). A
+> `Stream` is **not** serializable, so if you re-route these requests to a remote
+> transport (RabbitMQ, Azure Service Bus, …) the file body would not serialize —
+> buffer it to a `byte[]` in that case.
+
 #### `postman`
 
 ```json

package/bin/oasg

@@ -57,7 +57,9 @@ const DEFAULT_GENERATOR_MAPPING = {
   "python-fastapi":               { version: '7.8.0',   generator: 'python-fastapi' },
   "python-fastapi-raw-request":   { version: '7.0.1',   generator: 'python-fastapi' },
   "dotnet":                       { version: '7.11.0',  generator: 'csharp-functions' },
+  "dotnet-system-text-json":      { version: '7.11.0',  generator: 'csharp' },
   "dotnet-webapi":                { version: '7.11.0',  generator: 'aspnetcore' },
+  "dotnet-webapi-system-text-json": { version: '7.11.0', generator: 'aspnetcore' },
   // misc targets
   "contract-testing":             { version: '4.3.1',   generator: 'typescript-node' },
   "openapi":                      { version: undefined, generator: undefined },

package/config.schema.yml

@@ -34,7 +34,9 @@ properties:
         - $ref: '#/targets/Flutter'
         - $ref: '#/targets/Kmp'
         - $ref: '#/targets/Dotnet'
+        - $ref: '#/targets/DotnetSystemTextJson'
         - $ref: '#/targets/DotnetWebApi'
+        - $ref: '#/targets/DotnetWebApiSystemTextJson'
         - $ref: '#/targets/Postman'
         - $ref: '#/targets/TypeScriptAxios'
         - $ref: '#/targets/TypeScriptFetch'
@@ -456,6 +458,23 @@ targets:
           - apiKey
           - packageName
 
+  DotnetSystemTextJson:
+    allOf:
+      - $ref: '#/targets/Base'
+      - properties:
+          type:
+            pattern: '^dotnet-system-text-json$'
+          sourceUrl:
+            type: string
+          apiKey:
+            type: string
+          packageName:
+            type: string
+        required:
+          - sourceUrl
+          - apiKey
+          - packageName
+
   DotnetWebApi:
     allOf:
       - $ref: '#/targets/Base'
@@ -472,6 +491,24 @@ targets:
           - sourceUrl
           - packageName
 
+  DotnetWebApiSystemTextJson:
+    allOf:
+      - $ref: '#/targets/Base'
+      - properties:
+          type:
+            pattern: '^dotnet-webapi-system-text-json$'
+          sourceUrl:
+            type: string
+          apiKey:
+            type: string
+          packageName:
+            type: string
+          withWolverineImplementation:
+            type: boolean
+        required:
+          - sourceUrl
+          - packageName
+
   Kmp:
     allOf:
       - $ref: '#/targets/Base'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "18.0.2",
+  "version": "18.2.0",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/dotnet/generate.sh

@@ -1,15 +1,6 @@
 #!/bin/bash
 
 source $(dirname "$0")/../common.sh
+source $(dirname "$0")/../dotnet-common.sh
 
-rm -rf out/$targetId
-mkdir -p out/$targetId
-
-java -jar $binary generate \
-  -g $generatorId \
-  -i $openApiFile \
-  -t $templateDir \
-  -o out/$targetId \
-  -c $(dirname "$0")/generator-config.json \
-  -p "packageVersion=$version,packageName=$packageName" \
-  $generatorCustomArgs
+dotnet_generate

package/targets/dotnet/publish.sh

@@ -1,21 +1,6 @@
 #!/bin/bash
 
 source $(dirname "$0")/../common.sh
+source $(dirname "$0")/../dotnet-common.sh
 
-cd out/$targetId
-
-# install dotnet
-wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh
-chmod +x dotnet-install.sh
-./dotnet-install.sh --channel 6.0 --install-dir "$HOME/.dotnet"
-export PATH="$HOME/.dotnet:$PATH"
-
-# pack
-dotnet restore
-dotnet build -c Release
-dotnet pack -c Release -p:Version=$version -p:IsPackable=true
-
-# publish
-dotnet nuget push "src/**/bin/Release/*.nupkg" --source $sourceUrl -k ${apiKey:-$CI_JOB_TOKEN}
-
-cd ../..
+dotnet_publish

package/targets/dotnet/templates/Project.csproj.mustache

@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>{{packageDescription}}{{^packageDescription}}{{packageName}}{{/packageDescription}}</Description>
+    <Copyright>{{packageCopyright}}</Copyright>
+    <Authors>{{packageAuthors}}</Authors>
+    <TargetFramework>net10.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>{{packageVersion}}</Version>
+    <AzureFunctionsVersion>{{azureFunctionsVersion}}</AzureFunctionsVersion>
+{{#nullableReferenceTypes}}
+    <Nullable>annotations</Nullable>
+{{/nullableReferenceTypes}}
+{{#isLibrary}}
+    <OutputType>Library</OutputType>
+{{/isLibrary}}
+    <AssemblyName>{{packageName}}</AssemblyName>
+    <PackageId>{{packageName}}</PackageId>
+    <UserSecretsId>{{userSecretsGuid}}</UserSecretsId>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerfileContext>..\..</DockerfileContext>
+  </PropertyGroup>
+  <ItemGroup>
+      <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="4.0.1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.OpenApi.Core" Version="1.0.0" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="{{functionsSDKVersion}}" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.2.3" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.OpenApi" Version="0.7.2-preview" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="host.json">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="local.settings.json">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </None>
+  </ItemGroup>
+</Project>

package/targets/dotnet-common.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Shared build/publish logic for the .NET targets (dotnet, dotnet-webapi and
+# their -system-text-json variants). Each target's generate.sh / publish.sh is a
+# thin wrapper that sources ../common.sh (to populate the positional args) and
+# this file, then calls one of the functions below.
+#
+# These functions rely on the variables exported by common.sh (targetId, binary,
+# generatorId, openApiFile, version, templateDir, sourceUrl, apiKey, ...). They
+# use $0 — the calling wrapper script — to locate the target's own directory, so
+# generator-config.json resolves to the wrapper's target, not to this file.
+
+dotnet_generate() {
+  local targetDir
+  targetDir=$(dirname "$0")
+
+  rm -rf out/$targetId
+  mkdir -p out/$targetId
+
+  java -jar $binary generate \
+    -g $generatorId \
+    -i $openApiFile \
+    -t $templateDir \
+    -o out/$targetId \
+    -c "$targetDir/generator-config.json" \
+    -p "packageVersion=$version,packageName=$packageName" \
+    $generatorCustomArgs
+}
+
+dotnet_publish() {
+  cd out/$targetId
+
+  # install dotnet
+  wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh
+  chmod +x dotnet-install.sh
+  ./dotnet-install.sh --channel 10.0 --install-dir "$HOME/.dotnet"
+  export PATH="$HOME/.dotnet:$PATH"
+
+  # pack
+  dotnet restore
+  dotnet build -c Release
+  dotnet pack -c Release -p:Version=$version -p:IsPackable=true
+
+  # publish
+  dotnet nuget push "src/**/bin/Release/*.nupkg" --source $sourceUrl -k ${apiKey:-$CI_JOB_TOKEN}
+
+  cd ../..
+}

package/targets/dotnet-system-text-json/generate.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+source $(dirname "$0")/../common.sh
+source $(dirname "$0")/../dotnet-common.sh
+
+dotnet_generate

package/targets/dotnet-system-text-json/generator-config.json

@@ -0,0 +1,15 @@
+{
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
+  },
+  "additionalProperties": {
+    "library": "generichost",
+    "useSourceGeneration": true,
+    "targetFramework": "net9.0",
+    "nullableReferenceTypes": true,
+    "enumNameSuffix": "",
+    "enumValueSuffix": ""
+  }
+}

package/targets/dotnet-system-text-json/publish.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+source $(dirname "$0")/../common.sh
+source $(dirname "$0")/../dotnet-common.sh
+
+dotnet_publish

package/targets/dotnet-system-text-json/templates/netcore_project.mustache

@@ -0,0 +1,85 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>{{#useGenericHost}}
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo> <!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->{{/useGenericHost}}{{^useGenericHost}}
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo><!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->{{/useGenericHost}}
+    <TargetFramework>net10.0</TargetFramework>
+    <IsAotCompatible>true</IsAotCompatible>
+    <AssemblyName>{{packageName}}</AssemblyName>
+    <PackageId>{{packageName}}</PackageId>
+    <OutputType>Library</OutputType>
+    <Authors>{{packageAuthors}}</Authors>
+    <Company>{{packageCompany}}</Company>
+    <AssemblyTitle>{{packageTitle}}</AssemblyTitle>
+    <Description>{{packageDescription}}</Description>
+    <Copyright>{{packageCopyright}}</Copyright>
+    <RootNamespace>{{packageName}}</RootNamespace>
+    <Version>{{packageVersion}}</Version>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\{{packageName}}.xml</DocumentationFile>{{#licenseId}}
+    <PackageLicenseExpression>{{.}}</PackageLicenseExpression>{{/licenseId}}
+    <RepositoryUrl>https://{{{gitHost}}}/{{{gitUserId}}}/{{{gitRepoId}}}.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>{{#releaseNote}}
+    <PackageReleaseNotes>{{.}}</PackageReleaseNotes>{{/releaseNote}}{{#packageTags}}
+    <PackageTags>{{{.}}}</PackageTags>{{/packageTags}}{{#nrt}}
+    <Nullable>{{#useGenericHost}}enable{{/useGenericHost}}{{^useGenericHost}}annotations{{/useGenericHost}}</Nullable>{{/nrt}}
+    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+  <ItemGroup>
+    {{#useCompareNetObjects}}
+    <PackageReference Include="CompareNETObjects" Version="4.83.0" />
+    {{/useCompareNetObjects}}
+    {{^useGenericHost}}
+    <PackageReference Include="JsonSubTypes" Version="2.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    {{/useGenericHost}}
+    {{#useRestSharp}}
+    <PackageReference Include="RestSharp" Version="112.0.0" />
+    {{/useRestSharp}}
+    {{#useGenericHost}}
+    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
+    {{#supportsRetry}}
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.0" />
+    {{/supportsRetry}}
+    {{#net80OrLater}}
+    <PackageReference Include="Microsoft.Net.Http.Headers" Version="10.0.0" />
+    {{/net80OrLater}}
+    {{^net60OrLater}}
+    <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
+    {{#net47OrLater}}
+    <Reference Include="System.Web" />
+    {{/net47OrLater}}
+    {{/net60OrLater}}
+    {{/useGenericHost}}
+    {{^useGenericHost}}
+    {{#supportsRetry}}
+    <PackageReference Include="Polly" Version="{{^netStandard}}8.1.0{{/netStandard}}{{#netStandard}}8.1.0{{/netStandard}}" />
+    {{/supportsRetry}}
+    {{/useGenericHost}}
+    {{#validatable}}
+    {{^net60OrLater}}
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    {{/net60OrLater}}
+    {{/validatable}}
+  </ItemGroup>
+
+{{^useGenericHost}}
+  <ItemGroup>
+    {{^net60OrLater}}
+    <None Remove="System.Web" />
+    {{/net60OrLater}}
+    {{#net48}}
+    <None Remove="System.Net.Http" />
+    {{/net48}}
+  </ItemGroup>
+  <ItemGroup>
+    {{^net60OrLater}}
+    <Reference Include="System.Web" />
+    {{/net60OrLater}}
+    {{#net48}}
+    <Reference Include="System.Net.Http" />
+    {{/net48}}
+  </ItemGroup>
+{{/useGenericHost}}
+{{>netcore_project.additions}}</Project>

package/targets/dotnet-webapi/generate.sh

@@ -1,15 +1,6 @@
 #!/bin/bash
 
 source $(dirname "$0")/../common.sh
+source $(dirname "$0")/../dotnet-common.sh
 
-rm -rf out/$targetId
-mkdir -p out/$targetId
-
-java -jar $binary generate \
-  -g $generatorId \
-  -i $openApiFile \
-  -t $templateDir \
-  -o out/$targetId \
-  -c $(dirname "$0")/generator-config.json \
-  -p "packageVersion=$version,packageName=$packageName" \
-  $generatorCustomArgs
+dotnet_generate

package/targets/dotnet-webapi/publish.sh

@@ -1,21 +1,6 @@
 #!/bin/bash
 
 source $(dirname "$0")/../common.sh
+source $(dirname "$0")/../dotnet-common.sh
 
-cd out/$targetId
-
-# install dotnet
-wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh
-chmod +x dotnet-install.sh
-./dotnet-install.sh --channel 8.0 --install-dir "$HOME/.dotnet"
-export PATH="$HOME/.dotnet:$PATH"
-
-# pack
-dotnet restore
-dotnet build -c Release
-dotnet pack -c Release -p:Version=$version -p:IsPackable=true
-
-# publish
-dotnet nuget push "src/**/bin/Release/*.nupkg" --source $sourceUrl -k ${apiKey:-$CI_JOB_TOKEN}
-
-cd ../..
+dotnet_publish