Skip to content

chore: upgrade to .NET 9 and replace WindowsFirewallHelper with COM firewall wrapper #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tylerkron merged 13 commits into from
Sep 5, 2025
Merged

chore: upgrade to .NET 9 and replace WindowsFirewallHelper with COM firewall wrapper #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2db2cce
feat: Migrate DAQiFi Desktop to .NET 9
tylerkron Sep 1, 2025
918950e
chore: upgrade to .NET 9 and update installer/docs
tylerkron Sep 2, 2025
330da6f
fix(firewall): replace WindowsFirewallHelper with direct COM (INetFwP…
tylerkron Sep 2, 2025
856a10e
fix(firewall): use dynamic COM for INetFwPolicy2/FWRule to avoid DISP…
tylerkron Sep 2, 2025
5a488b6
ci: use .NET 9 SDK in CI; publish x64 MSI
tylerkron Sep 2, 2025
4be5b0a
ci/installer: publish app before WiX build; point WiX to publish output
tylerkron Sep 2, 2025
2975c8c
fix(installer): remove .NET 9 framework assemblies from WiX installer
tylerkron Sep 2, 2025
f6c5efd
fix(ci): update MSI artifact path for WiX 5.0/.NET 9
tylerkron Sep 2, 2025
d86a87a
fix(ci): use x86 platform path for MSI artifact
tylerkron Sep 2, 2025
2a2dd6a
fix(ci): remove framework-dependent publish step from release workflow
tylerkron Sep 2, 2025
46663a1
fix: address security concerns in firewall management
tylerkron Sep 5, 2025
fbe91f5
fix: resolve build errors in firewall configuration tests
tylerkron Sep 5, 2025
fb3f3bb
fix: add comprehensive logging and exception handling for firewall op…
tylerkron Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,17 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

- name: Restore dependencies
run: dotnet restore

- name: Build with Analysis
run: dotnet build --no-restore --configuration Release /p:EnforceCodeStyleInBuild=true

- name: Publish app (framework-dependent)
run: dotnet publish Daqifi.Desktop/Daqifi.Desktop.csproj -c Release --no-restore

- name: Test with Coverage
run: dotnet test --no-build --verbosity normal --configuration Release --collect:"XPlat Code Coverage" --results-directory ./TestResults/ /p:CoverletOutputFormat=cobertura

Expand Down Expand Up @@ -92,4 +95,4 @@ jobs:
with:
name: DAQifiDesktop-Installer
path: Daqifi.Desktop.Setup/DAQifiDesktopSetup/bin/x86/Release/DAQifiDesktop_Setup.msi
if-no-files-found: error
if-no-files-found: error
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

- name: Restore dependencies
run: dotnet restore
Expand All @@ -32,4 +32,4 @@ jobs:
with:
files: Daqifi.Desktop.Setup/DAQifiDesktopSetup/bin/x86/Release/DAQifiDesktop_Setup.msi
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This document provides context for Claude to assist with the DAQiFi Desktop appl
DAQiFi Desktop is a Windows desktop application for communicating with DAQiFi hardware products. Our goal is to modernize data acquisition with user-friendly and intuitive products.

### Technology Stack
- .NET 8.0 and WPF for the desktop application
- .NET 9.0 and WPF for the desktop application
- SQLite for local data storage
- Google Protocol Buffers for device communication
- EntityFramework for database operations
Expand Down Expand Up @@ -240,4 +240,4 @@ When working on:
- Log all errors with context
- Provide user-friendly error messages
- Never expose sensitive information
- Handle device disconnection gracefully
- Handle device disconnection gracefully
2 changes: 1 addition & 1 deletion Daqifi.Desktop.Bootloader.Test/Daqifi.Desktop.Bootloader.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
</PropertyGroup>
<Choose>
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
Expand Down
2 changes: 1 addition & 1 deletion Daqifi.Desktop.Bootloader/Daqifi.Desktop.Bootloader.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Daqifi.Desktop.Common.Test/Daqifi.Desktop.Common.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Daqifi.Desktop.Common/Daqifi.Desktop.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Daqifi.Desktop.DataModel.Test/Daqifi.Desktop.DataModel.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Daqifi.Desktop.DataModel/Daqifi.Desktop.DataModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Daqifi.Desktop.IO.Test/Daqifi.Desktop.IO.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Daqifi.Desktop.IO/Daqifi.Desktop.IO.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
5 changes: 3 additions & 2 deletions Daqifi.Desktop.Setup/DAQifiDesktopSetup/DAQifiDesktop_Setup.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
</PropertyGroup>

<PropertyGroup>
<DaqifiSourceDir>$(SolutionDir)..\Daqifi.Desktop\bin\$(Configuration)\net8.0-windows</DaqifiSourceDir>
<!-- Use published output so all dependencies are present -->
<DaqifiSourceDir>$(SolutionDir)..\Daqifi.Desktop\bin\$(Configuration)\net9.0-windows\publish</DaqifiSourceDir>
<DaqifiSourceDirShort>$([System.IO.Path]::GetFullPath('$(DaqifiSourceDir)'))</DaqifiSourceDirShort>
<MainExeName>DAQiFi.exe</MainExeName>
</PropertyGroup>
Expand Down Expand Up @@ -47,4 +48,4 @@
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
44 changes: 6 additions & 38 deletions Daqifi.Desktop.Setup/DAQifiDesktopSetup/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Directory Id="RUNTIMESFOLDER" Name="runtimes">
<Directory Id="RUNTIMESWIN" Name="win">
<Directory Id="RUNTIMESWINLIB" Name="lib">
<Directory Id="RUNTIMESWINLIBNET" Name="net8.0"/>
<Directory Id="RUNTIMESWINLIBNET" Name="net9.0"/>
</Directory>
</Directory>
<Directory Id="RUNTIMESWIN_X64" Name="win-x64">
Expand Down Expand Up @@ -43,7 +43,7 @@
<!-- Force upgrade if already installed-->
<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
<Upgrade Id="ACA4F4E1-6DBB-47C0-A829-84AA1536C147">
<UpgradeVersion Minimum="0.1.0.0"

Check warning on line 46 in Daqifi.Desktop.Setup/DAQifiDesktopSetup/Product.wxs

View workflow job for this annotation

GitHub Actions / build-and-test 

ICE61: This product should remove only older versions of itself. The Maximum version is not less than the current product. (99.0.0.0 1.1.0.0)

Check warning on line 46 in Daqifi.Desktop.Setup/DAQifiDesktopSetup/Product.wxs

View workflow job for this annotation

GitHub Actions / build-and-test 

ICE61: This product should remove only older versions of itself. The Maximum version is not less than the current product. (99.0.0.0 1.1.0.0)
Maximum="99.0.0.0"
Property="PREVIOUSVERSIONSINSTALLED"
IncludeMinimum="yes"
Expand Down Expand Up @@ -169,9 +169,6 @@
<Component Id="HidLibrary" Guid="919CEA39-D40A-478D-AD1C-51CE83DC5135">
<File Source="$(var.SourceDir)\HidLibrary.dll"/>
</Component>
<Component Id="Humanizer" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA5D7">
<File Source="$(var.SourceDir)\Humanizer.dll"/>
</Component>
<Component Id="MahAppsMetro" Guid="D2955D07-F5C2-499E-A2B3-280746E1F4EF">
<File Source="$(var.SourceDir)\MahApps.Metro.dll"/>
</Component>
Expand Down Expand Up @@ -235,9 +232,6 @@
<Component Id="EFCoreBulkExtensionsCore" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA5E7">
<File Source="$(var.SourceDir)\EFCore.BulkExtensions.Core.dll"/>
</Component>
<Component Id="EFCoreBulkExtensionsMySql" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA5E8">
<File Source="$(var.SourceDir)\EFCore.BulkExtensions.MySql.dll"/>
</Component>
<Component Id="EFCoreBulkExtensionsPostgreSql" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA5E9">
<File Source="$(var.SourceDir)\EFCore.BulkExtensions.PostgreSql.dll"/>
</Component>
Expand Down Expand Up @@ -289,33 +283,9 @@
<File Source="$(var.SourceDir)\Microsoft.Data.Sqlite.dll"/>
</Component>

<!-- Firewall Helper -->
<Component Id="WindowsFirewallHelper" Guid="c6ee9767-649e-460d-925c-8469caefd274">
<File Source="$(var.SourceDir)\WindowsFirewallHelper.dll"/>
</Component>


<!-- System Components -->
<Component Id="SystemCompositionAttributedModel" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA6D2">
<File Source="$(var.SourceDir)\System.Composition.AttributedModel.dll"/>
</Component>
<Component Id="SystemCompositionConvention" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA6D3">
<File Source="$(var.SourceDir)\System.Composition.Convention.dll"/>
</Component>
<Component Id="SystemCompositionHosting" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA6D4">
<File Source="$(var.SourceDir)\System.Composition.Hosting.dll"/>
</Component>
<Component Id="SystemCompositionRuntime" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA6D5">
<File Source="$(var.SourceDir)\System.Composition.Runtime.dll"/>
</Component>
<Component Id="SystemCompositionTypedParts" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA6D6">
<File Source="$(var.SourceDir)\System.Composition.TypedParts.dll"/>
</Component>
<Component Id="SystemConfigurationConfigurationManager" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA6D7">
<File Source="$(var.SourceDir)\System.Configuration.ConfigurationManager.dll"/>
</Component>
<Component Id="SystemDiagnosticsEventLog" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA6D8">
<File Source="$(var.SourceDir)\System.Diagnostics.EventLog.dll"/>
</Component>
<Component Id="SystemMemoryData" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA6E1">
<File Source="$(var.SourceDir)\System.Memory.Data.dll"/>
</Component>
Expand Down Expand Up @@ -344,14 +314,12 @@
<!-- Windows Runtime Libraries -->
<Component Id="RuntimeWinLib" Guid="4E54BE2B-E403-48E5-AA1A-1CFC46ABA7A1">
<File Id="WinSystemManagement"
Source="$(var.SourceDir)\runtimes\win\lib\net8.0\System.Management.dll"
Source="$(var.SourceDir)\runtimes\win\lib\net9.0\System.Management.dll"
KeyPath="yes"/>
<File Id="WinSystemIOPorts"
Source="$(var.SourceDir)\runtimes\win\lib\net8.0\System.IO.Ports.dll"/>
<File Id="WinSystemDiagnosticsEventLog"
Source="$(var.SourceDir)\runtimes\win\lib\net8.0\System.Diagnostics.EventLog.dll"/>
Source="$(var.SourceDir)\runtimes\win\lib\net9.0\System.IO.Ports.dll"/>
<File Id="WinMicrosoftDataSqlClient"
Source="$(var.SourceDir)\runtimes\win\lib\net8.0\Microsoft.Data.SqlClient.dll"/>
Source="$(var.SourceDir)\runtimes\win\lib\net9.0\Microsoft.Data.SqlClient.dll"/>
</Component>

<!-- Windows x64 Native Libraries -->
Expand Down Expand Up @@ -392,4 +360,4 @@
<RegistryValue Root="HKCU" Key="Software\DAQifi\DAQifi Desktop" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</Package>
</Wix>
</Wix>
2 changes: 1 addition & 1 deletion Daqifi.Desktop.Setup/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.0",
"version": "9.0.0",
"rollForward": "latestMajor",
"allowPrerelease": true
}
Expand Down
Loading
Loading