diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a23d98f9e..bc2a75824 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 683d70171..6ab097f3f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 @@ -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) diff --git a/NickvisionMoney.GNOME/NickvisionMoney.GNOME.csproj b/NickvisionMoney.GNOME/NickvisionMoney.GNOME.csproj index 49d12bf81..1c8ba127a 100644 --- a/NickvisionMoney.GNOME/NickvisionMoney.GNOME.csproj +++ b/NickvisionMoney.GNOME/NickvisionMoney.GNOME.csproj @@ -2,14 +2,14 @@ Exe - net7.0 + net8.0 enable true - + diff --git a/NickvisionMoney.GNOME/Program.cs b/NickvisionMoney.GNOME/Program.cs index 3b6a58101..2b9af08a4 100644 --- a/NickvisionMoney.GNOME/Program.cs +++ b/NickvisionMoney.GNOME/Program.cs @@ -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")) diff --git a/NickvisionMoney.GNOME/Views/AccountView.cs b/NickvisionMoney.GNOME/Views/AccountView.cs index e4cd765ce..2b94bd12f 100644 --- a/NickvisionMoney.GNOME/Views/AccountView.cs +++ b/NickvisionMoney.GNOME/Views/AccountView.cs @@ -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; diff --git a/NickvisionMoney.GNOME/Views/MainWindow.cs b/NickvisionMoney.GNOME/Views/MainWindow.cs index 5eb6c1973..0f2d34320 100644 --- a/NickvisionMoney.GNOME/Views/MainWindow.cs +++ b/NickvisionMoney.GNOME/Views/MainWindow.cs @@ -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; diff --git a/NickvisionMoney.GNOME/nuget-sources.json b/NickvisionMoney.GNOME/nuget-sources.json index 1606895a8..1627f4d47 100644 --- a/NickvisionMoney.GNOME/nuget-sources.json +++ b/NickvisionMoney.GNOME/nuget-sources.json @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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" } ] \ No newline at end of file diff --git a/NickvisionMoney.Shared.Tests/NickvisionMoney.Shared.Tests.csproj b/NickvisionMoney.Shared.Tests/NickvisionMoney.Shared.Tests.csproj index 60f207154..6b07a0a3b 100644 --- a/NickvisionMoney.Shared.Tests/NickvisionMoney.Shared.Tests.csproj +++ b/NickvisionMoney.Shared.Tests/NickvisionMoney.Shared.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable @@ -22,7 +22,7 @@ - + diff --git a/NickvisionMoney.Shared/Controllers/AccountViewController.cs b/NickvisionMoney.Shared/Controllers/AccountViewController.cs index 7d920b125..fe3f2181a 100644 --- a/NickvisionMoney.Shared/Controllers/AccountViewController.cs +++ b/NickvisionMoney.Shared/Controllers/AccountViewController.cs @@ -1,4 +1,5 @@ using Nickvision.Aura; +using Nickvision.Aura.Events; using NickvisionMoney.Shared.Events; using NickvisionMoney.Shared.Helpers; using NickvisionMoney.Shared.Models; diff --git a/NickvisionMoney.Shared/Controllers/MainWindowController.cs b/NickvisionMoney.Shared/Controllers/MainWindowController.cs index 55942a9a2..c66a2d9a8 100644 --- a/NickvisionMoney.Shared/Controllers/MainWindowController.cs +++ b/NickvisionMoney.Shared/Controllers/MainWindowController.cs @@ -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; diff --git a/NickvisionMoney.Shared/Events/NotificationSentEventArgs.cs b/NickvisionMoney.Shared/Events/NotificationSentEventArgs.cs deleted file mode 100644 index 1b4742fca..000000000 --- a/NickvisionMoney.Shared/Events/NotificationSentEventArgs.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; - -namespace NickvisionMoney.Shared.Events; - -/// -/// Event args for when a notification is sent -/// -public class NotificationSentEventArgs : EventArgs -{ - /// - /// The message of the notification - /// - public string Message { get; set; } - /// - /// The severity of the notification - /// - public NotificationSeverity Severity { get; set; } - /// - /// Additional action for notification - /// - public string Action { get; set; } - /// - /// Parameter for additional action - /// - public string ActionParam { get; set; } - - /// - /// Constructs a NotificationSentEventArgs - /// - /// The message of the notification - /// The severity of the notification - /// Additional action for notification - /// Parameter for additional action - public NotificationSentEventArgs(string message, NotificationSeverity severity, string action = "", string actionParam = "") - { - Message = message; - Severity = severity; - Action = action; - ActionParam = actionParam; - } -} \ No newline at end of file diff --git a/NickvisionMoney.Shared/Events/NotificationSeverity.cs b/NickvisionMoney.Shared/Events/NotificationSeverity.cs deleted file mode 100644 index 8aebda77b..000000000 --- a/NickvisionMoney.Shared/Events/NotificationSeverity.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace NickvisionMoney.Shared.Events; - -/// -/// Severities for a notification -/// -public enum NotificationSeverity -{ - Informational = 0, - Success, - Warning, - Error -} \ No newline at end of file diff --git a/NickvisionMoney.Shared/Events/ShellNotificationSentEventArgs.cs b/NickvisionMoney.Shared/Events/ShellNotificationSentEventArgs.cs deleted file mode 100644 index 12ff8c042..000000000 --- a/NickvisionMoney.Shared/Events/ShellNotificationSentEventArgs.cs +++ /dev/null @@ -1,23 +0,0 @@ -using NickvisionMoney.Shared.Events; - -/// -/// Event args for when a notification is sent -/// -public class ShellNotificationSentEventArgs : NotificationSentEventArgs -{ - /// - /// The title of the notification - /// - public string Title { get; set; } - - /// - /// Constructs a ShellNotificationSentEventArgs - /// - /// The title of the notification - /// The message of the notification - /// The severity of the notification - public ShellNotificationSentEventArgs(string title, string message, NotificationSeverity severity) : base(message, severity) - { - Title = title; - } -} diff --git a/NickvisionMoney.Shared/Linux/org.nickvision.money.metainfo.xml.in b/NickvisionMoney.Shared/Linux/org.nickvision.money.metainfo.xml.in index b63ae59df..a03189a88 100644 --- a/NickvisionMoney.Shared/Linux/org.nickvision.money.metainfo.xml.in +++ b/NickvisionMoney.Shared/Linux/org.nickvision.money.metainfo.xml.in @@ -49,12 +49,13 @@ +

