Skip to content

Commit 94ecd93

Browse files
Upgrade dependencies
1 parent e7ca748 commit 94ecd93

File tree

5 files changed

+15
-109
lines changed

5 files changed

+15
-109
lines changed

KeyboardSwitch.Settings.Core/KeyboardSwitch.Settings.Core.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="akavache" Version="6.10.20" />
19-
<PackageReference Include="DynamicData" Version="6.16.2" />
20-
<PackageReference Include="Fody" Version="6.2.1">
19+
<PackageReference Include="DynamicData" Version="6.16.3" />
20+
<PackageReference Include="Fody" Version="6.2.4">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>
@@ -29,10 +29,10 @@
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3131
</PackageReference>
32-
<PackageReference Include="ReactiveUI" Version="11.5.1" />
33-
<PackageReference Include="ReactiveUI.Fody" Version="11.5.1" />
32+
<PackageReference Include="ReactiveUI" Version="11.5.17" />
33+
<PackageReference Include="ReactiveUI.Fody" Version="11.5.17" />
3434
<PackageReference Include="ReactiveUI.Validation" Version="1.5.5" />
35-
<PackageReference Include="Splat" Version="9.5.13" />
35+
<PackageReference Include="Splat" Version="9.5.20" />
3636
<PackageReference Include="System.Interactive" Version="4.1.1" />
3737
<PackageReference Include="System.Interactive.Async" Version="4.1.1" />
3838
<PackageReference Include="System.Reactive" Version="4.4.1" />

KeyboardSwitch.Settings/App.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@ private void ConfigureSuspensionDriver()
170170
GC.KeepAlive(autoSuspendHelper);
171171

172172
RxApp.SuspensionHost.CreateNewAppState = () => new AppState();
173-
RxApp.SuspensionHost.SetupDefaultSuspendResumeCorrect();
173+
RxApp.SuspensionHost.SetupDefaultSuspendResume();
174174

175175
autoSuspendHelper.OnFrameworkInitializationCompleted();
176176
}
177177

178178
private async Task<MainWindow> CreateMainWindow(MainViewModel viewModel)
179179
{
180-
var state = await RxApp.SuspensionHost.ObserveAppStateCorrect<AppState>().Take(1);
180+
var state = await RxApp.SuspensionHost.ObserveAppState<AppState>().Take(1);
181181

182182
var window = new MainWindow
183183
{
@@ -212,7 +212,7 @@ private void SaveAppState()
212212
return;
213213
}
214214

215-
var state = RxApp.SuspensionHost.GetAppStateCorrect<AppState>();
215+
var state = RxApp.SuspensionHost.GetAppState<AppState>();
216216

217217
state.WindowWidth = this.desktop.MainWindow.Width;
218218
state.WindowHeight = this.desktop.MainWindow.Height;

KeyboardSwitch.Settings/Infrastructure/BindingHook.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public sealed class BindingHook : IPropertyBindingHook
2626
true);
2727

2828
public bool ExecuteHook(
29-
object source,
29+
object? source,
3030
object target,
3131
Func<IObservedChange<object, object>[]> getCurrentViewModelProperties,
3232
Func<IObservedChange<object, object>[]> getCurrentViewProperties,

KeyboardSwitch.Settings/Infrastructure/SuspensionHostExtensions.cs

Lines changed: 0 additions & 94 deletions
This file was deleted.

KeyboardSwitch.Settings/KeyboardSwitch.Settings.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<PackageReference Include="Avalonia.Desktop" Version="0.9.12" />
5656
<PackageReference Include="Avalonia.ReactiveUI" Version="0.9.12" />
5757
<PackageReference Include="Citrus.Avalonia" Version="1.2.6" />
58-
<PackageReference Include="DynamicData" Version="6.16.2" />
58+
<PackageReference Include="DynamicData" Version="6.16.3" />
5959
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.6" />
6060
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.6" />
6161
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.6" />
@@ -69,7 +69,7 @@
6969
<PrivateAssets>all</PrivateAssets>
7070
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7171
</PackageReference>
72-
<PackageReference Include="ReactiveUI" Version="11.5.1" />
72+
<PackageReference Include="ReactiveUI" Version="11.5.17" />
7373
<PackageReference Include="ReactiveUI.Validation" Version="1.5.5" />
7474
<PackageReference Include="Serilog" Version="2.9.0" />
7575
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
@@ -79,10 +79,10 @@
7979
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
8080
<PackageReference Include="Serilog.Sinks.Debug" Version="1.0.1" />
8181
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
82-
<PackageReference Include="Splat" Version="9.5.13" />
83-
<PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" Version="9.5.13" />
84-
<PackageReference Include="Splat.Microsoft.Extensions.Logging" Version="9.5.13" />
85-
<PackageReference Include="Splat.Serilog" Version="9.5.13" />
82+
<PackageReference Include="Splat" Version="9.5.20" />
83+
<PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" Version="9.5.20" />
84+
<PackageReference Include="Splat.Microsoft.Extensions.Logging" Version="9.5.20" />
85+
<PackageReference Include="Splat.Serilog" Version="9.5.20" />
8686
<PackageReference Include="System.Interactive" Version="4.1.1" />
8787
<PackageReference Include="System.Interactive.Async" Version="4.1.1" />
8888
<PackageReference Include="System.Reactive" Version="4.4.1" />

0 commit comments

Comments
 (0)