From da38c8f1666a821a50fb2fb9651c4df94a2b25da Mon Sep 17 00:00:00 2001 From: Orion Edwards Date: Thu, 8 Oct 2026 22:23:29 +1300 Subject: [PATCH 1/3] Update to .NET 10 and Nuke 10.1.0 - global.json SDK pinned to 10.0.100 (rollForward latestFeature) - Tests, Benchmarks and Nuke build project target net10.0 - Nuke.Common 9.0.4 -> 10.1.0 - GitHub Actions use .NET 10.0.x SDK Co-Authored-By: Claude Opus 5.5 --- .github/workflows/main.yml | 10 +++++----- build/Build.cs | 2 +- build/_build.csproj | 4 ++-- global.json | 2 +- source/Octodiff.Benchmarks/Octodiff.Benchmarks.csproj | 2 +- source/Octodiff.Tests/Octodiff.Tests.csproj | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7500234..057042c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,12 +32,12 @@ jobs: with: fetch-depth: 0 # all - - name: Setup NET 8.0 + - name: Setup .NET 10 uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - - name: Test NET 8 + - name: Test .NET 10 run: ./build.sh -target Test - name: Linux unit test report @@ -63,10 +63,10 @@ jobs: with: fetch-depth: 0 - - name: Setup .NET 8 + - name: Setup .NET 10 uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Append OCTOVERSION_CurrentBranch with -nightly- (for scheduled) if: github.event_name == 'schedule' diff --git a/build/Build.cs b/build/Build.cs index 9e24aa1..a9808ac 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -26,7 +26,7 @@ class Build : NukeBuild [Parameter("Branch name for OctoVersion to use to calculate the version number. Can be set via the environment variable " + CiBranchNameEnvVariable + ".", Name = CiBranchNameEnvVariable)] string BranchName { get; set; } - [OctoVersion(BranchMember = nameof(BranchName), AutoDetectBranchMember = nameof(AutoDetectBranch), Framework = "net8.0")] + [OctoVersion(BranchMember = nameof(BranchName), AutoDetectBranchMember = nameof(AutoDetectBranch), Framework = "net10.0")] public OctoVersionInfo OctoVersionInfo; [Parameter("Test filter expression", Name = "where")] readonly string TestFilter = string.Empty; diff --git a/build/_build.csproj b/build/_build.csproj index 00a27eb..b914b9c 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 CS0649;CS0169 .. @@ -11,7 +11,7 @@ - + diff --git a/global.json b/global.json index 391ba3c..512142d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "10.0.100", "rollForward": "latestFeature" } } diff --git a/source/Octodiff.Benchmarks/Octodiff.Benchmarks.csproj b/source/Octodiff.Benchmarks/Octodiff.Benchmarks.csproj index 6f6a740..58f2cf0 100644 --- a/source/Octodiff.Benchmarks/Octodiff.Benchmarks.csproj +++ b/source/Octodiff.Benchmarks/Octodiff.Benchmarks.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 enable enable diff --git a/source/Octodiff.Tests/Octodiff.Tests.csproj b/source/Octodiff.Tests/Octodiff.Tests.csproj index 41e0d04..aef465c 100644 --- a/source/Octodiff.Tests/Octodiff.Tests.csproj +++ b/source/Octodiff.Tests/Octodiff.Tests.csproj @@ -8,10 +8,10 @@ - net8.0;net462 + net10.0;net462 - net8.0 + net10.0 @@ -39,7 +39,7 @@ - + \ No newline at end of file From 3c1b83eed47cfdaf06753217400ed7aa8a78043e Mon Sep 17 00:00:00 2001 From: Orion Edwards Date: Thu, 8 Oct 2026 22:25:00 +1300 Subject: [PATCH 2/3] Update test and build dependencies Microsoft.NET.Test.Sdk 17.12.0 -> 18.10.1 NUnit 4.3.2 -> 5.0.0 NUnit3TestAdapter 4.6.0 -> 6.3.0 System.IO.Packaging 9.0.1 -> 10.0.12 BenchmarkDotNet 0.14.0 -> 0.15.8 Octopus.OctoVersion.Tool 1.0.9 -> 1.1.79 Co-Authored-By: Claude Opus 5.5 --- build/_build.csproj | 2 +- source/Octodiff.Benchmarks/Octodiff.Benchmarks.csproj | 2 +- source/Octodiff.Tests/Octodiff.Tests.csproj | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/_build.csproj b/build/_build.csproj index b914b9c..e38f103 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -15,7 +15,7 @@ - + diff --git a/source/Octodiff.Benchmarks/Octodiff.Benchmarks.csproj b/source/Octodiff.Benchmarks/Octodiff.Benchmarks.csproj index 58f2cf0..c601332 100644 --- a/source/Octodiff.Benchmarks/Octodiff.Benchmarks.csproj +++ b/source/Octodiff.Benchmarks/Octodiff.Benchmarks.csproj @@ -8,7 +8,7 @@ - + diff --git a/source/Octodiff.Tests/Octodiff.Tests.csproj b/source/Octodiff.Tests/Octodiff.Tests.csproj index aef465c..ca9a73b 100644 --- a/source/Octodiff.Tests/Octodiff.Tests.csproj +++ b/source/Octodiff.Tests/Octodiff.Tests.csproj @@ -19,9 +19,9 @@ - - - + + + @@ -40,6 +40,6 @@ - + \ No newline at end of file From 76d2e61e344ad3537c6cdb56a962ebe9867b400b Mon Sep 17 00:00:00 2001 From: Orion Edwards Date: Thu, 8 Oct 2026 22:27:56 +1300 Subject: [PATCH 3/3] Update README development requirements to .NET 10 SDK Co-Authored-By: Claude Opus 5.5 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 70bf8d9..87792e6 100644 --- a/README.md +++ b/README.md @@ -200,8 +200,8 @@ using(var newFileStream = new FileStream(newFilePath2, FileMode.Create, FileAcce ## Development You need: -- VSCode or Visual Studio 15.3 to compile the solution -- .NET Core 2.0 SDK (https://download.microsoft.com/download/0/F/D/0FD852A4-7EA1-4E2A-983A-0484AC19B92C/dotnet-sdk-2.0.0-win-x64.exe) +- VSCode, Visual Studio or Rider to compile the solution +- .NET 10 SDK (https://dotnet.microsoft.com/download/dotnet/10.0) Run `Build.cmd` to build, test and package the project.