[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

@@ -1,7 +1,7 @@
<Window x:Class="ImageResizer.Views.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:local="clr-namespace:ImageResizer.Views"
xmlns:p="clr-namespace:ImageResizer.Properties"
xmlns:vm="clr-namespace:ImageResizer.ViewModels"
@@ -29,10 +29,10 @@
<TaskbarItemInfo ProgressState="Normal" ProgressValue="{Binding Progress}"/>
</Window.TaskbarItemInfo>
<i:Interaction.Triggers>
<i:EventTrigger EventName="Loaded">
<i:InvokeCommandAction Command="{Binding LoadCommand}" CommandParameter="{Binding ElementName=_this}"/>
</i:EventTrigger>
</i:Interaction.Triggers>
<behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Loaded">
<behaviors:InvokeCommandAction Command="{Binding LoadCommand}" CommandParameter="{Binding ElementName=_this}"/>
</behaviors:EventTrigger>
</behaviors:Interaction.Triggers>
</Window>

View File

@@ -1,7 +1,7 @@
<UserControl x:Class="ImageResizer.Views.ProgressPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:local="clr-namespace:ImageResizer.Views"
xmlns:p="clr-namespace:ImageResizer.Properties"
MinWidth="350">
@@ -10,11 +10,11 @@
<local:TimeRemainingConverter x:Key="TimeRemainingConverter"/>
</UserControl.Resources>
<i:Interaction.Triggers>
<i:EventTrigger EventName="Loaded">
<i:InvokeCommandAction Command="{Binding StartCommand}"/>
</i:EventTrigger>
</i:Interaction.Triggers>
<behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Loaded">
<behaviors:InvokeCommandAction Command="{Binding StartCommand}"/>
</behaviors:EventTrigger>
</behaviors:Interaction.Triggers>
<StackPanel>
<TextBlock Margin="11,11,11,0"