Updated Main toolkit dependency to 7.0.0-preview2, updated dependencies in general, and now using the DispatcherQueue.

Author: azchohfi

Directory.Build.props

@@ -83,7 +83,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs

@@ -9,6 +9,7 @@
 using Microsoft.Graph;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Newtonsoft.Json.Linq;
+using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
@@ -68,6 +69,8 @@ public GraphPresenter()
 
         private async void GraphPresenter_Loaded(object sender, RoutedEventArgs e)
         {
+            var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+
             // Note: some interfaces from the Graph SDK don't implement IBaseRequestBuilder properly, see https://github.com/microsoftgraph/msgraph-sdk-dotnet/issues/722
             if (RequestBuilder != null)
             {
@@ -101,7 +104,7 @@ private async void GraphPresenter_Loaded(object sender, RoutedEventArgs e)
                         data = values.ToObject(ResponseType);
                     }
 
-                    _ = DispatcherHelper.ExecuteOnUIThreadAsync(() => Content = data);
+                    _ = DispatcherQueueHelper.ExecuteOnUIThreadAsync(dispatcherQueue, () => Content = data);
                 }
                 catch
                 {

Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj

@@ -25,8 +25,8 @@
   </ItemGroup> 
 
 	<ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="6.1.0" />
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="6.1.0" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="7.0.0-preview2" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="7.0.0-preview2" />
     <ProjectReference Include="..\Microsoft.Toolkit.Graph\Microsoft.Toolkit.Graph.csproj" />
   </ItemGroup>
 
@@ -35,7 +35,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Graph.Beta" Version="0.19.0-preview" />
+    <PackageReference Include="Microsoft.Graph.Beta" Version="0.21.0-preview" />
     <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
   </ItemGroup>
 

Microsoft.Toolkit.Graph.Controls/Providers/InteractiveProviderBehavior.cs

@@ -9,7 +9,7 @@
 using Microsoft.Toolkit.Graph.Providers;
 #else
 using System.Linq;
-using Windows.UI.Core;
+using Windows.System;
 #endif
 
 #if DOTNET
@@ -48,7 +48,7 @@ protected override bool Initialize()
                             await QuickCreate.CreateMsalProviderAsync(ClientId, RedirectUri, Scopes.ToArray());
                     }), System.Windows.Threading.DispatcherPriority.Normal);
 #else
-                    _ = Dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
+                    _ = DispatcherQueue.GetForCurrentThread().TryEnqueue(DispatcherQueuePriority.Normal, async () =>
                     {
                         ProviderManager.Instance.GlobalProvider =
                             await QuickCreate.CreateMsalProviderAsync(ClientId, RedirectUri, Scopes.ToArray());

Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj

@@ -21,8 +21,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Graph.Beta" Version="0.19.0-preview" />
+    <PackageReference Include="Microsoft.Graph.Beta" Version="0.21.0-preview" />
     <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
-    <PackageReference Include="Microsoft.Toolkit" Version="6.1.0" />
+    <PackageReference Include="Microsoft.Toolkit" Version="7.0.0-preview2" />
   </ItemGroup>
 </Project>

Samples/XAML Islands/UWP-XamlApplication/UWP-XamlApplication.csproj

@@ -154,7 +154,7 @@
       <Version>6.2.10</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
-      <Version>6.1.0</Version>
+      <Version>6.1.2</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

Samples/XAML Islands/WPF-Core-GraphApp/WPF-Core-GraphApp.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.1.0" />
+    <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.1.2" />
   </ItemGroup>
 
   <ItemGroup>

build/build.cake

@@ -1,7 +1,7 @@
-#module nuget:?package=Cake.LongPath.Module&version=0.5.0
+#module nuget:?package=Cake.LongPath.Module&version=0.7.0
 
-#addin "Cake.FileHelpers"
-#addin "Cake.Powershell"
+#addin nuget:?package=Cake.FileHelpers&version=3.3.0
+#addin nuget:?package=Cake.Powershell&version=0.4.8
 
 using System;
 using System.Linq;
@@ -17,7 +17,7 @@ var target = Argument("target", "Default");
 // VERSIONS
 //////////////////////////////////////////////////////////////////////
 
-var gitVersioningVersion = "3.1.91";
+var gitVersioningVersion = "3.2.31";
 var inheritDocVersion = "2.5.2";
 
 //////////////////////////////////////////////////////////////////////

global.json

@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "2.0.54"
+    "MSBuild.Sdk.Extras": "2.1.2"
   }
 }

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.1.0-build.{height}",
+  "version": "7.0.0-build.{height}",
   "publicReleaseRefSpec": [
     "^refs/heads/main$", // we release out of main
     "^refs/heads/dev$", // we release out of dev