From a9737978e029adc530a05f8277b113f3b4443ffd Mon Sep 17 00:00:00 2001 From: Tyler Kron Date: Sat, 25 Apr 2026 13:49:07 -0600 Subject: [PATCH 1/3] deps: upgrade from .NET 9 to .NET 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bumps TargetFramework to net10.0 / net10.0-windows across all projects - Upgrades EF Core packages (Core, Sqlite, Tools) from 9.0.14 → 10.0.7 - Upgrades EFCore.BulkExtensions.Sqlite from 9.0.2 → 10.0.1 - Updates global.json SDK minimum from 9.0.0 → 10.0.0 (both root and Setup) Closes #498 — which was a mismatched partial bump of only the Tools package. Co-Authored-By: Claude Sonnet 4.6 --- .../Daqifi.Desktop.Common.Test.csproj | 2 +- Daqifi.Desktop.Common/Daqifi.Desktop.Common.csproj | 2 +- .../Daqifi.Desktop.DataModel.Test.csproj | 2 +- .../Daqifi.Desktop.DataModel.csproj | 2 +- Daqifi.Desktop.IO.Test/Daqifi.Desktop.IO.Test.csproj | 2 +- Daqifi.Desktop.IO/Daqifi.Desktop.IO.csproj | 2 +- Daqifi.Desktop.Setup/global.json | 2 +- Daqifi.Desktop.Test/Daqifi.Desktop.Test.csproj | 2 +- Daqifi.Desktop/Daqifi.Desktop.csproj | 10 +++++----- global.json | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Daqifi.Desktop.Common.Test/Daqifi.Desktop.Common.Test.csproj b/Daqifi.Desktop.Common.Test/Daqifi.Desktop.Common.Test.csproj index b3c4e4a3..e1a28d60 100644 --- a/Daqifi.Desktop.Common.Test/Daqifi.Desktop.Common.Test.csproj +++ b/Daqifi.Desktop.Common.Test/Daqifi.Desktop.Common.Test.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 false CA1707;CA1416 diff --git a/Daqifi.Desktop.Common/Daqifi.Desktop.Common.csproj b/Daqifi.Desktop.Common/Daqifi.Desktop.Common.csproj index a0c22e35..d3ec3d1c 100644 --- a/Daqifi.Desktop.Common/Daqifi.Desktop.Common.csproj +++ b/Daqifi.Desktop.Common/Daqifi.Desktop.Common.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable MIT diff --git a/Daqifi.Desktop.DataModel.Test/Daqifi.Desktop.DataModel.Test.csproj b/Daqifi.Desktop.DataModel.Test/Daqifi.Desktop.DataModel.Test.csproj index b3c4e4a3..e1a28d60 100644 --- a/Daqifi.Desktop.DataModel.Test/Daqifi.Desktop.DataModel.Test.csproj +++ b/Daqifi.Desktop.DataModel.Test/Daqifi.Desktop.DataModel.Test.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 false CA1707;CA1416 diff --git a/Daqifi.Desktop.DataModel/Daqifi.Desktop.DataModel.csproj b/Daqifi.Desktop.DataModel/Daqifi.Desktop.DataModel.csproj index 6e896912..c2ee8e48 100644 --- a/Daqifi.Desktop.DataModel/Daqifi.Desktop.DataModel.csproj +++ b/Daqifi.Desktop.DataModel/Daqifi.Desktop.DataModel.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable MIT diff --git a/Daqifi.Desktop.IO.Test/Daqifi.Desktop.IO.Test.csproj b/Daqifi.Desktop.IO.Test/Daqifi.Desktop.IO.Test.csproj index 5592fe0b..2eca0fb3 100644 --- a/Daqifi.Desktop.IO.Test/Daqifi.Desktop.IO.Test.csproj +++ b/Daqifi.Desktop.IO.Test/Daqifi.Desktop.IO.Test.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 false CA1707;CA1416 diff --git a/Daqifi.Desktop.IO/Daqifi.Desktop.IO.csproj b/Daqifi.Desktop.IO/Daqifi.Desktop.IO.csproj index 8338084b..82e3a841 100644 --- a/Daqifi.Desktop.IO/Daqifi.Desktop.IO.csproj +++ b/Daqifi.Desktop.IO/Daqifi.Desktop.IO.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 enable enable MIT diff --git a/Daqifi.Desktop.Setup/global.json b/Daqifi.Desktop.Setup/global.json index f4fd3857..a11f48e1 100644 --- a/Daqifi.Desktop.Setup/global.json +++ b/Daqifi.Desktop.Setup/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.0", + "version": "10.0.0", "rollForward": "latestMajor", "allowPrerelease": true } diff --git a/Daqifi.Desktop.Test/Daqifi.Desktop.Test.csproj b/Daqifi.Desktop.Test/Daqifi.Desktop.Test.csproj index 87199a10..c230c20e 100644 --- a/Daqifi.Desktop.Test/Daqifi.Desktop.Test.csproj +++ b/Daqifi.Desktop.Test/Daqifi.Desktop.Test.csproj @@ -1,6 +1,6 @@  - net9.0-windows + net10.0-windows true false x64 diff --git a/Daqifi.Desktop/Daqifi.Desktop.csproj b/Daqifi.Desktop/Daqifi.Desktop.csproj index 21c96525..3ed28bb8 100644 --- a/Daqifi.Desktop/Daqifi.Desktop.csproj +++ b/Daqifi.Desktop/Daqifi.Desktop.csproj @@ -2,7 +2,7 @@ WinExe - net9.0-windows + net10.0-windows enable enable true @@ -58,14 +58,14 @@ - + - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/global.json b/global.json index 6d77f621..9b53d9b4 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.0", + "version": "10.0.0", "rollForward": "latestMajor", "allowPrerelease": true } From fef3ebdd22c91aadf40fb0fdd897e3451380ebf5 Mon Sep 17 00:00:00 2001 From: Tyler Kron Date: Sat, 25 Apr 2026 13:52:45 -0600 Subject: [PATCH 2/3] chore: remove redundant package refs now built into .NET 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit System.Runtime.CompilerServices.Unsafe and System.ValueTuple are part of the .NET 10 runtime — no longer needed as explicit package references. Co-Authored-By: Claude Sonnet 4.6 --- Daqifi.Desktop.IO.Test/Daqifi.Desktop.IO.Test.csproj | 2 -- Daqifi.Desktop.Test/Daqifi.Desktop.Test.csproj | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Daqifi.Desktop.IO.Test/Daqifi.Desktop.IO.Test.csproj b/Daqifi.Desktop.IO.Test/Daqifi.Desktop.IO.Test.csproj index 2eca0fb3..8b4f7110 100644 --- a/Daqifi.Desktop.IO.Test/Daqifi.Desktop.IO.Test.csproj +++ b/Daqifi.Desktop.IO.Test/Daqifi.Desktop.IO.Test.csproj @@ -13,8 +13,6 @@ - - diff --git a/Daqifi.Desktop.Test/Daqifi.Desktop.Test.csproj b/Daqifi.Desktop.Test/Daqifi.Desktop.Test.csproj index c230c20e..0c94006e 100644 --- a/Daqifi.Desktop.Test/Daqifi.Desktop.Test.csproj +++ b/Daqifi.Desktop.Test/Daqifi.Desktop.Test.csproj @@ -16,9 +16,7 @@ - - - + From 64e1fe3db57d8ce4bd1720b1d3790c39e4e56e48 Mon Sep 17 00:00:00 2001 From: Tyler Kron Date: Sat, 25 Apr 2026 13:54:45 -0600 Subject: [PATCH 3/3] fix: update WiX harvest path and release workflow for .NET 10 - WiX DaqifiSourceDir was still pointing to net9.0-windows\publish - release.yaml was installing .NET SDK 9.0.x and publishing to net9.0-windows path Both would cause the MSI installer build to fail after the .NET 10 upgrade. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/release.yaml | 4 ++-- .../DAQifiDesktopSetup/DAQifiDesktop_Setup.wixproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b34e39eb..ea6a49d1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,7 +14,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Restore dependencies run: dotnet restore @@ -23,7 +23,7 @@ jobs: run: dotnet build --no-restore --configuration Release - name: Publish Application - run: dotnet publish Daqifi.Desktop/Daqifi.Desktop.csproj --configuration Release --output Daqifi.Desktop/bin/Release/net9.0-windows/publish --no-build + run: dotnet publish Daqifi.Desktop/Daqifi.Desktop.csproj --configuration Release --output Daqifi.Desktop/bin/Release/net10.0-windows/publish --no-build - name: Build MSI Installer run: | diff --git a/Daqifi.Desktop.Setup/DAQifiDesktopSetup/DAQifiDesktop_Setup.wixproj b/Daqifi.Desktop.Setup/DAQifiDesktopSetup/DAQifiDesktop_Setup.wixproj index 80bb9176..b17121b2 100644 --- a/Daqifi.Desktop.Setup/DAQifiDesktopSetup/DAQifiDesktop_Setup.wixproj +++ b/Daqifi.Desktop.Setup/DAQifiDesktopSetup/DAQifiDesktop_Setup.wixproj @@ -8,7 +8,7 @@ - $(SolutionDir)..\Daqifi.Desktop\bin\$(Configuration)\net9.0-windows\publish + $(SolutionDir)..\Daqifi.Desktop\bin\$(Configuration)\net10.0-windows\publish $([System.IO.Path]::GetFullPath('$(DaqifiSourceDir)')) DAQiFi.exe