From 051b4bfd71e6fef5324fb27c4ce5c5d9e123bbbf Mon Sep 17 00:00:00 2001 From: Tom Ghekiere Date: Wed, 28 Jan 2026 13:38:50 +0100 Subject: [PATCH 01/10] chore(deps): update all dependencies --- sample/SendMailTestApp/SendMailTestApp.csproj | 4 ++-- .../FluentEmail.Graph.csproj | 19 ++++++++----------- tests/FluentEmail.Graph.Tests/Assembly.cs | 3 +++ .../FluentEmail.Graph.Tests.csproj | 11 +++++------ 4 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 tests/FluentEmail.Graph.Tests/Assembly.cs diff --git a/sample/SendMailTestApp/SendMailTestApp.csproj b/sample/SendMailTestApp/SendMailTestApp.csproj index bee9e78..8c305a2 100644 --- a/sample/SendMailTestApp/SendMailTestApp.csproj +++ b/sample/SendMailTestApp/SendMailTestApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net10.0 enable enable 4eba8463-a290-440f-b079-62d74334211a @@ -14,7 +14,7 @@ - + diff --git a/src/FluentEmail.Graph/FluentEmail.Graph.csproj b/src/FluentEmail.Graph/FluentEmail.Graph.csproj index d818a57..a43cd43 100644 --- a/src/FluentEmail.Graph/FluentEmail.Graph.csproj +++ b/src/FluentEmail.Graph/FluentEmail.Graph.csproj @@ -20,8 +20,9 @@ 0.0.1 MIT detailed - 2.4 - v2.4 Updated Microsoft.Graph to v5 + 3.0 + v3.0 Updated all dependencies and upgraded test projects to .NET 10 +v2.4 Updated Microsoft.Graph to v5 v2.2 Added support for Headers v2.1 Added support for Inline images @@ -40,21 +41,17 @@ v2.1 Added support for Inline images - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/FluentEmail.Graph.Tests/Assembly.cs b/tests/FluentEmail.Graph.Tests/Assembly.cs new file mode 100644 index 0000000..05113ca --- /dev/null +++ b/tests/FluentEmail.Graph.Tests/Assembly.cs @@ -0,0 +1,3 @@ +ο»Ώusing Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] \ No newline at end of file diff --git a/tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj b/tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj index 246f480..8eb616a 100644 --- a/tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj +++ b/tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net10.0 false true true @@ -9,11 +9,10 @@ - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all From 37b15c3b9ffd028e59b0df33e14e0ea129bf2248 Mon Sep 17 00:00:00 2001 From: David De Sloovere <352626+DavidDeSloovere@users.noreply.github.com> Date: Wed, 28 Jan 2026 13:52:17 +0100 Subject: [PATCH 02/10] Update CI workflow to use newer action versions --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7094bd..c120e6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,14 +19,14 @@ jobs: steps: - name: ☁ Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v6 with: fetch-depth: 0 - name: πŸ‘· .NET SDK - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: - dotnet-version: "6.0" + dotnet-version: "10.x" - name: ⬇ Install dependencies run: dotnet restore From fb3c6d6e76305d0a3f8e31bd7fd57e611b1f868a Mon Sep 17 00:00:00 2001 From: David De Sloovere <352626+DavidDeSloovere@users.noreply.github.com> Date: Wed, 28 Jan 2026 13:52:34 +0100 Subject: [PATCH 03/10] Update GitHub Actions to use newer versions --- .github/workflows/publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 47adb4d..e90684b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,14 +16,14 @@ jobs: steps: - name: ☁ Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v6 with: fetch-depth: 0 - name: πŸ‘· .NET SDK - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: - dotnet-version: "6.0" + dotnet-version: "10.x" - name: ⬇ Install dependencies run: dotnet restore From 86e4e5bca2941e6e8e5addb677e6fc6886a452df Mon Sep 17 00:00:00 2001 From: Tom Ghekiere Date: Wed, 28 Jan 2026 13:53:13 +0100 Subject: [PATCH 04/10] ci .NET 10 --- .github/workflows/ci.yml | 4 ++-- FluentEmail.Graph.sln | 14 ++++++++++++++ global.json | 7 +++++++ tests/FluentEmail.Graph.Tests/Assembly.cs | 3 --- .../FluentEmail.Graph.Tests.csproj | 9 ++++++--- tests/FluentEmail.Graph.Tests/UnitTest1.cs | 5 ++--- 6 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 global.json delete mode 100644 tests/FluentEmail.Graph.Tests/Assembly.cs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7094bd..1145630 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,9 +24,9 @@ jobs: fetch-depth: 0 - name: πŸ‘· .NET SDK - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: - dotnet-version: "6.0" + dotnet-version: "10.0" - name: ⬇ Install dependencies run: dotnet restore diff --git a/FluentEmail.Graph.sln b/FluentEmail.Graph.sln index 516a5f7..2a87350 100644 --- a/FluentEmail.Graph.sln +++ b/FluentEmail.Graph.sln @@ -20,6 +20,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{A4341B EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SendMailTestApp", "sample\SendMailTestApp\SendMailTestApp.csproj", "{24093217-E352-4B06-9138-C0641657F49D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{9A006E2F-010E-4680-9954-0BA348EE681C}" + ProjectSection(SolutionItems) = preProject + .github\dependabot.yml = .github\dependabot.yml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{09828C36-2EAB-4015-970F-24D5E61AAD7A}" + ProjectSection(SolutionItems) = preProject + .github\workflows\ci.yml = .github\workflows\ci.yml + .github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml + .github\workflows\publish.yml = .github\workflows\publish.yml + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -74,6 +86,8 @@ Global {110F6221-F88C-44D8-B9E3-B3D1B9691DFD} = {D1C8192B-F35B-4433-9E5F-05F9E92DA58F} {B01998E7-3FE2-4A66-968A-0B7725309129} = {779D4366-494E-4582-ACDA-38D55AEC2EE5} {24093217-E352-4B06-9138-C0641657F49D} = {A4341B5B-E943-490B-94AE-D4637A7AF37C} + {9A006E2F-010E-4680-9954-0BA348EE681C} = {E37EFC29-B838-4EC7-8DDD-48303FE8FD52} + {09828C36-2EAB-4015-970F-24D5E61AAD7A} = {9A006E2F-010E-4680-9954-0BA348EE681C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F11BF11A-54C0-49CA-B567-850A4C6AC40A} diff --git a/global.json b/global.json new file mode 100644 index 0000000..9a523dc --- /dev/null +++ b/global.json @@ -0,0 +1,7 @@ +{ + "sdk": { + "version": "10.0.0", + "rollForward": "latestMajor", + "allowPrerelease": false + } +} \ No newline at end of file diff --git a/tests/FluentEmail.Graph.Tests/Assembly.cs b/tests/FluentEmail.Graph.Tests/Assembly.cs deleted file mode 100644 index 05113ca..0000000 --- a/tests/FluentEmail.Graph.Tests/Assembly.cs +++ /dev/null @@ -1,3 +0,0 @@ -ο»Ώusing Microsoft.VisualStudio.TestTools.UnitTesting; - -[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] \ No newline at end of file diff --git a/tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj b/tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj index 8eb616a..cae77bb 100644 --- a/tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj +++ b/tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj @@ -9,9 +9,7 @@ - - - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -20,6 +18,11 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/tests/FluentEmail.Graph.Tests/UnitTest1.cs b/tests/FluentEmail.Graph.Tests/UnitTest1.cs index 50713cd..7b3b0ce 100644 --- a/tests/FluentEmail.Graph.Tests/UnitTest1.cs +++ b/tests/FluentEmail.Graph.Tests/UnitTest1.cs @@ -1,11 +1,10 @@ namespace FluentEmail.Graph.Tests; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; -[TestClass] public class UnitTest1 { - [TestMethod] + [Fact] public void TestMethod1() { // no tests yet, bit hard because you need actual appid, tenantid and secret for integration test From 42c276a342756452fc65821703dae4b9f09f448a Mon Sep 17 00:00:00 2001 From: David De Sloovere <352626+DavidDeSloovere@users.noreply.github.com> Date: Wed, 28 Jan 2026 14:00:28 +0100 Subject: [PATCH 05/10] Apply suggestion from @DavidDeSloovere --- .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 1145630..12c2d21 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - name: πŸ‘· .NET SDK uses: actions/setup-dotnet@v5 with: - dotnet-version: "10.0" + dotnet-version: "10.x" - name: ⬇ Install dependencies run: dotnet restore From 65a769e60328df99b6dd6ba0a2774b2c445308af Mon Sep 17 00:00:00 2001 From: David De Sloovere <352626+DavidDeSloovere@users.noreply.github.com> Date: Wed, 28 Jan 2026 14:01:01 +0100 Subject: [PATCH 06/10] Apply suggestion from @DavidDeSloovere --- .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 12c2d21..c120e6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: steps: - name: ☁ Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v6 with: fetch-depth: 0 From 68a8d7d2dc80b0132250db02c6715a716153d4a9 Mon Sep 17 00:00:00 2001 From: David De Sloovere <352626+DavidDeSloovere@users.noreply.github.com> Date: Wed, 28 Jan 2026 14:06:49 +0100 Subject: [PATCH 07/10] Update GitHub packages source URL in CI workflow --- .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 c120e6f..0ebd293 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: run: dotnet pack ./src/FluentEmail.Graph/FluentEmail.Graph.csproj -c Release -o ./artifacts --no-build - name: πŸ”‘ Add GitHub packages to nuget sources - run: dotnet nuget add source --username USERNAME --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/ESC-BV/index.json" + run: dotnet nuget add source --username USERNAME --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/alistar-dev/index.json" - name: πŸš€ Publish to GitHub packages run: dotnet nuget push "./artifacts/*.nupkg" --source "github" --api-key ${{ secrets.GITHUB_TOKEN }} From 4a42b3d18509fe3e72571f67e9a87b2870c1fd2a Mon Sep 17 00:00:00 2001 From: David De Sloovere <352626+DavidDeSloovere@users.noreply.github.com> Date: Wed, 28 Jan 2026 14:07:00 +0100 Subject: [PATCH 08/10] Update GitHub package source URL in publish.yml --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e90684b..ea0ad6f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -38,7 +38,7 @@ jobs: run: dotnet pack ./src/FluentEmail.Graph/FluentEmail.Graph.csproj -c Release -o ./artifacts --no-build - name: πŸ”‘ Add GitHub packages to nuget sources - run: dotnet nuget add source --username USERNAME --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/ESC-BV/index.json" + run: dotnet nuget add source --username USERNAME --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/alistar-dev/index.json" - name: πŸš€ Push package to Github and NuGet run: | From 7a3e5ca33e759cb7ad52c7db63f56d8396776a24 Mon Sep 17 00:00:00 2001 From: David De Sloovere <352626+DavidDeSloovere@users.noreply.github.com> Date: Wed, 28 Jan 2026 14:09:37 +0100 Subject: [PATCH 09/10] improve command --- .github/workflows/ci.yml | 8 +++++++- .github/workflows/publish.yml | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ebd293..206eebe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,13 @@ jobs: run: dotnet pack ./src/FluentEmail.Graph/FluentEmail.Graph.csproj -c Release -o ./artifacts --no-build - name: πŸ”‘ Add GitHub packages to nuget sources - run: dotnet nuget add source --username USERNAME --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/alistar-dev/index.json" + run: | + dotnet nuget add source \ + --username ${{ github.actor }} \ + --password ${{ secrets.GITHUB_TOKEN }} \ + --store-password-in-clear-text \ + --name github \ + "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" - name: πŸš€ Publish to GitHub packages run: dotnet nuget push "./artifacts/*.nupkg" --source "github" --api-key ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ea0ad6f..904597c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -38,7 +38,13 @@ jobs: run: dotnet pack ./src/FluentEmail.Graph/FluentEmail.Graph.csproj -c Release -o ./artifacts --no-build - name: πŸ”‘ Add GitHub packages to nuget sources - run: dotnet nuget add source --username USERNAME --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/alistar-dev/index.json" + run: | + dotnet nuget add source \ + --username ${{ github.actor }} \ + --password ${{ secrets.GITHUB_TOKEN }} \ + --store-password-in-clear-text \ + --name github \ + "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" - name: πŸš€ Push package to Github and NuGet run: | From cf019ce6fbeec35a3e72831c7a3bcc75bdbb5245 Mon Sep 17 00:00:00 2001 From: David De Sloovere <352626+DavidDeSloovere@users.noreply.github.com> Date: Wed, 28 Jan 2026 14:10:43 +0100 Subject: [PATCH 10/10] fix xunit build --- tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj b/tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj index cae77bb..047a46c 100644 --- a/tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj +++ b/tests/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj @@ -6,6 +6,7 @@ true true latestmajor + Exe