From 6d2f81ccaca238b023c7da58a199733722eb49f4 Mon Sep 17 00:00:00 2001 From: Nick Cipollina Date: Thu, 16 Apr 2026 17:04:34 -0400 Subject: [PATCH 1/2] feat(build): add .NET 11 target support --- .github/workflows/main-build.yaml | 1 + .github/workflows/pr-build.yaml | 2 +- .github/workflows/publish-to-nuget.yaml | 2 +- Directory.Packages.props | 130 ++++++++++-------- global.json | 8 +- .../MinimalLambda.Abstractions.csproj | 2 +- .../MinimalLambda.OpenTelemetry.csproj | 2 +- .../MinimalLambda.Testing.csproj | 2 +- src/MinimalLambda/MinimalLambda.csproj | 2 +- .../MinimalLambda.Envelopes.UnitTests.csproj | 2 +- ...nimalLambda.OpenTelemetry.UnitTests.csproj | 2 +- .../GeneratorTestHelpers.cs | 4 +- ...alLambda.SourceGenerators.UnitTests.csproj | 3 +- .../MinimalLambda.Testing.UnitTests.csproj | 2 +- .../MinimalLambda.UnitTests.csproj | 2 +- 15 files changed, 89 insertions(+), 77 deletions(-) diff --git a/.github/workflows/main-build.yaml b/.github/workflows/main-build.yaml index 1f7e8876..e54dac1c 100644 --- a/.github/workflows/main-build.yaml +++ b/.github/workflows/main-build.yaml @@ -39,6 +39,7 @@ jobs: 8.0.x 9.0.x 10.0.x + 11.0.x - name: Restore dependencies run: dotnet restore diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 29551c9a..af6b27a4 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -39,7 +39,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: 10.0.x + dotnet-version: 11.0.x - name: Restore dependencies run: dotnet restore diff --git a/.github/workflows/publish-to-nuget.yaml b/.github/workflows/publish-to-nuget.yaml index d8c8812f..eb84134f 100644 --- a/.github/workflows/publish-to-nuget.yaml +++ b/.github/workflows/publish-to-nuget.yaml @@ -18,7 +18,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: 10.0.x + dotnet-version: 11.0.x - name: Restore dependencies run: dotnet restore diff --git a/Directory.Packages.props b/Directory.Packages.props index 399dc0cf..50f276fb 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,79 +5,87 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + - + - - + + + - - + + + - - + + + + + + + + \ No newline at end of file diff --git a/global.json b/global.json index 00b7a33e..ebac2f31 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { - "sdk": { - "rollForward": "latestMinor", - "version": "10.0.201" - }, +// "sdk": { +// "rollForward": "latestMinor", +// "version": "10.0.201" +// }, "test": { "runner": "Microsoft.Testing.Platform" } diff --git a/src/MinimalLambda.Abstractions/MinimalLambda.Abstractions.csproj b/src/MinimalLambda.Abstractions/MinimalLambda.Abstractions.csproj index 81a3c06f..51a029bc 100644 --- a/src/MinimalLambda.Abstractions/MinimalLambda.Abstractions.csproj +++ b/src/MinimalLambda.Abstractions/MinimalLambda.Abstractions.csproj @@ -1,6 +1,6 @@  - net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0;net11.0 preview enable enable diff --git a/src/MinimalLambda.OpenTelemetry/MinimalLambda.OpenTelemetry.csproj b/src/MinimalLambda.OpenTelemetry/MinimalLambda.OpenTelemetry.csproj index a59718c0..abc54a8f 100644 --- a/src/MinimalLambda.OpenTelemetry/MinimalLambda.OpenTelemetry.csproj +++ b/src/MinimalLambda.OpenTelemetry/MinimalLambda.OpenTelemetry.csproj @@ -1,6 +1,6 @@  - net9.0;net10.0 + net9.0;net10.0;net11.0 preview enable enable diff --git a/src/MinimalLambda.Testing/MinimalLambda.Testing.csproj b/src/MinimalLambda.Testing/MinimalLambda.Testing.csproj index 609e41bc..38392c94 100644 --- a/src/MinimalLambda.Testing/MinimalLambda.Testing.csproj +++ b/src/MinimalLambda.Testing/MinimalLambda.Testing.csproj @@ -1,6 +1,6 @@  - net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0;net11.0 preview enable enable diff --git a/src/MinimalLambda/MinimalLambda.csproj b/src/MinimalLambda/MinimalLambda.csproj index d6c06768..5324aec0 100644 --- a/src/MinimalLambda/MinimalLambda.csproj +++ b/src/MinimalLambda/MinimalLambda.csproj @@ -1,6 +1,6 @@  - net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0;net11.0 preview enable enable diff --git a/tests/MinimalLambda.Envelopes.UnitTests/MinimalLambda.Envelopes.UnitTests.csproj b/tests/MinimalLambda.Envelopes.UnitTests/MinimalLambda.Envelopes.UnitTests.csproj index 40df20d5..049357a6 100644 --- a/tests/MinimalLambda.Envelopes.UnitTests/MinimalLambda.Envelopes.UnitTests.csproj +++ b/tests/MinimalLambda.Envelopes.UnitTests/MinimalLambda.Envelopes.UnitTests.csproj @@ -1,6 +1,6 @@ - net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0;net11.0 preview enable enable diff --git a/tests/MinimalLambda.OpenTelemetry.UnitTests/MinimalLambda.OpenTelemetry.UnitTests.csproj b/tests/MinimalLambda.OpenTelemetry.UnitTests/MinimalLambda.OpenTelemetry.UnitTests.csproj index cd0d270f..158f6335 100644 --- a/tests/MinimalLambda.OpenTelemetry.UnitTests/MinimalLambda.OpenTelemetry.UnitTests.csproj +++ b/tests/MinimalLambda.OpenTelemetry.UnitTests/MinimalLambda.OpenTelemetry.UnitTests.csproj @@ -1,6 +1,6 @@ - net9.0;net10.0 + net9.0;net10.0;net11.0 preview enable enable diff --git a/tests/MinimalLambda.SourceGenerators.UnitTests/GeneratorTestHelpers.cs b/tests/MinimalLambda.SourceGenerators.UnitTests/GeneratorTestHelpers.cs index 805b4d2b..547abc4a 100644 --- a/tests/MinimalLambda.SourceGenerators.UnitTests/GeneratorTestHelpers.cs +++ b/tests/MinimalLambda.SourceGenerators.UnitTests/GeneratorTestHelpers.cs @@ -102,7 +102,9 @@ internal static (GeneratorDriver driver, Compilation compilation) GenerateFromSo List references = [ -#if NET10_0_OR_GREATER +#if NET11_0_OR_GREATER + .. Net110.References.All.ToList(), +#elif NET10_0 .. Net100.References.All.ToList(), #elif NET9_0 .. Net90.References.All.ToList(), diff --git a/tests/MinimalLambda.SourceGenerators.UnitTests/MinimalLambda.SourceGenerators.UnitTests.csproj b/tests/MinimalLambda.SourceGenerators.UnitTests/MinimalLambda.SourceGenerators.UnitTests.csproj index 6341b943..059260ce 100644 --- a/tests/MinimalLambda.SourceGenerators.UnitTests/MinimalLambda.SourceGenerators.UnitTests.csproj +++ b/tests/MinimalLambda.SourceGenerators.UnitTests/MinimalLambda.SourceGenerators.UnitTests.csproj @@ -1,6 +1,6 @@ - net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0;net11.0 latest enable enable @@ -15,6 +15,7 @@ + diff --git a/tests/MinimalLambda.Testing.UnitTests/Tests/MinimalLambda.Testing.UnitTests/MinimalLambda.Testing.UnitTests.csproj b/tests/MinimalLambda.Testing.UnitTests/Tests/MinimalLambda.Testing.UnitTests/MinimalLambda.Testing.UnitTests.csproj index f6d68f16..b7c80426 100644 --- a/tests/MinimalLambda.Testing.UnitTests/Tests/MinimalLambda.Testing.UnitTests/MinimalLambda.Testing.UnitTests.csproj +++ b/tests/MinimalLambda.Testing.UnitTests/Tests/MinimalLambda.Testing.UnitTests/MinimalLambda.Testing.UnitTests.csproj @@ -1,6 +1,6 @@ - net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0;net11.0 enable enable false diff --git a/tests/MinimalLambda.UnitTests/MinimalLambda.UnitTests.csproj b/tests/MinimalLambda.UnitTests/MinimalLambda.UnitTests.csproj index d37e7f9c..417ce6bc 100644 --- a/tests/MinimalLambda.UnitTests/MinimalLambda.UnitTests.csproj +++ b/tests/MinimalLambda.UnitTests/MinimalLambda.UnitTests.csproj @@ -1,6 +1,6 @@ - net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0;net11.0 enable enable false From e8fb213ea9547142010b30c31a0cef1686357d70 Mon Sep 17 00:00:00 2001 From: Nick Cipollina Date: Thu, 16 Apr 2026 17:13:06 -0400 Subject: [PATCH 2/2] chore(build): pin .NET 11 preview SDK --- global.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index ebac2f31..625d93d8 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { -// "sdk": { -// "rollForward": "latestMinor", -// "version": "10.0.201" -// }, + "sdk": { + "rollForward": "latestMinor", + "version": "11.0.100-preview.3.26207.106" + }, "test": { "runner": "Microsoft.Testing.Platform" }