Merge pull request #44 from microsoftgraph/patch-43

Replaced deprecated package with community package
microsoftgraph · May 16, 2022 · 2f525d3 · 2f525d3
2 parents 47b7f72 + 367d274
commit 2f525d3
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 22 deletions.
diff --git a/demo/GraphTutorial/CalendarPage.xaml.cs b/demo/GraphTutorial/CalendarPage.xaml.cs
@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 
 using Microsoft.Graph;
-using Microsoft.Toolkit.Graph.Providers;
+using CommunityToolkit.Authentication;
+using CommunityToolkit.Graph.Extensions;
 using Microsoft.Toolkit.Uwp.UI.Controls;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -48,7 +48,7 @@ private void ShowNotification(string message)
         protected override async void OnNavigatedTo(NavigationEventArgs e)
         {
             // Get the Graph client from the provider
-            var graphClient = ProviderManager.Instance.GlobalProvider.Graph;
+            var graphClient = ProviderManager.Instance.GlobalProvider.GetClient();
 
             try
             {

diff --git a/demo/GraphTutorial/GraphTutorial.csproj b/demo/GraphTutorial/GraphTutorial.csproj
@@ -172,14 +172,23 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Authentication.Msal">
+      <Version>7.1.1</Version>
+    </PackageReference>
+    <PackageReference Include="CommunityToolkit.Graph.Uwp">
+      <Version>7.1.1</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.11</Version>
+      <Version>6.2.13</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI">
+      <Version>7.1.2</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Graph.Controls">
-      <Version>7.0.0-preview2</Version>
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
+      <Version>7.1.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.Ui.Controls.DataGrid">
-      <Version>7.0.0-preview4</Version>
+      <Version>7.1.2</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/demo/GraphTutorial/MainPage.xaml b/demo/GraphTutorial/MainPage.xaml
@@ -12,14 +12,10 @@
     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:Interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:providers="using:Microsoft.Toolkit.Graph.Providers"
-    xmlns:wgt="using:Microsoft.Toolkit.Graph.Controls"  
+    xmlns:wgt="using:CommunityToolkit.Graph.Uwp.Controls"  
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-    <Interactivity:Interaction.Behaviors>
-        <providers:InteractiveProviderBehavior x:Name="MsalProvider" />
-    </Interactivity:Interaction.Behaviors>
-
     <Grid>
         <NavigationView x:Name="NavView"
             IsSettingsVisible="False"

diff --git a/demo/GraphTutorial/MainPage.xaml.cs b/demo/GraphTutorial/MainPage.xaml.cs
@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using Microsoft.Toolkit.Graph.Providers;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
+using CommunityToolkit.Authentication;
+using CommunityToolkit.Graph.Extensions;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 using Windows.UI.Xaml;
@@ -43,11 +44,10 @@ public MainPage()
             else
             {
                 // Configure MSAL provider  
-                MsalProvider.ClientId = appId;
-                MsalProvider.Scopes = new ScopeSet(scopes.Split(' '));
+                ProviderManager.Instance.GlobalProvider = new MsalProvider(appId, scopes.Split(' '));
 
                 // Handle auth state change
-                ProviderManager.Instance.ProviderUpdated += ProviderUpdated;
+                ProviderManager.Instance.ProviderStateChanged += ProviderUpdated;
 
                 // Navigate to HomePage.xaml
                 RootFrame.Navigate(typeof(HomePage));
@@ -56,7 +56,7 @@ public MainPage()
         // </ConstructorSnippet>
 
         // <ProviderUpdatedSnippet>
-        private void ProviderUpdated(object sender, ProviderUpdatedEventArgs e)
+        private void ProviderUpdated(object sender, ProviderStateChangedEventArgs e)
         {
             var globalProvider = ProviderManager.Instance.GlobalProvider;
             SetAuthState(globalProvider != null && globalProvider.State == ProviderState.SignedIn);

diff --git a/demo/GraphTutorial/NewEventPage.xaml b/demo/GraphTutorial/NewEventPage.xaml
@@ -2,7 +2,7 @@
      Licensed under the MIT License. -->
 
 <!-- <NewEventPageXamlSnippet> -->
-<Page xmlns:wgt="using:Microsoft.Toolkit.Graph.Controls" 
+<Page xmlns:wgt="using:CommunityToolkit.Graph.Uwp.Controls" 
     x:Class="GraphTutorial.NewEventPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

diff --git a/demo/GraphTutorial/NewEventPage.xaml.cs b/demo/GraphTutorial/NewEventPage.xaml.cs
@@ -18,9 +18,10 @@
 
 // <UsingStatementsSnippet>
 using System.ComponentModel;
+using CommunityToolkit.Authentication;
+using CommunityToolkit.Graph.Extensions;
 using Microsoft.Graph;
 using Microsoft.Graph.Extensions;
-using Microsoft.Toolkit.Graph.Providers;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using System.Runtime.CompilerServices;
 // </UsingStatementsSnippet>
@@ -171,7 +172,7 @@ public NewEventPage()
         protected override async void OnNavigatedTo(NavigationEventArgs e)
         {
             // Get the Graph client from the provider
-            var graphClient = ProviderManager.Instance.GlobalProvider.Graph;
+            var graphClient = ProviderManager.Instance.GlobalProvider.GetClient();
 
             try
             {
@@ -213,7 +214,7 @@ private async void CreateEvent(object sender, RoutedEventArgs e)
             CreateProgress.Visibility = Visibility.Visible;
 
             // Get the Graph client from the provider
-            var graphClient = ProviderManager.Instance.GlobalProvider.Graph;
+            var graphClient = ProviderManager.Instance.GlobalProvider.GetClient();
 
             // Initialize a new Event object with the required fields
             var newEvent = new Event
@@ -250,7 +251,7 @@ private async void CreateEvent(object sender, RoutedEventArgs e)
                         Type = AttendeeType.Required,
                         EmailAddress = new EmailAddress
                         {
-                            Address = person.EmailAddresses.First().Address
+                            Address = person.ScoredEmailAddresses.First().Address
                         }
                     });
                 }