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
37 changes: 36 additions & 1 deletion .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: SetupBuildInfo
id: SetupBuildInfo
run: dotnet run --project _atom/_atom.csproj -- SetupBuildInfo --skip --headless
Expand All @@ -48,6 +53,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: PackProjects
id: PackProjects
run: dotnet run --project _atom/_atom.csproj -- PackProjects --skip --headless
Expand All @@ -62,7 +72,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
test-framework: [ net10.0 ]
test-framework: [ net10.0, net11.0 ]
steps:

- name: Checkout
Expand All @@ -75,6 +85,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: TestProjects
id: TestProjects
run: dotnet run --project _atom/_atom.csproj -- TestProjects --skip --headless
Expand Down Expand Up @@ -103,6 +118,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: Retrieve Invex.Process
uses: actions/download-artifact@v8
with:
Expand Down Expand Up @@ -134,6 +154,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: Retrieve Invex.Process
uses: actions/download-artifact@v8
with:
Expand Down Expand Up @@ -162,6 +187,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: BuildDocs
id: BuildDocs
run: dotnet run --project _atom/_atom.csproj -- BuildDocs --skip --headless
Expand Down Expand Up @@ -190,6 +220,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: Retrieve GeneratedDocs
uses: actions/download-artifact@v8
with:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/Cleanup Prereleases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: UnlistOldPrereleases
id: UnlistOldPrereleases
run: dotnet run --project _atom/_atom.csproj -- UnlistOldPrereleases --skip --headless
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/Dependabot Enable auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: ApproveDependabotPr
id: ApproveDependabotPr
run: dotnet run --project _atom/_atom.csproj -- ApproveDependabotPr --skip --headless
Expand Down
27 changes: 26 additions & 1 deletion .github/workflows/Validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: SetupBuildInfo
id: SetupBuildInfo
run: dotnet run --project _atom/_atom.csproj -- SetupBuildInfo --skip --headless
Expand All @@ -46,6 +51,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: PackProjects
id: PackProjects
run: dotnet run --project _atom/_atom.csproj -- PackProjects --skip --headless
Expand All @@ -54,7 +64,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
test-framework: [ net10.0 ]
test-framework: [ net10.0, net11.0 ]
steps:

- name: Checkout
Expand All @@ -67,6 +77,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: TestProjects
id: TestProjects
run: dotnet run --project _atom/_atom.csproj -- TestProjects --skip --headless
Expand Down Expand Up @@ -95,6 +110,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: CheckPrForBreakingChanges
id: CheckPrForBreakingChanges
run: dotnet run --project _atom/_atom.csproj -- CheckPrForBreakingChanges --skip --headless
Expand All @@ -117,6 +137,11 @@ jobs:
with:
dotnet-version: 10.0.x

- name: Setup .NET 11.0.x
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.x

- name: WaitForCopilotReview
id: WaitForCopilotReview
run: dotnet run --project _atom/_atom.csproj -- WaitForCopilotReview --skip --headless
Expand Down
5 changes: 3 additions & 2 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ and `toc.yml`.

## Build & language specifics

- **.NET 10 SDK** is required. Library and test projects target `net10.0`.
- C# `LangVersion` 14, `ImplicitUsings` and `Nullable` enabled, `TreatWarningsAsErrors` on.
- **.NET 11 SDK** is required, plus the .NET 10 runtime (or SDK) to run the `net10.0` tests and build project. Library and test projects target `net10.0` and `net11.0`;
`ProcessRunner` uses the .NET 11 `Process.ReadAllLines` APIs under `#if NET11_0_OR_GREATER`.
- 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 and `CS1591` is **enforced** in `src/` — every public type
and member needs XML doc comments. (`_atom` and the test project suppress `CS1591` locally; do
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<EnablePackageValidation>true</EnablePackageValidation>
<PublishRepositoryUrl>true</PublishRepositoryUrl>

<LangVersion>14</LangVersion>
<LangVersion>15</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ full output capture, and fail-fast error handling. It wraps `System.Diagnostics.
dotnet add package Invex.Process
```

The package targets `net10.0`. It depends on
The package targets `net10.0` and `net11.0`. It depends on
`Microsoft.Extensions.DependencyInjection.Abstractions` and `Microsoft.Extensions.Hosting.Abstractions`, and logs
through `ILogger`, so configure logging on your host (it is by default with `Host.CreateApplicationBuilder`).

Expand Down
3 changes: 3 additions & 0 deletions _atom/IBuild.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ internal interface IBuild : IWorkflowBuildDefinition,
static readonly string[] TestFrameworkNames =
[
WorkflowLabels.Dotnet.Framework.Net_10_0,
"net11.0",
];

IEnumerable<RootedPath> ICheckPrForBreakingChanges.BreakingChangeFilesToCheck =>
Expand All @@ -53,6 +54,8 @@ internal interface IBuild : IWorkflowBuildDefinition,
BuildOptions.GitVersion.ProvideBuildId,
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"),
];

Target PackProjects =>
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if you are adding `Invex.Process` to a host, tool or build for the first time.
dotnet add package Invex.Process
```

The package targets `net10.0`.
The package targets `net10.0` and `net11.0`. On .NET 11 it reads output with the new `Process.ReadAllLines` APIs, so stdout and stderr lines are logged as one stream in the order they become available (stderr first when both are ready, so not always the order the process wrote them), and a process killed by a signal is reported by signal name.

## Register the service

Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "10.0.403",
"rollForward": "latestMajor",
"version": "11.0.100",
"rollForward": "latestMinor",
"allowPrerelease": false
}
}
2 changes: 1 addition & 1 deletion src/Invex.Process/Invex.Process.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>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading
Loading