Skip to content

Commit 7ed178a

Browse files
authored
Cleaning up dependencies (#2901)
1 parent 34b21f9 commit 7ed178a

File tree

4 files changed

+23
-48
lines changed

4 files changed

+23
-48
lines changed

Directory.packages.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project>
22
<ItemGroup>
33
<PackageVersion Include="BluwolfIcons" Version="1.0.1" />
4+
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.0.0" />
45
<PackageVersion Include="Dragablz" Version="0.0.3.234" />
56
<PackageVersion Include="Humanizer" Version="2.14.1" />
67
<PackageVersion Include="MahApps.Metro" Version="2.4.9" />
78
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
89
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.3.1" />
9-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
10-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0" />
10+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
11+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.1" />
1112
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.3.1" />
1213
<PackageVersion Include="Microsoft.Composition" Version="1.0.31" />
1314
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />

MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12+
<PackageReference Include="CommunityToolkit.Mvvm" />
1213
<PackageReference Include="Microsoft.NET.Test.Sdk" />
13-
<PackageReference Include="Microsoft.Toolkit.MVVM" />
1414
<PackageReference Include="XAMLTest" />
1515
<PackageReference Include="xunit" />
1616
<PackageReference Include="xunit.runner.visualstudio">
@@ -20,10 +20,10 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<Using Include="MaterialDesignThemes.Wpf"/>
24-
<Using Include="XamlTest"/>
25-
<Using Include="Xunit"/>
26-
<Using Include="Xunit.Abstractions"/>
23+
<Using Include="MaterialDesignThemes.Wpf" />
24+
<Using Include="XamlTest" />
25+
<Using Include="Xunit" />
26+
<Using Include="Xunit.Abstractions" />
2727
</ItemGroup>
2828

2929
<ItemGroup>
Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,19 @@
1-
using System.Collections.Generic;
2-
using System.ComponentModel;
3-
using System.Runtime.CompilerServices;
4-
using System.Windows.Input;
5-
using Microsoft.Toolkit.Mvvm.Input;
1+
using CommunityToolkit.Mvvm.ComponentModel;
2+
using CommunityToolkit.Mvvm.Input;
63

7-
namespace MaterialDesignThemes.UITests.Samples.DialogHost
8-
{
9-
public class ClosingEventViewModel : INotifyPropertyChanged
10-
{
11-
public event PropertyChangedEventHandler? PropertyChanged;
12-
13-
private bool _dialogIsOpen;
14-
public bool DialogIsOpen
15-
{
16-
get => _dialogIsOpen;
17-
set => SetProperty(ref _dialogIsOpen, value);
18-
}
19-
20-
private ICommand? _closeDialogCommand;
21-
public ICommand CloseDialogCommand => _closeDialogCommand ??= new RelayCommand(CloseDialog);
4+
namespace MaterialDesignThemes.UITests.Samples.DialogHost;
225

23-
private ICommand? _openDialogCommand;
24-
public ICommand OpenDialogCommand => _openDialogCommand ??= new RelayCommand(OpenDialog);
25-
26-
private void OpenDialog()
27-
=> DialogIsOpen = true;
28-
29-
private void CloseDialog()
30-
=> DialogIsOpen = false;
6+
[ObservableObject]
7+
public partial class ClosingEventViewModel
8+
{
9+
[ObservableProperty]
10+
private bool _dialogIsOpen;
3111

32-
private bool SetProperty<T>(ref T field, T newValue, [CallerMemberName] string? propertyName = null)
33-
{
34-
if (!EqualityComparer<T>.Default.Equals(field, newValue))
35-
{
36-
field = (newValue);
37-
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
38-
return true;
39-
}
12+
[RelayCommand]
13+
private void OpenDialog()
14+
=> DialogIsOpen = true;
4015

41-
return false;
42-
}
43-
}
16+
[RelayCommand]
17+
private void CloseDialog()
18+
=> DialogIsOpen = false;
4419
}

mdresgen/mdresgen.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@
2828
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
2929
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
3030
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
31-
<PackageReference Include="Microsoft.Composition" />
3231
<PackageReference Include="Newtonsoft.Json" />
3332
</ItemGroup>
3433
<ItemGroup>
35-
<Using Remove="System.Windows.*"/>
34+
<Using Remove="System.Windows.*" />
3635
</ItemGroup>
3736
</Project>

0 commit comments

Comments
 (0)