Skip to content

Cleaning up dependencies #2901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keboo merged 1 commit into from
Oct 6, 2022
Merged

Cleaning up dependencies #2901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Directory.packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<Project>
<ItemGroup>
<PackageVersion Include="BluwolfIcons" Version="1.0.1" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.0.0" />
<PackageVersion Include="Dragablz" Version="0.0.3.234" />
<PackageVersion Include="Humanizer" Version="2.14.1" />
<PackageVersion Include="MahApps.Metro" Version="2.4.9" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.3.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.3.1" />
<PackageVersion Include="Microsoft.Composition" Version="1.0.31" />
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
Expand Down
10 changes: 5 additions & 5 deletions MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Microsoft.Toolkit.MVVM" />
<PackageReference Include="XAMLTest" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
Expand All @@ -20,10 +20,10 @@
</ItemGroup>

<ItemGroup>
<Using Include="MaterialDesignThemes.Wpf"/>
<Using Include="XamlTest"/>
<Using Include="Xunit"/>
<Using Include="Xunit.Abstractions"/>
<Using Include="MaterialDesignThemes.Wpf" />
<Using Include="XamlTest" />
<Using Include="Xunit" />
<Using Include="Xunit.Abstractions" />
</ItemGroup>

<ItemGroup>
Expand Down
53 changes: 14 additions & 39 deletions MaterialDesignThemes.UITests/Samples/DialogHost/ClosingEventViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,19 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Runtime.CompilerServices;
using System.Windows.Input;
using Microsoft.Toolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;

namespace MaterialDesignThemes.UITests.Samples.DialogHost
{
public class ClosingEventViewModel : INotifyPropertyChanged
{
public event PropertyChangedEventHandler? PropertyChanged;

private bool _dialogIsOpen;
public bool DialogIsOpen
{
get => _dialogIsOpen;
set => SetProperty(ref _dialogIsOpen, value);
}

private ICommand? _closeDialogCommand;
public ICommand CloseDialogCommand => _closeDialogCommand ??= new RelayCommand(CloseDialog);
namespace MaterialDesignThemes.UITests.Samples.DialogHost;

private ICommand? _openDialogCommand;
public ICommand OpenDialogCommand => _openDialogCommand ??= new RelayCommand(OpenDialog);

private void OpenDialog()
=> DialogIsOpen = true;

private void CloseDialog()
=> DialogIsOpen = false;
[ObservableObject]
public partial class ClosingEventViewModel
{
[ObservableProperty]
private bool _dialogIsOpen;

private bool SetProperty<T>(ref T field, T newValue, [CallerMemberName] string? propertyName = null)
{
if (!EqualityComparer<T>.Default.Equals(field, newValue))
{
field = (newValue);
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
return true;
}
[RelayCommand]
private void OpenDialog()
=> DialogIsOpen = true;

return false;
}
}
[RelayCommand]
private void CloseDialog()
=> DialogIsOpen = false;
}
3 changes: 1 addition & 2 deletions mdresgen/mdresgen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
<PackageReference Include="Microsoft.Composition" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>
<ItemGroup>
<Using Remove="System.Windows.*"/>
<Using Remove="System.Windows.*" />
</ItemGroup>
</Project>