From a047fb67ff8402bc19bcf1da6df81f99ebb5784e Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Fri, 3 Aug 2018 20:30:34 +0200 Subject: [PATCH] MAJ nuget --- AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj | 2 +- AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj | 2 +- AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj | 2 +- AideDeJeu/AideDeJeu/AideDeJeu.csproj | 2 +- AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj index 668c0db1..4b1561a2 100644 --- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj +++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj @@ -65,7 +65,7 @@ 1.60.2 - 3.1.0.637273 + 3.1.0.697729 diff --git a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj index 397d7485..aac5bc78 100644 --- a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj +++ b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj @@ -183,7 +183,7 @@ - 3.1.0.637273 + 3.1.0.697729 diff --git a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj index fd6cb2f0..270d3ffc 100644 --- a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj +++ b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj @@ -118,7 +118,7 @@ 1.60.2 - 3.1.0.637273 + 3.1.0.697729 diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj index 8ac1f10a..fc2d2878 100644 --- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj +++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj @@ -29,7 +29,7 @@ - + diff --git a/AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs index 7fc8ff6b..f717dd24 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs @@ -420,16 +420,16 @@ namespace AideDeJeu.ViewModels //var category = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Category).SelectedKey ?? ""; var type = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Type).SelectedKey ?? ""; - token.ThrowIfCancellationRequested(); + //token.ThrowIfCancellationRequested(); var minPower = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.MinPower).SelectedKey ?? "0 (0 PX)"; - token.ThrowIfCancellationRequested(); + //token.ThrowIfCancellationRequested(); var maxPower = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.MaxPower).SelectedKey ?? "30 (155000 PX)"; - token.ThrowIfCancellationRequested(); + //token.ThrowIfCancellationRequested(); var size = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Size).SelectedKey ?? ""; - token.ThrowIfCancellationRequested(); + //token.ThrowIfCancellationRequested(); //var legendary = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Legendary).SelectedKey ?? ""; var source = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Source).SelectedKey ?? ""; @@ -771,7 +771,7 @@ namespace AideDeJeu.ViewModels var type = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Type).SelectedKey ?? ""; var minPrice = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.MinPrice).SelectedKey ?? "0 pc"; var maxPrice = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.MaxPrice).SelectedKey ?? "1 000 000 po"; - token.ThrowIfCancellationRequested(); + //token.ThrowIfCancellationRequested(); return items.Where(item => { var equipment = item as Equipment;