Skip to content

Update to 7.0.0-preview2. #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michael-hawker merged 1 commit into from
Aug 12, 2020
Merged

Update to 7.0.0-preview2. #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Toolkit.Graph.Controls/Providers/InteractiveProviderBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Microsoft.Toolkit.Graph.Providers;
#else
using System.Linq;
using Windows.UI.Core;
using Windows.System;
#endif

#if DOTNET
Expand Down Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
</PropertyGroup>
Copy link
Member

@michael-hawker michael-hawker Aug 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@azchohfi I meant to ask, I did notice that we multi-target here, but pretty sure we're just .NET Standard right, so do you remember why we might have done this?

Copy link
Collaborator Author

@azchohfi azchohfi Aug 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is a great question... Git blame didn't help much:
526138d#diff-30f6d4fe840f95e89a9fae72c74c5362
There is a failing build on PR #4, that got fixed by this commit, but the build itself is too old, and we purged the logs.

Copy link
Member

@michael-hawker michael-hawker Aug 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if I made it to help with Uno or something. We can follow-up with @jeromelaban later after UnoConf maybe?


<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>
2 changes: 1 addition & 1 deletion Samples/XAML Islands/UWP-XamlApplication/UWP-XamlApplication.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Samples/XAML Islands/WPF-Core-GraphApp/WPF-Core-GraphApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions build/build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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";

//////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.0.54"
"MSBuild.Sdk.Extras": "2.1.2"
}
}
2 changes: 1 addition & 1 deletion version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down