[Image Resizer] Upgraded to .NET Core 3.1 (#7317)

* project converted to sdk style

* image resizer core31

* image resizer test core31

* project and setup fixes
This commit is contained in:
Davide Giacometti
2020-10-22 18:26:46 +02:00
committed by GitHub
parent e2c94b592f
commit aa0947061a
19 changed files with 207 additions and 365 deletions

View File

@@ -7,14 +7,13 @@ using System.Collections.Generic;
using System.Reflection;
using System.Windows.Input;
using System.Windows.Media.Imaging;
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command;
using ImageResizer.Helpers;
using ImageResizer.Models;
using ImageResizer.Properties;
namespace ImageResizer.ViewModels
{
public class AdvancedViewModel : ViewModelBase
public class AdvancedViewModel : Observable
{
private static Dictionary<Guid, string> InitEncoderMap()
{

View File

@@ -4,15 +4,14 @@
// ShowAdvancedCommand = new RelayCommand(ShowAdvanced);
using System.Windows.Input;
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command;
using ImageResizer.Helpers;
using ImageResizer.Models;
using ImageResizer.Properties;
using ImageResizer.Views;
namespace ImageResizer.ViewModels
{
public class InputViewModel : ViewModelBase
public class InputViewModel : Observable
{
private readonly ResizeBatch _batch;
private readonly MainViewModel _mainViewModel;

View File

@@ -4,15 +4,14 @@
using System.Collections.Generic;
using System.Windows.Input;
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command;
using ImageResizer.Helpers;
using ImageResizer.Models;
using ImageResizer.Properties;
using ImageResizer.Views;
namespace ImageResizer.ViewModels
{
public class MainViewModel : ViewModelBase
public class MainViewModel : Observable
{
private readonly Settings _settings;
private readonly ResizeBatch _batch;
@@ -32,13 +31,13 @@ namespace ImageResizer.ViewModels
public object CurrentPage
{
get => _currentPage;
set => Set(nameof(CurrentPage), ref _currentPage, value);
set => Set(ref _currentPage, value);
}
public double Progress
{
get => _progress;
set => Set(nameof(Progress), ref _progress, value);
set => Set(ref _progress, value);
}
public void Load(IMainView view)

View File

@@ -8,14 +8,13 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Input;
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command;
using ImageResizer.Helpers;
using ImageResizer.Models;
using ImageResizer.Views;
namespace ImageResizer.ViewModels
{
public class ProgressViewModel : ViewModelBase, IDisposable
public class ProgressViewModel : Observable, IDisposable
{
private readonly MainViewModel _mainViewModel;
private readonly ResizeBatch _batch;
@@ -43,13 +42,13 @@ namespace ImageResizer.ViewModels
public double Progress
{
get => _progress;
set => Set(nameof(Progress), ref _progress, value);
set => Set(ref _progress, value);
}
public TimeSpan TimeRemaining
{
get => _timeRemaining;
set => Set(nameof(TimeRemaining), ref _timeRemaining, value);
set => Set(ref _timeRemaining, value);
}
public ICommand StartCommand { get; }

View File

@@ -4,14 +4,13 @@
using System.Collections.Generic;
using System.Windows.Input;
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command;
using ImageResizer.Helpers;
using ImageResizer.Models;
using ImageResizer.Views;
namespace ImageResizer.ViewModels
{
public class ResultsViewModel : ViewModelBase
public class ResultsViewModel : Observable
{
private readonly IMainView _mainView;