Skip to content

Commit

Permalink
Merge pull request #740 from NickvisionApps/net8
Browse files Browse the repository at this point in the history
All - Update to .NET 8.0
  • Loading branch information
nlogozzo authored Nov 17, 2023
2 parents 7dc0896 + 539c970 commit d8697ab
Show file tree
Hide file tree
Showing 20 changed files with 73 additions and 139 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
dotnet-version: [ '7.0.x' ]
dotnet-version: [ '8.0.x' ]
steps:
- uses: actions/checkout@v3
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v3.2.0
with:
dotnet-version: ${{ matrix.dotnet-version }}
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ Once all changes to your translated file are made, make sure the file is in the

#### Structure

Denaro is built using .NET 7 and C#. With these technologies, Denaro is built for GNOME (Linux).
Denaro is built using .NET 8 and C#. With these technologies, Denaro is built for GNOME (Linux).
The solution is setup into 2 projects:
- NickvisionMoney.Shared
- NickvisionMoney.GNOME
Expand Down Expand Up @@ -191,7 +191,7 @@ Recommended IDEs:
You may also make your changes via any code editor and use [`flatpak-builder`](https://docs.flatpak.org/en/latest/flatpak-builder.html) to run the application locally through flatpak.

You may also build the app manually without using flatpak. List of dependencies:
- dotnet >=7.0
- dotnet >=8.0
- GTK >=4.12
- libadwaita >=1.4
- yelp (optional)
Expand Down
4 changes: 2 additions & 2 deletions NickvisionMoney.GNOME/NickvisionMoney.GNOME.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GirCore.Adw-1" Version="0.5.0-preview.3" />
<PackageReference Include="Nickvision.Aura" Version="2023.11.2" />
<PackageReference Include="Nickvision.Aura" Version="2023.11.3" />
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
</ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions NickvisionMoney.GNOME/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,13 @@ public Program(string[] args)
_mainWindow = null;
_mainWindowController = new MainWindowController(args);
_mainWindowController.AppInfo.Changelog =
@"* Fixed an issue where exported PDF values were incorrect
@"* Disallowed whitespace-only group and account names
* Fixed an issue where exported PDF values were incorrect
* Fixed an issue where some system cultures were not read properly
* Fixed an issue where scrolling the sidebar with the mouse over the calendar would scroll the calendar instead
* Disallowed whitespace-only group and account names
* Fixed an issue where leading or trailing spaces in group/account names aren't discarded
* Updated to GNOME 45 runtime with latest libadwaita design
* Updated to .NET 8.0
* Updated and added translations (Thanks to everyone on Weblate)!";
_application.OnActivate += OnActivate;
if (File.Exists(Path.GetFullPath(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)) + "/org.nickvision.money.gresource"))
Expand Down
3 changes: 2 additions & 1 deletion NickvisionMoney.GNOME/Views/AccountView.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using NickvisionMoney.GNOME.Controls;
using Nickvision.Aura.Events;
using NickvisionMoney.GNOME.Controls;
using NickvisionMoney.GNOME.Helpers;
using NickvisionMoney.Shared.Controllers;
using NickvisionMoney.Shared.Events;
Expand Down
2 changes: 1 addition & 1 deletion NickvisionMoney.GNOME/Views/MainWindow.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Nickvision.Aura.Events;
using NickvisionMoney.GNOME.Controls;
using NickvisionMoney.GNOME.Helpers;
using NickvisionMoney.Shared.Controllers;
using NickvisionMoney.Shared.Events;
using NickvisionMoney.Shared.Helpers;
using NickvisionMoney.Shared.Models;
using System;
Expand Down
80 changes: 40 additions & 40 deletions NickvisionMoney.GNOME/nuget-sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,17 +183,17 @@
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/meziantou.framework.win32.credentialmanager/1.4.2/meziantou.framework.win32.credentialmanager.1.4.2.nupkg",
"sha512": "75c861c9f4ea0eb3ec84f4dd6f369c57240975acc67f10d03913c969618f299adbc4e4be5d295db388d09a44b501c561f02f1aa78f2edea99f8cdefbafc2edfd",
"url": "https://api.nuget.org/v3-flatcontainer/meziantou.framework.win32.credentialmanager/1.4.5/meziantou.framework.win32.credentialmanager.1.4.5.nupkg",
"sha512": "4eba895ba3ff77d54c805c409188b914ba1b88690aaef2d87f99a4a5407cfc93a6564517b6655b23cae8e542d1eac0a445bbf15decb2499b6cb7a191ea8550cc",
"dest": "nuget-sources",
"dest-filename": "meziantou.framework.win32.credentialmanager.1.4.2.nupkg"
"dest-filename": "meziantou.framework.win32.credentialmanager.1.4.5.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.data.sqlite.core/7.0.13/microsoft.data.sqlite.core.7.0.13.nupkg",
"sha512": "cf20ba56a11be80936da443db31c205d3c8563ddba5ed921b9f3dc1856c5b5fb5338e7cc4d8fffc651bf64349bc2c712078b6bdd8091aa3ec43880ff165203fe",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.data.sqlite.core/8.0.0/microsoft.data.sqlite.core.8.0.0.nupkg",
"sha512": "0d014ed863345a3e2093293e1ab21ecda817cc64ceb0aa531b444494966d7f30161c7cd1f872c3b3f07b401b4f866a941810569f06b4e3296f169fe673cceb1b",
"dest": "nuget-sources",
"dest-filename": "microsoft.data.sqlite.core.7.0.13.nupkg"
"dest-filename": "microsoft.data.sqlite.core.8.0.0.nupkg"
},
{
"type": "file",
Expand All @@ -218,10 +218,10 @@
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/7.0.0/microsoft.win32.systemevents.7.0.0.nupkg",
"sha512": "18ee925b1ff0499205bf13a7ebb63a3a2206773f491828390910c36d2000bc10d079915bc9bbbdb043946fdc3fbd4950bfe0365da91315983d520d70fad81b59",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/8.0.0/microsoft.win32.systemevents.8.0.0.nupkg",
"sha512": "25016c508653fbf463c52d8fc3d2773b7c211c2402c4ea7b4aa987fb29c851d3f80c5e7abbcace2d4d5e061ae290524e8029afbc49a37d7e5186fe06aa4609b2",
"dest": "nuget-sources",
"dest-filename": "microsoft.win32.systemevents.7.0.0.nupkg"
"dest-filename": "microsoft.win32.systemevents.8.0.0.nupkg"
},
{
"type": "file",
Expand All @@ -232,10 +232,10 @@
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/nickvision.aura/2023.11.2/nickvision.aura.2023.11.2.nupkg",
"sha512": "919535507261fe0a41fcf9bece7016f4073a133328ee9d82462f20f0069b4be9678ecc2f3da2ed2cfebfdeb43e522a224eb536113efc0b62a7e4605723a90422",
"url": "https://api.nuget.org/v3-flatcontainer/nickvision.aura/2023.11.3/nickvision.aura.2023.11.3.nupkg",
"sha512": "80a7d1514433de2b08fce0f5315b722b1b3f8bda679ed38654ad1a14af065d5e31d284a19c975e208cd8a27aec5af52db644969fff3243334749a236cfc1ecfc",
"dest": "nuget-sources",
"dest-filename": "nickvision.aura.2023.11.2.nupkg"
"dest-filename": "nickvision.aura.2023.11.3.nupkg"
},
{
"type": "file",
Expand Down Expand Up @@ -447,13 +447,6 @@
"dest": "nuget-sources",
"dest-filename": "sqlitepclraw.bundle_e_sqlcipher.2.1.6.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.core/2.1.4/sqlitepclraw.core.2.1.4.nupkg",
"sha512": "4a654a227445d97e0c3c00223f819b90d64746e7b2483c4ff0b69ae02d6d3f22a68df7d6c00245aed6f2c51610dc29714fbe6765a8fbe42795f90448c04909d2",
"dest": "nuget-sources",
"dest-filename": "sqlitepclraw.core.2.1.4.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.core/2.1.6/sqlitepclraw.core.2.1.6.nupkg",
Expand Down Expand Up @@ -540,10 +533,10 @@
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/system.drawing.common/7.0.0/system.drawing.common.7.0.0.nupkg",
"sha512": "d1325de54dba8110e019afeba800601c2e4e0408b297b326de92333e029fa663d7150f021555b21a2fb89a411a08aef5e5588e043914da90b69c088fba72f0ed",
"url": "https://api.nuget.org/v3-flatcontainer/system.drawing.common/8.0.0/system.drawing.common.8.0.0.nupkg",
"sha512": "40a16c9c5dd59148051bd55a2355339343186ec188bcb8e9ea5abe0dc6035106e7d745323cc4d492750e791c41397c53616b553d79b8d5e5fc56dff3345ed533",
"dest": "nuget-sources",
"dest-filename": "system.drawing.common.7.0.0.nupkg"
"dest-filename": "system.drawing.common.8.0.0.nupkg"
},
{
"type": "file",
Expand Down Expand Up @@ -629,6 +622,13 @@
"dest": "nuget-sources",
"dest-filename": "system.memory.4.5.3.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.5/system.memory.4.5.5.nupkg",
"sha512": "e8c8e536c97b94ac3443c940b30dad43cf6e97dc7a8c3d989371048fe74e168606384f5e0143bdc0d86f7783bf9fdee8417964cb3a8a5d752713e90b125172dc",
"dest": "nuget-sources",
"dest-filename": "system.memory.4.5.5.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.0/system.net.http.4.3.0.nupkg",
Expand Down Expand Up @@ -911,44 +911,44 @@
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm/7.0.14/microsoft.aspnetcore.app.runtime.linux-arm.7.0.14.nupkg",
"sha512": "539cfe74fea5433f2255bbb6bb7afe545a98098f5299f8b667f2347cfeb45b2b71532f4e0d353bdd0b80195448367557003f4b11021325933845bc57a296f8d5",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm/8.0.0/microsoft.aspnetcore.app.runtime.linux-arm.8.0.0.nupkg",
"sha512": "b2ed21fb80189cae4e0835a3743e66d2cbdb0650716f5cf7936525c28c8c1246a478cc903d127913e5a7c98600d8cbcca673bfbb9117d14a18fceb54fb62d704",
"dest": "nuget-sources",
"dest-filename": "microsoft.aspnetcore.app.runtime.linux-arm.7.0.14.nupkg"
"dest-filename": "microsoft.aspnetcore.app.runtime.linux-arm.8.0.0.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm64/7.0.14/microsoft.aspnetcore.app.runtime.linux-arm64.7.0.14.nupkg",
"sha512": "d9fe593c0123e908bf6d34b3984dfb41688ab6b5a8e47c8383a5eba8cd0e6529bc4ce8a397d5b3d0d87a231a0270a82c45f1ecc890cb132a2bcc8566ed02e72a",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm64/8.0.0/microsoft.aspnetcore.app.runtime.linux-arm64.8.0.0.nupkg",
"sha512": "670fde6af5e976062ceded5dbabcfb772e292662b2a583665807ca7aa81243b41c054661cfad2c7c928db3f6d87a1eefb2ef26d2beb5b8e8c278b4ef0e6a310d",
"dest": "nuget-sources",
"dest-filename": "microsoft.aspnetcore.app.runtime.linux-arm64.7.0.14.nupkg"
"dest-filename": "microsoft.aspnetcore.app.runtime.linux-arm64.8.0.0.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-x64/7.0.14/microsoft.aspnetcore.app.runtime.linux-x64.7.0.14.nupkg",
"sha512": "01e3f1f12046e02cd8483dc7025fec4ce57d00efd1c042ec1aad5c482505b44743f4450ff55eb27c32adc8f3b10ea03e0cd720f7b55c73c0ef2ed5c095f2fbea",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-x64/8.0.0/microsoft.aspnetcore.app.runtime.linux-x64.8.0.0.nupkg",
"sha512": "741c423cd7f1e919f292f049fe3edf42a086c44529230617a7577929804765e3500174da79e09d3027276059b143df400f934e0c521d8682e10256f13c10dc25",
"dest": "nuget-sources",
"dest-filename": "microsoft.aspnetcore.app.runtime.linux-x64.7.0.14.nupkg"
"dest-filename": "microsoft.aspnetcore.app.runtime.linux-x64.8.0.0.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm/7.0.14/microsoft.netcore.app.runtime.linux-arm.7.0.14.nupkg",
"sha512": "726ebce4758228d66f30c1e97b2e130e40b157b447ae052d19211b3844b6473aec392583982fc4c5f179018b939c9da50aa5e80747b02d00081337131565094c",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm/8.0.0/microsoft.netcore.app.runtime.linux-arm.8.0.0.nupkg",
"sha512": "d6bd8f7f428a33ac1a0311965a1cbea1eb34268f556e705531718ac5d6ae416f2c497ce783415b987cd4ca867708e9f4d08cb3723e5ff7c160861d4a4f5cfe59",
"dest": "nuget-sources",
"dest-filename": "microsoft.netcore.app.runtime.linux-arm.7.0.14.nupkg"
"dest-filename": "microsoft.netcore.app.runtime.linux-arm.8.0.0.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm64/7.0.14/microsoft.netcore.app.runtime.linux-arm64.7.0.14.nupkg",
"sha512": "59d9aa61f657406c6f7d392d3b692e3ba31d7a5e3a935468ac11640d1bff1dee5598034b9ad967696ba09e780f617a70bee9fa8baeec3fd6c872a33ae3dd4980",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm64/8.0.0/microsoft.netcore.app.runtime.linux-arm64.8.0.0.nupkg",
"sha512": "668bcba1c14784367d276cde2449d9028bf699febd13a9fcd1d83a4a2df9bf7ad5f11d66c812061553668ea70e15ceca090c1dfd0a94b292192dfd56b14706ca",
"dest": "nuget-sources",
"dest-filename": "microsoft.netcore.app.runtime.linux-arm64.7.0.14.nupkg"
"dest-filename": "microsoft.netcore.app.runtime.linux-arm64.8.0.0.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-x64/7.0.14/microsoft.netcore.app.runtime.linux-x64.7.0.14.nupkg",
"sha512": "00cc67d89ffc477dff76ded60a8f03cc70fc7eaf119860c827f7e8d2ae4486b5aef7064db6564fa6d3fcf1f64a7efd0ea77ff063f3a3c580baf6ffecff63f46e",
"url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-x64/8.0.0/microsoft.netcore.app.runtime.linux-x64.8.0.0.nupkg",
"sha512": "19b93e3a957813c642265138589f068aaea47f23e0773c4001a635fee882111e417d8ba26e51122a7543950cfc015e1a714df39105da777821cc278b23849efb",
"dest": "nuget-sources",
"dest-filename": "microsoft.netcore.app.runtime.linux-x64.7.0.14.nupkg"
"dest-filename": "microsoft.netcore.app.runtime.linux-x64.8.0.0.nupkg"
}
]
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NickvisionMoney.Shared\NickvisionMoney.Shared.csproj" />
<ProjectReference Include="..\NickvisionMoney.Shared\NickvisionMoney.Shared.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Nickvision.Aura;
using Nickvision.Aura.Events;
using NickvisionMoney.Shared.Events;
using NickvisionMoney.Shared.Helpers;
using NickvisionMoney.Shared.Models;
Expand Down
2 changes: 1 addition & 1 deletion NickvisionMoney.Shared/Controllers/MainWindowController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Nickvision.Aura;
using NickvisionMoney.Shared.Events;
using Nickvision.Aura.Events;
using NickvisionMoney.Shared.Models;
using System;
using System.Collections.Generic;
Expand Down
41 changes: 0 additions & 41 deletions NickvisionMoney.Shared/Events/NotificationSentEventArgs.cs

