From 8752f34ebc9deca634738884789515beb1f9f9c8 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 11 Nov 2026 01:52:41 +0000 Subject: [PATCH 1/4] feat: add a net11.0 target The three Invex.StructuredText packages, their test projects and the samples project now target net10.0;net11.0. The Validate and Build workflows run the test matrix on both frameworks, and the docs list both target frameworks. The netstandard2.0 source generator is unchanged. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01WVjNn9JyaJVwymS3qRBSz1 --- .github/workflows/Build.yml | 2 +- .github/workflows/Validate.yml | 2 +- AGENTS.md | 8 ++++---- README.md | 4 ++-- _atom/IBuild.cs | 1 + docs/architecture.md | 2 +- docs/faq.md | 2 +- docs/getting-started.md | 2 +- .../Invex.StructuredText.Samples.csproj | 2 +- .../Invex.StructuredText.AzureDevopsPipelines.csproj | 2 +- .../Invex.StructuredText.GithubActions.csproj | 2 +- src/Invex.StructuredText/Invex.StructuredText.csproj | 2 +- ...Invex.StructuredText.AzureDevopsPipelines.Tests.csproj | 2 +- .../Invex.StructuredText.GithubActions.Tests.csproj | 2 +- .../Invex.StructuredText.Tests.csproj | 2 +- 15 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 8db2c22..18b3d2f 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -84,7 +84,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - test-framework: [ net10.0 ] + test-framework: [ net10.0, net11.0 ] steps: - name: Checkout diff --git a/.github/workflows/Validate.yml b/.github/workflows/Validate.yml index 61e4181..ffa9f27 100644 --- a/.github/workflows/Validate.yml +++ b/.github/workflows/Validate.yml @@ -64,7 +64,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - test-framework: [ net10.0 ] + test-framework: [ net10.0, net11.0 ] steps: - name: Checkout diff --git a/AGENTS.md b/AGENTS.md index 1b16036..25d3564 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -8,16 +8,16 @@ Pipelines. Keep changes focused and defer to the linked docs for detail. | Project | Role | Target frameworks | |---------|------|-------------------| -| `Invex.StructuredText` | Core library: `StructuredTextWriter`, the typed expression API (`Tex`, `Expr`, `Template`) and `ExpressionPrinter` | `net10.0` | -| `Invex.StructuredText.GithubActions` | GitHub Actions workflow and Dependabot config generation | `net10.0` | -| `Invex.StructuredText.AzureDevopsPipelines` | Azure DevOps Pipelines YAML generation | `net10.0` | +| `Invex.StructuredText` | Core library: `StructuredTextWriter`, the typed expression API (`Tex`, `Expr`, `Template`) and `ExpressionPrinter` | `net10.0`, `net11.0` | +| `Invex.StructuredText.GithubActions` | GitHub Actions workflow and Dependabot config generation | `net10.0`, `net11.0` | +| `Invex.StructuredText.AzureDevopsPipelines` | Azure DevOps Pipelines YAML generation | `net10.0`, `net11.0` | Sources live under `src/`, tests under `tests/`, the Atom build definition under `_atom/`, and the DocFX documentation site under `docs/`. ## Build & language specifics -- **.NET 11 SDK** is required, plus the .NET 10 runtime (or SDK): all library and test projects target `net10.0`. +- **.NET 11 SDK** is required, plus the .NET 10 runtime (or SDK): all library and test projects target `net10.0` and `net11.0`. - C# `LangVersion 15`, `ImplicitUsings` and `Nullable` enabled, `TreatWarningsAsErrors` on. - Global usings live in each project's `_usings.cs` — add shared usings there, not per-file. - `GenerateDocumentationFile` is on, so **all public members need XML doc comments**. diff --git a/README.md b/README.md index 5555482..88a91bd 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ dotnet add package Invex.StructuredText.AzureDevopsPipelines ``` Both platform packages depend on `Invex.StructuredText` core, so it will be installed automatically. All three packages -target `net10.0`. The platform packages also depend on the +target `net10.0` and `net11.0`. The platform packages also depend on the [Dunet](https://github.com/domn1995/dunet) source generator, which provides their discriminated-union model types. ## Quick start @@ -183,7 +183,7 @@ Full documentation: [https://invex-games.github.io/structured-text/](https://inv ## Development -The repository requires the .NET 11 SDK selected by `global.json`, plus the .NET 10 runtime (or SDK) for the `net10.0` projects: +The repository requires the .NET 11 SDK selected by `global.json`, plus the .NET 10 runtime (or SDK) for the `net10.0` builds: ```shell dotnet build Invex.StructuredText.slnx diff --git a/_atom/IBuild.cs b/_atom/IBuild.cs index 81f4c04..85b30bb 100644 --- a/_atom/IBuild.cs +++ b/_atom/IBuild.cs @@ -50,6 +50,7 @@ internal interface IBuild : IWorkflowBuildDefinition, static readonly string[] TestFrameworkNames = [ WorkflowLabels.Dotnet.Framework.Net_10_0, + "net11.0", ]; IEnumerable ICheckPrForBreakingChanges.BreakingChangeFilesToCheck => diff --git a/docs/architecture.md b/docs/architecture.md index 9eab12d..ffa8dd5 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -132,7 +132,7 @@ The libraries use: - `[PublicAPI]` annotations (JetBrains.Annotations) on all public surface - Public API surface snapshot tests (`PublicApiSurfaceTests` with verified `.txt` baselines in each test project), so any accidental API change shows up as a test diff -- Targets .NET 10 +- Targets .NET 10 and .NET 11 ## Extending the library diff --git a/docs/faq.md b/docs/faq.md index 8f203df..bebc8d2 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -21,7 +21,7 @@ No. It only produces the configuration files. GitHub/Azure DevOps execute them a ### Which platforms and frameworks are supported? -.NET 10.0. Generators are typically run as small console apps on any OS. +.NET 10.0 and .NET 11.0. Generators are typically run as small console apps on any OS. ## Usage diff --git a/docs/getting-started.md b/docs/getting-started.md index 9d2b27a..33e255b 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -5,7 +5,7 @@ and Dependabot config. Start here if you have not used the library before. ## Requirements -- .NET 10.0 +- .NET 10.0 or .NET 11.0 ## Installation diff --git a/samples/Invex.StructuredText.Samples/Invex.StructuredText.Samples.csproj b/samples/Invex.StructuredText.Samples/Invex.StructuredText.Samples.csproj index c65527c..1f6baf0 100644 --- a/samples/Invex.StructuredText.Samples/Invex.StructuredText.Samples.csproj +++ b/samples/Invex.StructuredText.Samples/Invex.StructuredText.Samples.csproj @@ -2,7 +2,7 @@ Exe - net10.0 + net10.0;net11.0 false $(NoWarn);CS1591 diff --git a/src/Invex.StructuredText.AzureDevopsPipelines/Invex.StructuredText.AzureDevopsPipelines.csproj b/src/Invex.StructuredText.AzureDevopsPipelines/Invex.StructuredText.AzureDevopsPipelines.csproj index 7df7030..28ce780 100644 --- a/src/Invex.StructuredText.AzureDevopsPipelines/Invex.StructuredText.AzureDevopsPipelines.csproj +++ b/src/Invex.StructuredText.AzureDevopsPipelines/Invex.StructuredText.AzureDevopsPipelines.csproj @@ -1,7 +1,7 @@  - net10.0 + net10.0;net11.0 Strongly-typed C# models for generating Azure DevOps Pipelines YAML diff --git a/src/Invex.StructuredText.GithubActions/Invex.StructuredText.GithubActions.csproj b/src/Invex.StructuredText.GithubActions/Invex.StructuredText.GithubActions.csproj index d015535..e10277f 100644 --- a/src/Invex.StructuredText.GithubActions/Invex.StructuredText.GithubActions.csproj +++ b/src/Invex.StructuredText.GithubActions/Invex.StructuredText.GithubActions.csproj @@ -1,7 +1,7 @@  - net10.0 + net10.0;net11.0 Strongly-typed C# models for generating GitHub Actions workflows and Dependabot configurations as YAML diff --git a/src/Invex.StructuredText/Invex.StructuredText.csproj b/src/Invex.StructuredText/Invex.StructuredText.csproj index 5f6d7b0..53bcd6f 100644 --- a/src/Invex.StructuredText/Invex.StructuredText.csproj +++ b/src/Invex.StructuredText/Invex.StructuredText.csproj @@ -1,7 +1,7 @@  - net10.0 + net10.0;net11.0 Core library for Structured Text: the StructuredTextWriter and the unified expression system used to generate structured YAML text files diff --git a/tests/Invex.StructuredText.AzureDevopsPipelines.Tests/Invex.StructuredText.AzureDevopsPipelines.Tests.csproj b/tests/Invex.StructuredText.AzureDevopsPipelines.Tests/Invex.StructuredText.AzureDevopsPipelines.Tests.csproj index f235f11..99df47d 100644 --- a/tests/Invex.StructuredText.AzureDevopsPipelines.Tests/Invex.StructuredText.AzureDevopsPipelines.Tests.csproj +++ b/tests/Invex.StructuredText.AzureDevopsPipelines.Tests/Invex.StructuredText.AzureDevopsPipelines.Tests.csproj @@ -2,7 +2,7 @@ $(NoWarn);CS1591; - net10.0 + net10.0;net11.0 false diff --git a/tests/Invex.StructuredText.GithubActions.Tests/Invex.StructuredText.GithubActions.Tests.csproj b/tests/Invex.StructuredText.GithubActions.Tests/Invex.StructuredText.GithubActions.Tests.csproj index cac3082..d5b2269 100644 --- a/tests/Invex.StructuredText.GithubActions.Tests/Invex.StructuredText.GithubActions.Tests.csproj +++ b/tests/Invex.StructuredText.GithubActions.Tests/Invex.StructuredText.GithubActions.Tests.csproj @@ -2,7 +2,7 @@ $(NoWarn);CS1591; - net10.0 + net10.0;net11.0 false diff --git a/tests/Invex.StructuredText.Tests/Invex.StructuredText.Tests.csproj b/tests/Invex.StructuredText.Tests/Invex.StructuredText.Tests.csproj index 2df8a52..315132f 100644 --- a/tests/Invex.StructuredText.Tests/Invex.StructuredText.Tests.csproj +++ b/tests/Invex.StructuredText.Tests/Invex.StructuredText.Tests.csproj @@ -2,7 +2,7 @@ $(NoWarn);CS1591; - net10.0 + net10.0;net11.0 false From b5148db5e89e8f67eeff9e9b2a33ecb7ecdeb3c9 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 11 Nov 2026 01:53:51 +0000 Subject: [PATCH 2/4] fix: push the packages for the version SetupBuildInfo computed PushToNuget now consumes SetupBuildInfo's BuildVersion as well as its BuildId. PushProject picks packages by BuildVersion, and a release run's detached tag checkout can recompute a different one. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01WVjNn9JyaJVwymS3qRBSz1 --- .github/workflows/Build.yml | 1 + _atom/IBuild.cs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 18b3d2f..7e8408f 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -170,6 +170,7 @@ jobs: run: dotnet run --project _atom/_atom.csproj -- PushToNuget --skip --headless env: build-id: ${{ needs.SetupBuildInfo.outputs.build-id }} + build-version: ${{ needs.SetupBuildInfo.outputs.build-version }} nuget-push-api-key: ${{ secrets.NUGET_PUSH_API_KEY }} PushToRelease: diff --git a/_atom/IBuild.cs b/_atom/IBuild.cs index 85b30bb..de51d41 100644 --- a/_atom/IBuild.cs +++ b/_atom/IBuild.cs @@ -109,6 +109,9 @@ internal interface IBuild : IWorkflowBuildDefinition, .RequiresParam(nameof(NugetFeed)) .RequiresParam(nameof(NugetApiKey)) .ConsumesVariable(nameof(SetupBuildInfo), nameof(BuildId)) + // PushProject picks packages by BuildVersion, and a release run's detached tag checkout can recompute a + // different one, so take the version SetupBuildInfo computed. + .ConsumesVariable(nameof(SetupBuildInfo), nameof(BuildVersion)) .ConsumesArtifacts(nameof(PackProjects), ProjectsToPack) .DependsOn(nameof(TestProjects)) .Executes(async cancellationToken => From de9dcecdc1fe41b020e57f90ee00104c2beaf4d8 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 11 Nov 2026 01:58:00 +0000 Subject: [PATCH 3/4] fix: keep the samples app on net10.0 so dotnet run needs no --framework Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01WVjNn9JyaJVwymS3qRBSz1 --- .../Invex.StructuredText.Samples.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/Invex.StructuredText.Samples/Invex.StructuredText.Samples.csproj b/samples/Invex.StructuredText.Samples/Invex.StructuredText.Samples.csproj index 1f6baf0..c65527c 100644 --- a/samples/Invex.StructuredText.Samples/Invex.StructuredText.Samples.csproj +++ b/samples/Invex.StructuredText.Samples/Invex.StructuredText.Samples.csproj @@ -2,7 +2,7 @@ Exe - net10.0;net11.0 + net10.0 false $(NoWarn);CS1591 From 3df1bd36f81ad0fb99d45492e68fb053faae3a12 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 11 Nov 2026 05:21:35 +0000 Subject: [PATCH 4/4] chore: move to Atom 5.2.0 Uses Atom's Dotnet110X step and Net_11_0 framework label in place of the interim literals. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01WVjNn9JyaJVwymS3qRBSz1 --- _atom/IBuild.cs | 4 ++-- _atom/_atom.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_atom/IBuild.cs b/_atom/IBuild.cs index de51d41..cef1a96 100644 --- a/_atom/IBuild.cs +++ b/_atom/IBuild.cs @@ -50,7 +50,7 @@ internal interface IBuild : IWorkflowBuildDefinition, static readonly string[] TestFrameworkNames = [ WorkflowLabels.Dotnet.Framework.Net_10_0, - "net11.0", + WorkflowLabels.Dotnet.Framework.Net_11_0, ]; IEnumerable ICheckPrForBreakingChanges.BreakingChangeFilesToCheck => @@ -65,7 +65,7 @@ internal interface IBuild : IWorkflowBuildDefinition, BuildOptions.GitVersion.ProvideBuildVersion, BuildOptions.Steps.SetupDotnet.Dotnet100X(), // .NET 11 SDK. The .NET 10 step above still provides the runtime for net10.0 tests. - new SetupDotnetStep("11.0.x"), + BuildOptions.Steps.SetupDotnet.Dotnet110X(), ]; Target PackProjects => diff --git a/_atom/_atom.csproj b/_atom/_atom.csproj index caab2e1..0964608 100644 --- a/_atom/_atom.csproj +++ b/_atom/_atom.csproj @@ -7,8 +7,8 @@ - - + +