Skip to content

Commit e1a4b5b

Browse files
nlogozzonlogozzo
committed
feat: Update deps
1 parent 607173e commit e1a4b5b

10 files changed

Lines changed: 80 additions & 64 deletions

File tree

‎Nickvision.Application.GNOME/Nickvision.Application.GNOME.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
<Nullable>enable</Nullable>
99
<OutputType>Exe</OutputType>
1010
<Platforms>AnyCPU;ARM64;x64</Platforms>
11-
<Version>2026.2.0</Version>
11+
<Version>2026.3.0</Version>
12+
<PublishAot>true</PublishAot>
1213
</PropertyGroup>
1314

1415
<ItemGroup>
1516
<PackageReference Include="GirCore.Adw-1" Version="0.7.0" />
16-
<PackageReference Include="Nickvision.Desktop.GNOME" Version="2026.3.2" />
17+
<PackageReference Include="Nickvision.Desktop.GNOME" Version="2026.3.3" />
1718
</ItemGroup>
1819
<ItemGroup>
1920
<ProjectReference Include="..\Nickvision.Application.Shared\Nickvision.Application.Shared.csproj" />

‎Nickvision.Application.Shared/Controllers/MainWindowController.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Microsoft.Extensions.Logging;
2+
using Nickvision.Application.Shared.Helpers;
23
using Nickvision.Application.Shared.Models;
34
using Nickvision.Application.Shared.Services;
45
using Nickvision.Desktop.Application;
@@ -32,7 +33,7 @@ public MainWindowController(ILogger<MainWindowController> logger, AppInfo appInf
3233
_translationService = translationService;
3334
_updaterService = updaterService;
3435
_latestVersion = appInfo.Version!;
35-
_translationService.Language = _jsonFileService.Load<Configuration>(Configuration.Key).TranslationLanguage;
36+
_translationService.Language = _jsonFileService.Load(ApplicationJsonContext.Default.Configuration, Configuration.Key).TranslationLanguage;
3637
_logger.LogInformation($"Received command-line arguments: [{string.Join(", ", argumentsService.Data)}]");
3738
// Translate strings
3839
_appInfo.ShortName = _translationService._("Application");
@@ -58,24 +59,24 @@ public MainWindowController(ILogger<MainWindowController> logger, AppInfo appInf
5859
var _ => _translationService._("Good Day!")
5960
};
6061

61-
public Theme Theme => _jsonFileService.Load<Configuration>(Configuration.Key).Theme;
62+
public Theme Theme => _jsonFileService.Load(ApplicationJsonContext.Default.Configuration, Configuration.Key).Theme;
6263

6364
public WindowGeometry WindowGeometry
6465
{
65-
get => _jsonFileService.Load<Configuration>(Configuration.Key).WindowGeometry;
66+
get => _jsonFileService.Load(ApplicationJsonContext.Default.Configuration, Configuration.Key).WindowGeometry;
6667

6768
set
6869
{
69-
var config = _jsonFileService.Load<Configuration>(Configuration.Key);
70+
var config = _jsonFileService.Load(ApplicationJsonContext.Default.Configuration, Configuration.Key);
7071
config.WindowGeometry = value;
71-
_jsonFileService.Save(config, Configuration.Key);
72+
_jsonFileService.Save(config, ApplicationJsonContext.Default.Configuration, Configuration.Key);
7273
}
7374
}
7475

7576
public async Task CheckForUpdatesAsync(bool showNotificationForNoUpdates)
7677
{
7778
_logger.LogInformation("Checking for updates...");
78-
var config = _jsonFileService.Load<Configuration>(Configuration.Key);
79+
var config = _jsonFileService.Load(ApplicationJsonContext.Default.Configuration, Configuration.Key);
7980
var stableVersion = await _updaterService.GetLatestStableVersionAsync();
8081
if (stableVersion is not null)
8182
{

‎Nickvision.Application.Shared/Controllers/PreferencesViewController.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Nickvision.Application.Shared.Models;
1+
using Nickvision.Application.Shared.Helpers;
2+
using Nickvision.Application.Shared.Models;
23
using Nickvision.Desktop.Application;
34
using Nickvision.Desktop.Filesystem;
45
using Nickvision.Desktop.Globalization;
@@ -22,7 +23,7 @@ public PreferencesViewController(IJsonFileService jsonFileService, ITranslationS
2223
{
2324
_jsonFileService = jsonFileService;
2425
_translationService = translationService;
25-
_configuration = _jsonFileService.Load<Configuration>(Configuration.Key);
26+
_configuration = _jsonFileService.Load(ApplicationJsonContext.Default.Configuration, Configuration.Key);
2627
AvailableTranslationLanguages = new List<SelectionItem<string>>()
2728
{
2829
new SelectionItem<string>(string.Empty, _translationService._("System"), string.IsNullOrEmpty(_configuration.TranslationLanguage)),
@@ -58,5 +59,5 @@ public bool AllowPreviewUpdates
5859
set => _configuration.AllowPreviewUpdates = value;
5960
}
6061

61-
public Task SaveConfigurationAsync() => _jsonFileService.SaveAsync(_configuration, Configuration.Key);
62+
public Task SaveConfigurationAsync() => _jsonFileService.SaveAsync(_configuration, ApplicationJsonContext.Default.Configuration, Configuration.Key);
6263
}

‎Nickvision.Application.Shared/Helpers/ApplicationJsonContext.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using Nickvision.Application.Shared.Models;
2+
using System.Text.Json.Serialization;
3+
4+
namespace Nickvision.Application.Shared.Helpers;
5+
6+
[JsonSourceGenerationOptions(DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull, WriteIndented = true)]
7+
[JsonSerializable(typeof(Configuration))]
8+
public partial class ApplicationJsonContext : JsonSerializerContext
9+
{
10+
11+
}

‎Nickvision.Application.Shared/Helpers/HostApplicationBuilderExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public IHostApplicationBuilder ConfigureApplication(string[] args)
1818
{
1919
var appInfo = new AppInfo("org.nickvision.application", "Nickvision Application", "Application")
2020
{
21-
Version = new AppVersion("2026.2.0-next"),
21+
Version = new AppVersion("2026.3.0-next"),
2222
Changelog = "- Initial release",
2323
SourceRepository = new Uri("https://github.com/NickvisionApps/Application"),
2424
IssueTracker = new Uri("https://github.com/NickvisionApps/Application/issues/new"),

‎Nickvision.Application.Shared/Nickvision.Application.Shared.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
<ImplicitUsings>disable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99
<Platforms>AnyCPU;ARM64;x64</Platforms>
10-
<Version>2026.2.0</Version>
10+
<Version>2026.3.0</Version>
11+
<IsAotCompatible>true</IsAotCompatible>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
14-
<PackageReference Include="Nickvision.Desktop" Version="2026.3.3" />
15+
<PackageReference Include="Nickvision.Desktop" Version="2026.3.4" />
1516
<PackageReference Include="NReco.Logging.File" Version="1.3.1" />
1617
</ItemGroup>
1718

‎Nickvision.Application.WinUI/Nickvision.Application.WinUI.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
<WindowsPackageType>None</WindowsPackageType>
1919
<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
2020
<StartupObject>Nickvision.Application.WinUI.Program</StartupObject>
21-
<Version>2026.2.0</Version>
21+
<Version>2026.3.0</Version>
22+
<PublishAot>true</PublishAot>
2223
</PropertyGroup>
2324

2425
<ItemGroup>
@@ -32,8 +33,8 @@
3233
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.251219" />
3334
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.251219" />
3435
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705" />
35-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260209005" />
36-
<PackageReference Include="Nickvision.Desktop.WinUI" Version="2026.3.1" />
36+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260317003" />
37+
<PackageReference Include="Nickvision.Desktop.WinUI" Version="2026.3.2" />
3738
</ItemGroup>
3839
<ItemGroup>
3940
<ProjectReference Include="..\Nickvision.Application.Shared\Nickvision.Application.Shared.csproj" />

‎resources/linux/org.nickvision.application.metainfo.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<display_length compare="ge">360</display_length>
4848
</requires>
4949
<releases>
50-
<release version="2026.2.0-next" date="2026-02-01">
50+
<release version="2026.3.0-next" date="2026-03-01">
5151
<description translate="no">
5252
<p>- Initial Release</p>
5353
</description>

‎resources/po/application.pot‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2026-03-11 20:58-0400\n"
11+
"POT-Creation-Date: 2026-03-20 09:45-0400\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,93 +123,93 @@ msgstr[1] ""
123123
msgid "GitHub Repo"
124124
msgstr ""
125125

126-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:38
126+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:39
127127
msgid "Application"
128128
msgstr ""
129129

130-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:39
130+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:40
131131
msgid "Create new Nickvision applications."
132132
msgstr ""
133133

134-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:40
134+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:41
135135
msgid "Matrix Chat"
136136
msgstr ""
137137

138-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:41
139-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:43
138+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:42
139+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:44
140140
msgid "Nicholas Logozzo"
141141
msgstr ""
142142

143-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:42
143+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:43
144144
msgid "Contributors on GitHub ❤️"
145145
msgstr ""
146146

147-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:44
147+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:45
148148
msgid "Fyodor Sobolev"
149149
msgstr ""
150150

151-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:45
151+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:46
152152
msgid "DaPigGuy"
153153
msgstr ""
154154

155-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:46
155+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:47
156156
msgid "David Lapshin"
157157
msgstr ""
158158

159-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:47
159+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:48
160160
msgid "translation-credits"
161161
msgstr ""
162162

163-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:54
163+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:55
164164
msgctxt "Night"
165165
msgid "Good Morning!"
166166
msgstr ""
167167

168-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:55
168+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:56
169169
msgctxt "Morning"
170170
msgid "Good Morning!"
171171
msgstr ""
172172

173-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:56
173+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:57
174174
msgid "Good Afternoon!"
175175
msgstr ""
176176

177-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:57
177+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:58
178178
msgid "Good Evening!"
179179
msgstr ""
180180

181-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:58
181+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:59
182182
msgid "Good Day!"
183183
msgstr ""
184184

185-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:97
185+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:98
186186
#, csharp-format
187187
msgid "New {0} update available: {1}"
188188
msgstr ""
189189

190-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:108
190+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:109
191191
msgid "No update available"
192192
msgstr ""
193193

194-
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:124
194+
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:125
195195
msgid "Unable to download and install the update"
196196
msgstr ""
197197

198-
#: Nickvision.Application.Shared/Controllers/PreferencesViewController.cs:28
198+
#: Nickvision.Application.Shared/Controllers/PreferencesViewController.cs:29
199199
msgid "System"
200200
msgstr ""
201201

202-
#: Nickvision.Application.Shared/Controllers/PreferencesViewController.cs:39
202+
#: Nickvision.Application.Shared/Controllers/PreferencesViewController.cs:40
203203
msgctxt "Theme"
204204
msgid "Light"
205205
msgstr ""
206206

207-
#: Nickvision.Application.Shared/Controllers/PreferencesViewController.cs:40
207+
#: Nickvision.Application.Shared/Controllers/PreferencesViewController.cs:41
208208
msgctxt "Theme"
209209
msgid "Dark"
210210
msgstr ""
211211

212-
#: Nickvision.Application.Shared/Controllers/PreferencesViewController.cs:41
212+
#: Nickvision.Application.Shared/Controllers/PreferencesViewController.cs:42
213213
msgctxt "Theme"
214214
msgid "System"
215215
msgstr ""

0 commit comments

Comments
 (0)