From ac1997a5db7bff0f963ab459d350545cb29061f7 Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Tue, 11 Aug 2020 13:06:47 -0700 Subject: [PATCH] Updated Main toolkit dependency to 7.0.0-preview2, updated dependencies in general, and now using the DispatcherQueue. --- Directory.Build.props | 2 +- .../Controls/GraphPresenter/GraphPresenter.cs | 5 ++++- .../Microsoft.Toolkit.Graph.Controls.csproj | 6 +++--- .../Providers/InteractiveProviderBehavior.cs | 4 ++-- Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj | 4 ++-- .../UWP-XamlApplication/UWP-XamlApplication.csproj | 2 +- .../WPF-Core-GraphApp/WPF-Core-GraphApp.csproj | 2 +- build/build.cake | 8 ++++---- global.json | 2 +- version.json | 2 +- 10 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 999e286..119e486 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -83,7 +83,7 @@ - + diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs b/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs index 5fa1a3c..772c85e 100644 --- a/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs +++ b/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 { diff --git a/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj b/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj index f44f769..1449ef9 100644 --- a/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj +++ b/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj @@ -25,8 +25,8 @@ - - + + @@ -35,7 +35,7 @@ - + diff --git a/Microsoft.Toolkit.Graph.Controls/Providers/InteractiveProviderBehavior.cs b/Microsoft.Toolkit.Graph.Controls/Providers/InteractiveProviderBehavior.cs index cffbfe8..99de148 100644 --- a/Microsoft.Toolkit.Graph.Controls/Providers/InteractiveProviderBehavior.cs +++ b/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()); diff --git a/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj b/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj index 5164e15..f119fed 100644 --- a/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj +++ b/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj @@ -21,8 +21,8 @@ - + - + diff --git a/Samples/XAML Islands/UWP-XamlApplication/UWP-XamlApplication.csproj b/Samples/XAML Islands/UWP-XamlApplication/UWP-XamlApplication.csproj index d8663fd..0cb286f 100644 --- a/Samples/XAML Islands/UWP-XamlApplication/UWP-XamlApplication.csproj +++ b/Samples/XAML Islands/UWP-XamlApplication/UWP-XamlApplication.csproj @@ -154,7 +154,7 @@ 6.2.10 - 6.1.0 + 6.1.2 diff --git a/Samples/XAML Islands/WPF-Core-GraphApp/WPF-Core-GraphApp.csproj b/Samples/XAML Islands/WPF-Core-GraphApp/WPF-Core-GraphApp.csproj index 1ce0e96..ff0c4da 100644 --- a/Samples/XAML Islands/WPF-Core-GraphApp/WPF-Core-GraphApp.csproj +++ b/Samples/XAML Islands/WPF-Core-GraphApp/WPF-Core-GraphApp.csproj @@ -9,7 +9,7 @@ - + diff --git a/build/build.cake b/build/build.cake index 54663a5..fd6eb51 100644 --- a/build/build.cake +++ b/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"; ////////////////////////////////////////////////////////////////////// diff --git a/global.json b/global.json index 80d84a2..7025f06 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "msbuild-sdks": { - "MSBuild.Sdk.Extras": "2.0.54" + "MSBuild.Sdk.Extras": "2.1.2" } } \ No newline at end of file diff --git a/version.json b/version.json index 6f05a7c..cfbc79b 100644 --- a/version.json +++ b/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