Skip to content

Commit 2f18dfc

Browse files
committed
Update dependencies
1 parent ee5ae0a commit 2f18dfc

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

WpfApp/Domain/MainWindowViewModel.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,14 @@ private static void ModifyTheme(bool isDarkTheme)
120120
var paletteHelper = new PaletteHelper();
121121
var theme = paletteHelper.GetTheme();
122122

123-
theme.SetBaseTheme(isDarkTheme ? Theme.Dark : Theme.Light);
123+
if (isDarkTheme)
124+
{
125+
theme.SetLightTheme();
126+
}
127+
else
128+
{
129+
theme.SetDarkTheme();
130+
}
124131
paletteHelper.SetTheme(theme);
125132
}
126133

WpfApp/NotifyAppender.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static NotifyAppender? Appender
8282
protected override void Append(LoggingEvent loggingEvent)
8383
{
8484
var writer = new StringWriter(CultureInfo.InvariantCulture);
85-
Layout.Format(writer, loggingEvent);
85+
Layout?.Format(writer, loggingEvent);
8686
lock (objlock)
8787
{
8888
NotificationLines.Add(writer.ToString());

WpfApp/Themes/Generic.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes">
66
<ResourceDictionary.MergedDictionaries>
77
<materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="Orange" SecondaryColor="Pink" />
8-
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
8+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
99
</ResourceDictionary.MergedDictionaries>
1010
</ResourceDictionary>

WpfApp/WpfApp.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<UseWPF>true</UseWPF>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
88
<PackageId>Leosac.$(AssemblyName)</PackageId>
9-
<Version>1.22.0</Version>
9+
<Version>1.23.0</Version>
1010
<Product>Leosac WpfApp Library</Product>
1111
<Description>C# Library components/helpers for Leosac branded Wpf applications .</Description>
1212
<Company>Leosac SAS</Company>
1313
<Authors>leosac</Authors>
1414
<AssemblyTitle>Leosac WpfApp</AssemblyTitle>
15-
<Copyright>Copyright © Leosac 2024</Copyright>
15+
<Copyright>Copyright © Leosac 2025</Copyright>
1616
<PackageProjectUrl>https://github.com/leosac/wpfapp</PackageProjectUrl>
1717
<RepositoryType>git</RepositoryType>
1818
<RepositoryUrl>https://github.com/leosac/wpfapp.git</RepositoryUrl>
@@ -30,10 +30,10 @@
3030
</ItemGroup>
3131

3232
<ItemGroup>
33-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
34-
<PackageReference Include="Leosac.SharedServices" Version="1.5.0" />
35-
<PackageReference Include="log4net" Version="2.0.17" />
36-
<PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
33+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
34+
<PackageReference Include="Leosac.SharedServices" Version="1.9.0" />
35+
<PackageReference Include="log4net" Version="3.0.3" />
36+
<PackageReference Include="MaterialDesignThemes" Version="5.2.1" />
3737
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3838
</ItemGroup>
3939

WpfAppDemo/App.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ResourceDictionary>
99
<ResourceDictionary.MergedDictionaries>
1010
<materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="Orange" SecondaryColor="Pink" />
11-
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
11+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
1212
</ResourceDictionary.MergedDictionaries>
1313
</ResourceDictionary>
1414
</Application.Resources>

0 commit comments

Comments
 (0)