Remove Class1, update project files, and enhance MainViewModel

Removed Class1.cs and ClassLibrary1.csproj, including references to MVVMFluent. Updated MVVMFluent.NugetDemo.csproj to remove commented-out reference and update MVVMFluent.WPF package version. Enhanced MainViewModel with a new constructor, modified Input property setter, improved exception handling, and added CancellationToken support in ShowDialogAsync. Made minor formatting changes in MainWindow.xaml. Updated MVVMFluent.WPF.csproj to use Version property.
kristoffer-tungland · Oct 2, 2024 · 3c616ab · 3c616ab
1 parent 9deee57
commit 3c616ab
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 55 deletions.
diff --git a/src/ClassLibrary1/Class1.cs b/src/ClassLibrary1/Class1.cs
diff --git a/src/ClassLibrary1/ClassLibrary1.csproj b/src/ClassLibrary1/ClassLibrary1.csproj
diff --git a/src/MVVMFluent.NugetDemo/MVVMFluent.NugetDemo.csproj b/src/MVVMFluent.NugetDemo/MVVMFluent.NugetDemo.csproj
@@ -10,11 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!--<PackageReference Include="MVVMFluent" Version="0.0.1-alfa21">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>-->
-    <PackageReference Include="MVVMFluent.WPF" Version="0.0.1-alfa22">
+    <PackageReference Include="MVVMFluent.WPF" Version="0.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/MVVMFluent.NugetDemo/MainViewModel.cs b/src/MVVMFluent.NugetDemo/MainViewModel.cs
@@ -5,12 +5,17 @@ namespace MVVMFluent.NugetDemo;
 
 internal class MainViewModel : ValidationViewModelBase
 {
+    public MainViewModel()
+    {
+        Input = "Hello World";
+    }
+
     public bool Enable { get => Get(true); set => Set(value); }
 
     public string? Input
     {
         get => Get<string?>();
-        set => When(value).Required().Notify(OkCommand, AsyncCommand).Set();
+        set => When(value).Required().Notify(AsyncCommand, OkCommand).Set();
     }
 
     public Command OkCommand => Do(() => ShowDialog(Input)).IfValid(nameof(Input));
@@ -26,17 +31,20 @@ private bool CanExecute()
 
     private void HandleException(Exception exception)
     {
-        MessageBox.Show(exception.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+        if (exception is TaskCanceledException)
+            MessageBox.Show(exception.Message, "Information", MessageBoxButton.OK, MessageBoxImage.Information);
+        else
+            MessageBox.Show(exception.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
     }
 
-    private async Task ShowDialogAsync()
+    private async Task ShowDialogAsync(CancellationToken cancellationToken)
     {
         for (var i = 1; i <= 100; i++)
         {
-            if (AsyncCommand.IsCancellationRequested)
-                return;
+            if (cancellationToken.IsCancellationRequested)
+                throw new TaskCanceledException();
 
-            await Task.Delay(50);
+            await Task.Delay(50, cancellationToken);
             AsyncCommand.ReportProgress(i + 1, 100);
 
             if (AsyncCommand.Progress == 50 && ThrowException)

diff --git a/src/MVVMFluent.NugetDemo/MainWindow.xaml b/src/MVVMFluent.NugetDemo/MainWindow.xaml
@@ -16,13 +16,13 @@
         </Grid.RowDefinitions>
 
         <Button HorizontalAlignment="Right" Padding="15,0" Margin="10"
-                Content="Help"
-                Command="{Binding HelpCommand}" CommandParameter="This is the help" />
+                 Content="Help"
+                 Command="{Binding HelpCommand}" CommandParameter="This is the help" />
 
         <TextBox Grid.Row="1" VerticalAlignment="Center" Padding="10" Margin="10"
-             Text="{Binding Input, UpdateSourceTrigger=PropertyChanged,
-                        ValidatesOnNotifyDataErrors=True}" 
-             IsEnabled="{Binding Enable}">
+              Text="{Binding Input, UpdateSourceTrigger=PropertyChanged,
+                         ValidatesOnNotifyDataErrors=True}" 
+              IsEnabled="{Binding Enable}">
             <Validation.ErrorTemplate>
                 <ControlTemplate>
                     <StackPanel>
@@ -40,7 +40,7 @@
         </TextBox>
 
         <ProgressBar Grid.Row="2" VerticalAlignment="Center" Padding="10" Margin="10"
-                 Value="{Binding AsyncCommand.Progress}" Minimum="0" Maximum="100" Height="10">
+                  Value="{Binding AsyncCommand.Progress}" Minimum="0" Maximum="100" Height="10">
             <ProgressBar.Style>
                 <Style TargetType="ProgressBar">
                     <Style.Triggers>
@@ -54,26 +54,26 @@
 
         <DockPanel Grid.Row="3" HorizontalAlignment="Stretch" LastChildFill="True">
             <Button DockPanel.Dock="Right"  Padding="15,0" Margin="10" 
-                Content="Ok" IsDefault="True"
-                Command="{Binding OkCommand}" />
+                 Content="Ok" IsDefault="True"
+                 Command="{Binding OkCommand}" />
 
             <Button DockPanel.Dock="Right" Padding="15,0" Margin="10"
-                Content="Async"
-                Command="{Binding AsyncCommand}" />
+                 Content="Async"
+                 Command="{Binding AsyncCommand}" />
 
             <Button DockPanel.Dock="Right" Padding="15,0" Margin="10"
-                Content="Cancel"
-                Command="{Binding AsyncCommand.CancelCommand}" />
+                 Content="Cancel"
+                 Command="{Binding AsyncCommand.CancelCommand}" />
 
             <CheckBox DockPanel.Dock="Left" Padding="10" Margin="10,5"
-                  VerticalAlignment="Center" VerticalContentAlignment="Center"
-                  Content="Enable"
-                  IsChecked="{Binding Enable}" />
+                   VerticalAlignment="Center" VerticalContentAlignment="Center"
+                   Content="Enable"
+                   IsChecked="{Binding Enable}" />
 
             <CheckBox DockPanel.Dock="Left" Padding="10" Margin="10,5"
-                  VerticalAlignment="Center" VerticalContentAlignment="Center"
-                  Content="Throw Exception"
-                  IsChecked="{Binding ThrowException}" />
+                   VerticalAlignment="Center" VerticalContentAlignment="Center"
+                   Content="Throw Exception"
+                   IsChecked="{Binding ThrowException}" />
         </DockPanel>
 
     </Grid>

diff --git a/src/MVVMFluent.WPF/MVVMFluent.WPF.csproj b/src/MVVMFluent.WPF/MVVMFluent.WPF.csproj
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <NuSpecFile>MVVMFluent.WPF.nuspec</NuSpecFile>
-    <VersionPrefix>0.0.1</VersionPrefix>
+    <Version>0.0.1</Version>
     <NuspecProperties>version=$(Version)</NuspecProperties>
   </PropertyGroup>