Merge pull request #15 from windows-toolkit/feature/sample-app

Upgraded dependencies to Preview2 packages

Author: azchohfi

samples/MvvmSampleUwp/MvvmSampleUwp/MvvmSampleUwp.csproj

@@ -260,13 +260,13 @@
       <Version>6.2.10</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit">
-      <Version>7.0.0-build.152</Version>
+      <Version>7.0.0-preview2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Mvvm">
-      <Version>7.0.0-build.149</Version>
+      <Version>7.0.0-preview2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
-      <Version>7.0.0-build.152</Version>
+      <Version>7.0.0-preview2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
       <Version>2.4.2</Version>

samples/MvvmSampleUwp/MvvmSampleUwp/Views/AsyncRelayCommandPage.xaml

@@ -7,10 +7,10 @@
     xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:controls="using:MvvmSampleUwp.Controls"
     xmlns:viewModels="using:MvvmSampleUwp.ViewModels"
-    xmlns:views="using:MvvmSampleUwp.Views"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
     mc:Ignorable="d"
     NavigationCacheMode="Enabled">
     <Page.DataContext>
@@ -22,7 +22,7 @@
         </core:EventTriggerBehavior>
     </interactivity:Interaction.Behaviors>
     <Page.Resources>
-        <views:TaskResultConverter x:Key="TaskResultConverter"/>
+        <converters:TaskResultConverter x:Key="TaskResultConverter"/>
     </Page.Resources>
 
     <ScrollViewer Padding="16" CanContentRenderOutsideBounds="True">

samples/MvvmSampleUwp/MvvmSampleUwp/Views/AsyncRelayCommandPage.xaml.cs

@@ -2,10 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Threading.Tasks;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Data;
 
 namespace MvvmSampleUwp.Views
 {
@@ -19,26 +16,4 @@ public AsyncRelayCommandPage()
             this.InitializeComponent();
         }
     }
-
-    // TODO: replace this with the one from the toolkit, when https://github.com/windows-toolkit/WindowsCommunityToolkit/pull/3410 is merged
-    public sealed class TaskResultConverter : IValueConverter
-    {
-        /// <inheritdoc/>
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is Task task &&
-                task.IsCompletedSuccessfully)
-            {
-                return task.GetType().GetProperty(nameof(Task<object>.Result))?.GetValue(task);
-            }
-
-            return null;
-        }
-
-        /// <inheritdoc/>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
 }