From 7f9575dee0b07af5687732db1b316ef8020866cb Mon Sep 17 00:00:00 2001 From: Stefan Seeland <168659+stesee@users.noreply.github.com> Date: Mon, 22 Dec 2025 22:02:11 +0100 Subject: [PATCH 1/4] Drop .NET 6 support from all projects Removed .NET 6 from the target frameworks in all project files and updated the README to reflect the new minimum supported version (.NET 8). This change streamlines support and testing for newer .NET versions. --- README.md | 4 ++-- .../DocSharp.Binary.Common/DocSharp.Binary.Common.csproj | 2 +- .../DocSharp.Binary.Doc/DocSharp.Binary.Doc.csproj | 2 +- .../DocSharp.Binary.Ppt/DocSharp.Binary.Ppt.csproj | 2 +- .../DocSharp.Binary.Xls/DocSharp.Binary.Xls.csproj | 2 +- src/DocSharp.Common/DocSharp.Common.csproj | 2 +- src/DocSharp.Docx/DocSharp.Docx.csproj | 2 +- src/DocSharp.ImageSharp/DocSharp.ImageSharp.csproj | 2 +- src/DocSharp.Markdown/DocSharp.Markdown.csproj | 2 +- src/DocSharp.SystemDrawing/DocSharp.SystemDrawing.csproj | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 3896b7d..fbea66a 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,8 @@ For now, you can consider the following libraries for documents creation and man ### Requirements -- .NET 6, 8, 9, 10 and .NET Framework 4.6.2 and higher are supported, but tests are mostly performed on .NET 8 and above. -- DocSharp.SystemDrawing is for Windows only (.NET Framework or net*-windows), as System.Drawing.Common is only supported on Windows; while DocSharp.ImageSharp is cross-platform for .NET 6+ (ImageSharp does not support .NET Framework). +- .NET 8, 9, 10 and .NET Framework 4.6.2 and higher are supported, but tests are mostly performed on .NET 8 and above. +- DocSharp.SystemDrawing is for Windows only (.NET Framework or net*-windows), as System.Drawing.Common is only supported on Windows; while DocSharp.ImageSharp is cross-platform for .NET 8+ (ImageSharp does not support .NET Framework). ### Usage diff --git a/src/DocSharp.Binary/DocSharp.Binary.Common/DocSharp.Binary.Common.csproj b/src/DocSharp.Binary/DocSharp.Binary.Common/DocSharp.Binary.Common.csproj index ba938de..28d1a4c 100644 --- a/src/DocSharp.Binary/DocSharp.Binary.Common/DocSharp.Binary.Common.csproj +++ b/src/DocSharp.Binary/DocSharp.Binary.Common/DocSharp.Binary.Common.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net9.0;net10.0;net462 + net8.0;net9.0;net10.0;net462 disable disable latest diff --git a/src/DocSharp.Binary/DocSharp.Binary.Doc/DocSharp.Binary.Doc.csproj b/src/DocSharp.Binary/DocSharp.Binary.Doc/DocSharp.Binary.Doc.csproj index 860a1e5..2365638 100644 --- a/src/DocSharp.Binary/DocSharp.Binary.Doc/DocSharp.Binary.Doc.csproj +++ b/src/DocSharp.Binary/DocSharp.Binary.Doc/DocSharp.Binary.Doc.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net9.0;net10.0;net462 + net8.0;net9.0;net10.0;net462 disable disable latest diff --git a/src/DocSharp.Binary/DocSharp.Binary.Ppt/DocSharp.Binary.Ppt.csproj b/src/DocSharp.Binary/DocSharp.Binary.Ppt/DocSharp.Binary.Ppt.csproj index b6e2f24..591dcb7 100644 --- a/src/DocSharp.Binary/DocSharp.Binary.Ppt/DocSharp.Binary.Ppt.csproj +++ b/src/DocSharp.Binary/DocSharp.Binary.Ppt/DocSharp.Binary.Ppt.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net9.0;net10.0;net462 + net8.0;net9.0;net10.0;net462 disable disable latest diff --git a/src/DocSharp.Binary/DocSharp.Binary.Xls/DocSharp.Binary.Xls.csproj b/src/DocSharp.Binary/DocSharp.Binary.Xls/DocSharp.Binary.Xls.csproj index d64f3bd..3a5311a 100644 --- a/src/DocSharp.Binary/DocSharp.Binary.Xls/DocSharp.Binary.Xls.csproj +++ b/src/DocSharp.Binary/DocSharp.Binary.Xls/DocSharp.Binary.Xls.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net9.0;net10.0;net462 + net8.0;net9.0;net10.0;net462 disable disable latest diff --git a/src/DocSharp.Common/DocSharp.Common.csproj b/src/DocSharp.Common/DocSharp.Common.csproj index 6d117d2..f446a96 100644 --- a/src/DocSharp.Common/DocSharp.Common.csproj +++ b/src/DocSharp.Common/DocSharp.Common.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0;net9.0;net10.0;net462 + net8.0;net9.0;net10.0;net462 disable enable latest diff --git a/src/DocSharp.Docx/DocSharp.Docx.csproj b/src/DocSharp.Docx/DocSharp.Docx.csproj index fffc111..ec80b40 100644 --- a/src/DocSharp.Docx/DocSharp.Docx.csproj +++ b/src/DocSharp.Docx/DocSharp.Docx.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net9.0;net10.0;net462 + net8.0;net9.0;net10.0;net462 disable enable latest diff --git a/src/DocSharp.ImageSharp/DocSharp.ImageSharp.csproj b/src/DocSharp.ImageSharp/DocSharp.ImageSharp.csproj index fbe68e5..d776a80 100644 --- a/src/DocSharp.ImageSharp/DocSharp.ImageSharp.csproj +++ b/src/DocSharp.ImageSharp/DocSharp.ImageSharp.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0 disable enable latest diff --git a/src/DocSharp.Markdown/DocSharp.Markdown.csproj b/src/DocSharp.Markdown/DocSharp.Markdown.csproj index 1b666e0..8c83b66 100644 --- a/src/DocSharp.Markdown/DocSharp.Markdown.csproj +++ b/src/DocSharp.Markdown/DocSharp.Markdown.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net9.0;net10.0;net462 + net8.0;net9.0;net10.0;net462 disable enable latest diff --git a/src/DocSharp.SystemDrawing/DocSharp.SystemDrawing.csproj b/src/DocSharp.SystemDrawing/DocSharp.SystemDrawing.csproj index 6c94414..e0f9f16 100644 --- a/src/DocSharp.SystemDrawing/DocSharp.SystemDrawing.csproj +++ b/src/DocSharp.SystemDrawing/DocSharp.SystemDrawing.csproj @@ -1,7 +1,7 @@  - net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows;net462 + net8.0-windows;net9.0-windows;net10.0-windows;net462 disable enable latest From 316efc1930ce85113481fc84670e52e912c052d2 Mon Sep 17 00:00:00 2001 From: Stefan Seeland <168659+stesee@users.noreply.github.com> Date: Mon, 22 Dec 2025 22:48:28 +0100 Subject: [PATCH 2/4] Add CI workflow for .NET build and test Introduces a GitHub Actions workflow that restores dependencies, builds, and tests the .NET project on Windows using .NET 10.0.x. This ensures automated validation of code on every push. --- src/.github/workflows/ci.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/.github/workflows/ci.yml diff --git a/src/.github/workflows/ci.yml b/src/.github/workflows/ci.yml new file mode 100644 index 0000000..321178c --- /dev/null +++ b/src/.github/workflows/ci.yml @@ -0,0 +1,26 @@ +name: CI + +on: + push: + +jobs: + build: + name: Restore, Build, Test, Pack + runs-on: windows-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '10.0.x' + + - name: Restore + run: dotnet restore + + - name: Build + run: dotnet build --configuration Release --no-restore --nologo + + - name: Test + run: dotnet test --configuration Release --no-build --nologo \ No newline at end of file From ed3374e1e57f245fdd56f9c38d8b32a72b23800a Mon Sep 17 00:00:00 2001 From: Stefan Seeland <168659+stesee@users.noreply.github.com> Date: Mon, 22 Dec 2025 23:05:54 +0100 Subject: [PATCH 3/4] Update CI workflow to use solution file paths Moved ci.yml to the root .github/workflows directory and updated restore, build, and test steps to explicitly reference src/DocSharp.sln. This ensures the correct solution is targeted during CI runs. --- {src/.github => .github}/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename {src/.github => .github}/workflows/ci.yml (61%) diff --git a/src/.github/workflows/ci.yml b/.github/workflows/ci.yml similarity index 61% rename from src/.github/workflows/ci.yml rename to .github/workflows/ci.yml index 321178c..e0cf17b 100644 --- a/src/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,10 +17,10 @@ jobs: dotnet-version: '10.0.x' - name: Restore - run: dotnet restore + run: dotnet restore src/DocSharp.sln - name: Build - run: dotnet build --configuration Release --no-restore --nologo + run: dotnet build src/DocSharp.sln --configuration Release --no-restore --nologo - name: Test - run: dotnet test --configuration Release --no-build --nologo \ No newline at end of file + run: dotnet test src/DocSharp.sln --configuration Release --no-build --nologo \ No newline at end of file From 7b70a0ea9fc7191a821004ce767e77be1fdebf51 Mon Sep 17 00:00:00 2001 From: Stefan Seeland <168659+stesee@users.noreply.github.com> Date: Tue, 23 Dec 2025 07:30:33 +0100 Subject: [PATCH 4/4] Update .github/workflows/ci.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0cf17b..bff97e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '10.0.x'