From fd684741de620fb75c36942775050bcb563b3ff8 Mon Sep 17 00:00:00 2001 From: Tensei Date: Tue, 13 Jun 2017 00:10:59 +0200 Subject: [PATCH] updated nugets fixed search not hiding listitems --- GbfRaidfinder.Data/GbfRaidfinder.Data.csproj | 9 +++--- GbfRaidfinder.Data/RaidListItem.cs | 9 ++++-- GbfRaidfinder.Data/packages.config | 5 ++-- GbfRaidfinder/App.xaml | 4 +-- GbfRaidfinder/FodyWeavers.xml | 2 +- GbfRaidfinder/GbfRaidfinder.csproj | 30 +++++++++++--------- GbfRaidfinder/packages.config | 12 ++++---- 7 files changed, 39 insertions(+), 32 deletions(-) diff --git a/GbfRaidfinder.Data/GbfRaidfinder.Data.csproj b/GbfRaidfinder.Data/GbfRaidfinder.Data.csproj index edaa40b..43a60dc 100644 --- a/GbfRaidfinder.Data/GbfRaidfinder.Data.csproj +++ b/GbfRaidfinder.Data/GbfRaidfinder.Data.csproj @@ -32,8 +32,9 @@ 4 - - ..\packages\PropertyChanged.Fody.1.53.0\Lib\netstandard10\PropertyChanged.dll + + ..\packages\PropertyChanged.Fody.2.1.2\lib\netstandard1.0\PropertyChanged.dll + False @@ -56,11 +57,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/GbfRaidfinder.Data/RaidListItem.cs b/GbfRaidfinder.Data/RaidListItem.cs index e46c087..1f101be 100644 --- a/GbfRaidfinder.Data/RaidListItem.cs +++ b/GbfRaidfinder.Data/RaidListItem.cs @@ -1,12 +1,15 @@ -using PropertyChanged; +using System.ComponentModel; +using System.Runtime.CompilerServices; +using PropertyChanged; namespace GbfRaidfinder.Data { - [ImplementPropertyChanged] - public class RaidListItem { + public class RaidListItem : INotifyPropertyChanged { public string English { get; set; } public string Japanese { get; set; } public string Image { get; set; } public bool Following { get; set; } public bool Visibility { get; set; } = true; + public event PropertyChangedEventHandler PropertyChanged; + } } \ No newline at end of file diff --git a/GbfRaidfinder.Data/packages.config b/GbfRaidfinder.Data/packages.config index 69dc1c8..f5040e0 100644 --- a/GbfRaidfinder.Data/packages.config +++ b/GbfRaidfinder.Data/packages.config @@ -1,6 +1,5 @@  - - - + + \ No newline at end of file diff --git a/GbfRaidfinder/App.xaml b/GbfRaidfinder/App.xaml index eacfaee..2473126 100644 --- a/GbfRaidfinder/App.xaml +++ b/GbfRaidfinder/App.xaml @@ -30,8 +30,8 @@ - + + diff --git a/GbfRaidfinder/FodyWeavers.xml b/GbfRaidfinder/FodyWeavers.xml index 8e47082..72a6916 100644 --- a/GbfRaidfinder/FodyWeavers.xml +++ b/GbfRaidfinder/FodyWeavers.xml @@ -1,4 +1,4 @@ - + diff --git a/GbfRaidfinder/GbfRaidfinder.csproj b/GbfRaidfinder/GbfRaidfinder.csproj index 7d6b6d1..87ef8a6 100644 --- a/GbfRaidfinder/GbfRaidfinder.csproj +++ b/GbfRaidfinder/GbfRaidfinder.csproj @@ -45,14 +45,18 @@ ..\packages\Autofac.4.6.0\lib\net45\Autofac.dll + + ..\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll + False + ..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll ..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll - - ..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll + + ..\packages\MahApps.Metro.1.6.0-alpha002\lib\net45\MahApps.Metro.dll ..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll @@ -60,8 +64,8 @@ ..\packages\MaterialDesignThemes.MahApps.0.0.10\lib\net45\MaterialDesignThemes.MahApps.dll - - ..\packages\MaterialDesignThemes.2.3.0.823\lib\net45\MaterialDesignThemes.Wpf.dll + + ..\packages\MaterialDesignThemes.2.3.1-ci891\lib\net45\MaterialDesignThemes.Wpf.dll ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll @@ -87,8 +91,8 @@ ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\PropertyChanged.Fody.2.0.1\lib\netstandard1.3\PropertyChanged.dll + + ..\packages\PropertyChanged.Fody.2.1.2\lib\netstandard1.0\PropertyChanged.dll False @@ -107,7 +111,7 @@ - ..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll + ..\packages\MahApps.Metro.1.6.0-alpha002\lib\net45\System.Windows.Interactivity.dll @@ -118,8 +122,8 @@ 4.0 - - ..\packages\TweetinviAPI.1.2.0.1\lib\net45\Tweetinvi.dll + + ..\packages\TweetinviAPI.1.3.0\lib\net45\Tweetinvi.dll @@ -296,13 +300,13 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - - + + \ No newline at end of file diff --git a/GbfRaidfinder/packages.config b/GbfRaidfinder/packages.config index 8d9cb80..944c81d 100644 --- a/GbfRaidfinder/packages.config +++ b/GbfRaidfinder/packages.config @@ -2,21 +2,21 @@ - - + + - + - + - + - + \ No newline at end of file