Skip to content

Commit c72b9fe

Browse files
authored
Update Baballonia to target NET 10 (#213)
* Update projects to net1.0 * Update nuget packages to NET 10 - Remove SoundFlow from project * Update build.yml
1 parent d259c59 commit c72b9fe

File tree

16 files changed

+56
-57
lines changed

16 files changed

+56
-57
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
- name: Run publish
5757
run: |
5858
cd src/Baballonia.Desktop
59-
dotnet publish -r ${{ matrix.arch }} -c Release --self-contained -f net8.0
60-
cd "bin/Release/net8.0/${{ matrix.arch }}/publish"
59+
dotnet publish -r ${{ matrix.arch }} -c Release --self-contained -f net10.0
60+
cd "bin/Release/net10.0/${{ matrix.arch }}/publish"
6161
tar -cJf ./../../../../${{ matrix.result }} *
6262
6363
- name: Upload artifact
@@ -92,8 +92,8 @@ jobs:
9292
- name: Build project
9393
run: |
9494
cd src/Baballonia.Desktop
95-
dotnet publish -r win-x64 -c Release --self-contained -f net8.0
96-
cd "bin/Release/net8.0/win-x64/publish"
95+
dotnet publish -r win-x64 -c Release --self-contained -f net10.0
96+
cd "bin/Release/net10.0/win-x64/publish"
9797
tar -cJf ./../../../../Baballonia.win.tar.xz *
9898
9999
- name: Run makensis

src/Baballonia.Android/Baballonia.Android.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0-android</TargetFramework>
4+
<TargetFramework>net10.0-android</TargetFramework>
55
<SupportedOSPlatformVersion>24</SupportedOSPlatformVersion>
66
<ApplicationId>com.MammaMiaDev.AvaloniaMiaDev</ApplicationId>
77
<ApplicationVersion>1</ApplicationVersion>

src/Baballonia.CaptureBin.IO/Baballonia.CaptureBin.IO.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

src/Baballonia.Desktop/Baballonia.Desktop.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
44
<!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
5-
One for Windows with net8.0-windows TFM, one for MacOS with net8.0-macos and one with net8.0 TFM for Linux.-->
6-
<TargetFramework>net8.0</TargetFramework>
5+
One for Windows with net10.0-windows TFM, one for MacOS with net10.0-macos and one with net10.0 TFM for Linux.-->
6+
<TargetFramework>net10.0</TargetFramework>
77
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
88
<ApplicationIcon>Assets\IconOpaque.ico</ApplicationIcon>
99
<Company>Paradigm Reality Enhancement Labs</Company>
@@ -21,18 +21,18 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Avalonia.Desktop" Version="11.3.4" />
24+
<PackageReference Include="Avalonia.Desktop" Version="11.3.11" />
2525
<PackageReference Include="Velopack" Version="0.0.1298" />
2626

2727
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
28-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.0" />
29-
<PackageReference Include="Avalonia.Skia" Version="11.3.4" />
30-
<PackageReference Include="SkiaSharp" Version="3.119.0" />
28+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.11" />
29+
<PackageReference Include="Avalonia.Skia" Version="11.3.11" />
30+
<PackageReference Include="SkiaSharp" Version="3.119.2" />
3131

3232
<!-- Windows-specific -->
3333
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.11.0.20250507" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
34-
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.22.1" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
35-
<PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.119.0" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
34+
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.23.0" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
35+
<PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.119.2" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
3636
<PackageReference Include="DirectShowLib" Version="1.0.0" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
3737

3838
<!-- macOS-specific -->

src/Baballonia.Desktop/main.nsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,25 +74,25 @@
7474
SetOutPath "$INSTDIR"
7575

7676
;Copy all files except Calibration, Firmware and publish folders
77-
File /r /x "Calibration" /x "Firmware" "bin\Release\net8.0\win-x64\publish\*"
77+
File /r /x "Calibration" /x "Firmware" "bin\Release\net10.0\win-x64\publish\*"
7878

7979
;Create Firmware directory
8080
CreateDirectory "$INSTDIR\Firmware"
8181

8282
;Copy Windows-only Firmware tooling
8383
CreateDirectory "$INSTDIR\Firmware\Windows"
8484
SetOutPath "$INSTDIR\Firmware\Windows"
85-
File /r "bin\Release\net8.0\win-x64\publish\Firmware\Windows\*"
85+
File /r "bin\Release\net10.0\win-x64\publish\Firmware\Windows\*"
8686

8787
;Copy firmware over
8888
CreateDirectory "$INSTDIR\Firmware\Binaries"
8989
SetOutPath "$INSTDIR\Firmware\Binaries"
90-
File /r "bin\Release\net8.0\win-x64\publish\Firmware\Binaries\*"
90+
File /r "bin\Release\net10.0\win-x64\publish\Firmware\Binaries\*"
9191

9292
;Create Windows-only Calibration tooling
9393
CreateDirectory "$INSTDIR\Calibration"
9494
SetOutPath "$INSTDIR\Calibration"
95-
File /r "bin\Release\net8.0\win-x64\publish\Calibration\Windows"
95+
File /r "bin\Release\net10.0\win-x64\publish\Calibration\Windows"
9696

9797
;Reset output path and write registry values
9898
SetOutPath "$INSTDIR"

src/Baballonia.FastCorruptionDetector/Baballonia.FastCorruptionDetector.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

src/Baballonia.IPCameraCapture/Baballonia.IPCameraCapture.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

src/Baballonia.LibV4L2Capture/Baballonia.LibV4L2Capture.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/Baballonia.OpenCVCapture/Baballonia.OpenCVCapture.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

src/Baballonia.SDK/Baballonia.SDK.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.8" />
11-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
10+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.2" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
1212
<PackageReference Include="OpenCvSharp4" Version="4.11.0.20250507" />
1313
</ItemGroup>
1414

0 commit comments

Comments
 (0)