Updated nuget packages + fixed unit test

devedse · Apr 27, 2021 · a336678 · a336678
1 parent f89ccf9
commit a336678
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/DeveImageOptimizerWPF.Tests/Converters/KbConverterTests.cs b/DeveImageOptimizerWPF.Tests/Converters/KbConverterTests.cs
@@ -16,7 +16,7 @@ public void KbToString()
             var result = kbConverter.Convert(123456789L, null, null, CultureInfo.InvariantCulture);
 
             //Assert
-            Assert.Equal("117,7MB", result.ToString());
+            Assert.Equal("117.7MB", result.ToString());
         }
     }
 }
diff --git a/DeveImageOptimizerWPF/Converters/KbConverter.cs b/DeveImageOptimizerWPF/Converters/KbConverter.cs
@@ -1,4 +1,4 @@
-using DeveImageOptimizer.Helpers;
+using DeveCoolLib.Conversion;
 using System;
 using System.Globalization;
 using System.Windows.Data;
@@ -10,7 +10,7 @@ public sealed class KbConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return ValuesToStringHelper.BytesToString((long)value);
+            return ValuesToStringHelper.BytesToString((long)value, culture);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

diff --git a/...eOptimizerWPF/Converters/ObservableCollectionOptimizedFileResultToSizeReducedConverter.cs b/...eOptimizerWPF/Converters/ObservableCollectionOptimizedFileResultToSizeReducedConverter.cs
@@ -1,4 +1,4 @@
-using DeveImageOptimizer.Helpers;
+using DeveCoolLib.Conversion;
 using DeveImageOptimizerWPF.State.ProcessingState;
 using System;
 using System.Collections.ObjectModel;
@@ -19,7 +19,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             }
             var ofr = (ObservableCollection<OptimizableFileUI>)value;
             var totalOptimizedSize = ofr.Sum(t => t.OriginalSize - t.OptimizedSize);
-            return ValuesToStringHelper.BytesToString(totalOptimizedSize);
+            return ValuesToStringHelper.BytesToString(totalOptimizedSize, culture);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

diff --git a/...timizerWPF/Converters/ObservableCollectionOptimizedFileResultToTotalSizeAfterConverter.cs b/...timizerWPF/Converters/ObservableCollectionOptimizedFileResultToTotalSizeAfterConverter.cs
@@ -1,4 +1,4 @@
-using DeveImageOptimizer.Helpers;
+using DeveCoolLib.Conversion;
 using DeveImageOptimizerWPF.State.ProcessingState;
 using System;
 using System.Collections.ObjectModel;
@@ -19,7 +19,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             }
             var ofr = (ObservableCollection<OptimizableFileUI>)value;
             var totalOptimizedSize = ofr.Sum(t => t.OptimizedSize);
-            return ValuesToStringHelper.BytesToString(totalOptimizedSize);
+            return ValuesToStringHelper.BytesToString(totalOptimizedSize, culture);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

diff --git a/...imizerWPF/Converters/ObservableCollectionOptimizedFileResultToTotalSizeBeforeConverter.cs b/...imizerWPF/Converters/ObservableCollectionOptimizedFileResultToTotalSizeBeforeConverter.cs
@@ -1,4 +1,4 @@
-using DeveImageOptimizer.Helpers;
+using DeveCoolLib.Conversion;
 using DeveImageOptimizerWPF.State.ProcessingState;
 using System;
 using System.Collections.ObjectModel;
@@ -19,7 +19,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             }
             var ofr = (ObservableCollection<OptimizableFileUI>)value;
             var totalOptimizedSize = ofr.Sum(t => t.OriginalSize);
-            return ValuesToStringHelper.BytesToString(totalOptimizedSize);
+            return ValuesToStringHelper.BytesToString(totalOptimizedSize, culture);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

diff --git a/DeveImageOptimizerWPF/Converters/OptimizedFileResultToSizeConverter.cs b/DeveImageOptimizerWPF/Converters/OptimizedFileResultToSizeConverter.cs
@@ -1,4 +1,4 @@
-using DeveImageOptimizer.Helpers;
+using DeveCoolLib.Conversion;
 using DeveImageOptimizerWPF.State.ProcessingState;
 using System;
 using System.Globalization;
@@ -16,7 +16,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 return string.Empty;
             }
             var ofr = (OptimizableFileUI)value;
-            return ValuesToStringHelper.BytesToString(ofr.OriginalSize - ofr.OptimizedSize);
+            return ValuesToStringHelper.BytesToString(ofr.OriginalSize - ofr.OptimizedSize, culture);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

diff --git a/DeveImageOptimizerWPF/DeveImageOptimizerWPF.csproj b/DeveImageOptimizerWPF/DeveImageOptimizerWPF.csproj
@@ -11,8 +11,8 @@
 
   <ItemGroup>
     <PackageReference Include="CommonServiceLocator" Version="2.0.6" />
-    <PackageReference Include="DeveCoolLib" Version="1.0.53" />
-    <PackageReference Include="DeveImageOptimizer" Version="1.0.570" />
+    <PackageReference Include="DeveCoolLib" Version="1.0.503" />
+    <PackageReference Include="DeveImageOptimizer" Version="1.0.572" />
     <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="3.1.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.3.3" />