From 66d3ea04050ed9366369146773aef825d74f8427 Mon Sep 17 00:00:00 2001 From: Arkadiusz Biel - bielu <2244074+bielu@users.noreply.github.com> Date: Sat, 17 Oct 2026 18:42:34 +0100 Subject: [PATCH 1/2] build: migrate to slnx and central package management - Replace AsyncAPI.sln with AsyncAPI.slnx (generated via `dotnet sln migrate`). - Add Directory.Packages.props and drop Version attributes from all src/test PackageReferences; versions are unchanged. - Opt the example projects out of CPM, since they float on published prerelease packages. - Point CI restore explicitly at AsyncAPI.slnx. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci.yml | 2 +- AsyncAPI.sln | 49 ------------------- AsyncAPI.slnx | 11 +++++ Directory.Packages.props | 26 ++++++++++ ...teBard.AsyncAPI.Readers.JsonExample.csproj | 2 + ...teBard.AsyncAPI.Readers.YamlExample.csproj | 2 + .../ByteBard.AsyncAPI.Writers.Example.csproj | 2 + .../ByteBard.AsyncAPI.Bindings.csproj | 4 +- .../ByteBard.AsyncAPI.Readers.csproj | 10 ++-- .../ByteBard.AsyncAPI.csproj | 6 +-- .../ByteBard.AsyncAPI.Tests.csproj | 16 +++--- 11 files changed, 62 insertions(+), 68 deletions(-) delete mode 100644 AsyncAPI.sln create mode 100644 AsyncAPI.slnx create mode 100644 Directory.Packages.props diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5757f776..958f4783 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: 9.0.x 10.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore AsyncAPI.slnx - name: Build run: dotnet build --no-restore - name: Test diff --git a/AsyncAPI.sln b/AsyncAPI.sln deleted file mode 100644 index cd136a1d..00000000 --- a/AsyncAPI.sln +++ /dev/null @@ -1,49 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ByteBard.AsyncAPI.Tests", "test\ByteBard.AsyncAPI.Tests\ByteBard.AsyncAPI.Tests.csproj", "{32C4357C-F664-4C6C-B87B-AEF1759EC060}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ByteBard.AsyncAPI", "src\ByteBard.AsyncAPI\ByteBard.AsyncAPI.csproj", "{D4559946-300D-4C6F-B92B-4376414D19C9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ByteBard.AsyncAPI.Readers", "src\ByteBard.AsyncAPI.Readers\ByteBard.AsyncAPI.Readers.csproj", "{7D9C6FBA-4B6F-48A0-B3F5-E7357021F8F9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DE167614-5BCB-4046-BD4C-ABB70E9F3462}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - Common.Build.props = Common.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ByteBard.AsyncAPI.Bindings", "src\ByteBard.AsyncAPI.Bindings\ByteBard.AsyncAPI.Bindings.csproj", "{33CA31F4-ECFE-4227-BFE9-F49783DD29A0}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {32C4357C-F664-4C6C-B87B-AEF1759EC060}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32C4357C-F664-4C6C-B87B-AEF1759EC060}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32C4357C-F664-4C6C-B87B-AEF1759EC060}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32C4357C-F664-4C6C-B87B-AEF1759EC060}.Release|Any CPU.Build.0 = Release|Any CPU - {D4559946-300D-4C6F-B92B-4376414D19C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4559946-300D-4C6F-B92B-4376414D19C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4559946-300D-4C6F-B92B-4376414D19C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4559946-300D-4C6F-B92B-4376414D19C9}.Release|Any CPU.Build.0 = Release|Any CPU - {7D9C6FBA-4B6F-48A0-B3F5-E7357021F8F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D9C6FBA-4B6F-48A0-B3F5-E7357021F8F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D9C6FBA-4B6F-48A0-B3F5-E7357021F8F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D9C6FBA-4B6F-48A0-B3F5-E7357021F8F9}.Release|Any CPU.Build.0 = Release|Any CPU - {33CA31F4-ECFE-4227-BFE9-F49783DD29A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33CA31F4-ECFE-4227-BFE9-F49783DD29A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33CA31F4-ECFE-4227-BFE9-F49783DD29A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33CA31F4-ECFE-4227-BFE9-F49783DD29A0}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {080A9C36-2D7A-4B2C-BEE0-F7BC4EF3DBD9} - EndGlobalSection -EndGlobal diff --git a/AsyncAPI.slnx b/AsyncAPI.slnx new file mode 100644 index 00000000..29dda463 --- /dev/null +++ b/AsyncAPI.slnx @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..fada7ad7 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,26 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/ByteBard.AsyncAPI.Readers.JsonExample/ByteBard.AsyncAPI.Readers.JsonExample.csproj b/examples/ByteBard.AsyncAPI.Readers.JsonExample/ByteBard.AsyncAPI.Readers.JsonExample.csproj index 871197d8..4e1ce4f0 100644 --- a/examples/ByteBard.AsyncAPI.Readers.JsonExample/ByteBard.AsyncAPI.Readers.JsonExample.csproj +++ b/examples/ByteBard.AsyncAPI.Readers.JsonExample/ByteBard.AsyncAPI.Readers.JsonExample.csproj @@ -5,6 +5,8 @@ net10.0 disable enable + + false diff --git a/examples/ByteBard.AsyncAPI.Readers.YamlExample/ByteBard.AsyncAPI.Readers.YamlExample.csproj b/examples/ByteBard.AsyncAPI.Readers.YamlExample/ByteBard.AsyncAPI.Readers.YamlExample.csproj index 8e87447d..ef13ee57 100644 --- a/examples/ByteBard.AsyncAPI.Readers.YamlExample/ByteBard.AsyncAPI.Readers.YamlExample.csproj +++ b/examples/ByteBard.AsyncAPI.Readers.YamlExample/ByteBard.AsyncAPI.Readers.YamlExample.csproj @@ -5,6 +5,8 @@ net10.0 disable enable + + false diff --git a/examples/ByteBard.AsyncAPI.Writers.Example/ByteBard.AsyncAPI.Writers.Example.csproj b/examples/ByteBard.AsyncAPI.Writers.Example/ByteBard.AsyncAPI.Writers.Example.csproj index c76ec4c9..84ae3846 100644 --- a/examples/ByteBard.AsyncAPI.Writers.Example/ByteBard.AsyncAPI.Writers.Example.csproj +++ b/examples/ByteBard.AsyncAPI.Writers.Example/ByteBard.AsyncAPI.Writers.Example.csproj @@ -5,6 +5,8 @@ net10.0 enable enable + + false diff --git a/src/ByteBard.AsyncAPI.Bindings/ByteBard.AsyncAPI.Bindings.csproj b/src/ByteBard.AsyncAPI.Bindings/ByteBard.AsyncAPI.Bindings.csproj index 182f217c..d452b20d 100644 --- a/src/ByteBard.AsyncAPI.Bindings/ByteBard.AsyncAPI.Bindings.csproj +++ b/src/ByteBard.AsyncAPI.Bindings/ByteBard.AsyncAPI.Bindings.csproj @@ -8,11 +8,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/ByteBard.AsyncAPI.Readers/ByteBard.AsyncAPI.Readers.csproj b/src/ByteBard.AsyncAPI.Readers/ByteBard.AsyncAPI.Readers.csproj index 0dcf8e64..a624a479 100644 --- a/src/ByteBard.AsyncAPI.Readers/ByteBard.AsyncAPI.Readers.csproj +++ b/src/ByteBard.AsyncAPI.Readers/ByteBard.AsyncAPI.Readers.csproj @@ -9,17 +9,17 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/ByteBard.AsyncAPI/ByteBard.AsyncAPI.csproj b/src/ByteBard.AsyncAPI/ByteBard.AsyncAPI.csproj index eec7c55b..a2efb972 100644 --- a/src/ByteBard.AsyncAPI/ByteBard.AsyncAPI.csproj +++ b/src/ByteBard.AsyncAPI/ByteBard.AsyncAPI.csproj @@ -8,15 +8,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + <_Parameter1>$(MSBuildProjectName).Tests diff --git a/test/ByteBard.AsyncAPI.Tests/ByteBard.AsyncAPI.Tests.csproj b/test/ByteBard.AsyncAPI.Tests/ByteBard.AsyncAPI.Tests.csproj index 27f4ba12..9e37bad5 100644 --- a/test/ByteBard.AsyncAPI.Tests/ByteBard.AsyncAPI.Tests.csproj +++ b/test/ByteBard.AsyncAPI.Tests/ByteBard.AsyncAPI.Tests.csproj @@ -10,17 +10,17 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 6aaac39e0a85710e58f58a3357537ca9e07f0105 Mon Sep 17 00:00:00 2001 From: Arkadiusz Biel - bielu <2244074+bielu@users.noreply.github.com> Date: Sat, 17 Oct 2026 19:25:21 +0100 Subject: [PATCH 2/2] build: bump SourceLink and Test SDK past vulnerable dependencies Microsoft.SourceLink.GitHub 8.0.0 pulled in Microsoft.Build.Tasks.Git 8.0.0 (GHSA-23fw-v26w-5fgq, moderate). Microsoft.NET.Test.Sdk 16.11.0 pulled in Newtonsoft.Json 9.0.1 (GHSA-5crp-9r3c-p9vr, high). dotnet list package --vulnerable now reports none. Co-Authored-By: Claude Opus 5.5 --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index fada7ad7..f32b1b61 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - +