Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
test-framework: [ net10.0 ]
test-framework: [ net10.0, net11.0 ]
steps:

- name: Checkout
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
test-framework: [ net10.0 ]
test-framework: [ net10.0, net11.0 ]
steps:

- name: Checkout
Expand Down
8 changes: 4 additions & 4 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion _atom/IBuild.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ internal interface IBuild : IWorkflowBuildDefinition,
static readonly string[] TestFrameworkNames =
[
WorkflowLabels.Dotnet.Framework.Net_10_0,
WorkflowLabels.Dotnet.Framework.Net_11_0,
];

IEnumerable<RootedPath> ICheckPrForBreakingChanges.BreakingChangeFilesToCheck =>
Expand All @@ -64,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 =>
Expand Down Expand Up @@ -108,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 =>
Expand Down
4 changes: 2 additions & 2 deletions _atom/_atom.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Invex.Atom.Module.GitHubWorkflows" Version="5.0.0" />
<PackageReference Include="Invex.Atom.Module.GitVersion" Version="5.0.0" />
<PackageReference Include="Invex.Atom.Module.GitHubWorkflows" Version="5.2.0" />
<PackageReference Include="Invex.Atom.Module.GitVersion" Version="5.2.0" />
<PackageReference Include="Invex.RepoUtils.Atom.Module" Version="3.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion docs/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net10.0;net11.0</TargetFrameworks>
<PackageDescription>Strongly-typed C# models for generating Azure DevOps Pipelines YAML</PackageDescription>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net10.0;net11.0</TargetFrameworks>
<PackageDescription>Strongly-typed C# models for generating GitHub Actions workflows and Dependabot configurations as YAML</PackageDescription>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Invex.StructuredText/Invex.StructuredText.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net10.0;net11.0</TargetFrameworks>
<PackageDescription>Core library for Structured Text: the StructuredTextWriter and the unified expression system used to generate structured YAML text files</PackageDescription>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<NoWarn>$(NoWarn);CS1591;</NoWarn>
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net10.0;net11.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<NoWarn>$(NoWarn);CS1591;</NoWarn>
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net10.0;net11.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<NoWarn>$(NoWarn);CS1591;</NoWarn>
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net10.0;net11.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Loading