This file was deleted.

12 changes: 0 additions & 12 deletions NickvisionMoney.Shared/Events/NotificationSeverity.cs

This file was deleted.

23 changes: 0 additions & 23 deletions NickvisionMoney.Shared/Events/ShellNotificationSentEventArgs.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,13 @@
<releases>
<release version="2023.11.0-next" date="2023-11-14">
<description translatable="no">
<p>- Disallowed whitespace-only group and account names</p>
<p>- Fixed an issue where exported PDF values were incorrect</p>
<p>- Fixed an issue where some system cultures were not read properly</p>
<p>- Fixed an issue where scrolling the sidebar with the mouse over the calendar would scroll the calendar instead</p>
<p>- Disallowed whitespace-only group and account names</p>
<p>- Fixed an issue where leading or trailing spaces in group/account names aren't discarded</p>
<p>- Updated to GNOME 45 runtime with latest libadwaita design</p>
<p>- Updated to .NET 8.0</p>
<p>- Updated translations (Thanks to everyone on Weblate)!</p>
</description>
</release>
Expand Down
6 changes: 3 additions & 3 deletions NickvisionMoney.Shared/NickvisionMoney.Shared.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand All @@ -26,8 +26,8 @@
<PackageReference Include="Docnet.Core" Version="2.6.0" />
<PackageReference Include="GetText.NET" Version="1.9.14" />
<PackageReference Include="Hazzik.Qif" Version="1.0.3" />
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.13" />
<PackageReference Include="Nickvision.Aura" Version="2023.11.2" />
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.0" />
<PackageReference Include="Nickvision.Aura" Version="2023.11.3" />
<PackageReference Include="OfxSharp.NetStandard" Version="1.0.0" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
<PackageReference Include="PdfSharpCore" Version="1.3.62" />
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ The Linux version of this app is designed for GNOME and optimized for the defaul
```

# Dependencies
- [.NET 7](https://dotnet.microsoft.com/en-us/)
- [.NET 8](https://dotnet.microsoft.com/en-us/)

# Code of Conduct
This project follows the [GNOME Code of Conduct](https://wiki.gnome.org/Foundation/CodeOfConduct).
Loading

0 comments on commit d8697ab

Please sign in to comment.