- 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 translations (Thanks to everyone on Weblate)!

 diff --git a/NickvisionMoney.Shared/NickvisionMoney.Shared.csproj b/NickvisionMoney.Shared/NickvisionMoney.Shared.csproj index 39f92b328..5aee39d23 100644 --- a/NickvisionMoney.Shared/NickvisionMoney.Shared.csproj +++ b/NickvisionMoney.Shared/NickvisionMoney.Shared.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable @@ -26,8 +26,8 @@ - - + + diff --git a/README.md b/README.md index 6890d8cb8..3305b54f7 100644 --- a/README.md +++ b/README.md @@ -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). diff --git a/flatpak/NuGet.config b/flatpak/NuGet.config index ff64873e6..4aab2af76 100644 --- a/flatpak/NuGet.config +++ b/flatpak/NuGet.config @@ -1,6 +1,11 @@ + + + + + diff --git a/flatpak/build.sh b/flatpak/build.sh index 76633614c..9c8337ab5 100755 --- a/flatpak/build.sh +++ b/flatpak/build.sh @@ -12,6 +12,7 @@ if [ -d "nuget-sources" ] then mv flatpak/NuGet.config ./ fi + dotnet tool restore dotnet cake --target=Publish --prefix=/app --ui=$1 --self-contained diff --git a/flatpak/org.nickvision.money.json b/flatpak/org.nickvision.money.json index b8717f323..bfec59b52 100644 --- a/flatpak/org.nickvision.money.json +++ b/flatpak/org.nickvision.money.json @@ -4,12 +4,12 @@ "runtime-version" : "45", "sdk" : "org.gnome.Sdk", "sdk-extensions": [ - "org.freedesktop.Sdk.Extension.dotnet7" + "org.freedesktop.Sdk.Extension.dotnet8" ], "build-options": { - "append-path": "/usr/lib/sdk/dotnet7/bin", - "append-ld-library-path": "/usr/lib/sdk/dotnet7/lib", - "append-pkg-config-path": "/usr/lib/sdk/dotnet7/lib/pkgconfig" + "append-path": "/usr/lib/sdk/dotnet8/bin", + "append-ld-library-path": "/usr/lib/sdk/dotnet8/lib", + "append-pkg-config-path": "/usr/lib/sdk/dotnet8/lib/pkgconfig" }, "command" : "org.nickvision.money", "finish-args":[ diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 270442338..901b125e8 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -22,7 +22,7 @@ parts: craftctl default wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh chmod +x ./dotnet-install.sh - ./dotnet-install.sh --channel 7.0 + ./dotnet-install.sh --channel 8.0 patch -p1 < $CRAFT_PROJECT_DIR/snap/denaro.patch override-build: | export DOTNET_ROOT=$HOME/.dotnet