Merge pull request #21 from AzureADQuickStarts/jmprieur/updateToLastestMsal

Updates to latest MSAL.NET

Author: jmprieur

TodoListClient/App.config

@@ -1,22 +1,36 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
     </startup>
   <appSettings>
-    <!-- ida:Client is a GUID representing the Application Id for the TodoListClient app that you copied from
-         the App Registration Portal ((https://go.microsoft.com/fwlink/?linkid=2083908) -->
+    <!-- Hostname for the Azure AD instance. {0} will be replaced by the value of ida:Tenant below
+         You can change this URL if you want your application to sign-in users from other clouds 
+         than the Azure Global Cloud (See national clouds / sovereign clouds at https://aka.ms/aadv2-national-clouds)
+    -->
+    <add key="ida:AADInstance" value="https://login.microsoftonline.com/{0}/v2.0"/>
 
+    <!-- 
+      ida:Tenant can be:
+      - a proper tenant Id (a GUID) or tenant domain (e.g. contoso.onmicrosoft.com) if your application signs-in only users of a given organization
+      - or one of the following three words which are not proper tenants, but only conventions:
+        - 'common' to sign-in Work or School accounts and Microsoft personal accounts
+        - 'organizations' to sign-in Work or School accounts
+        - 'consumers' to sign-in only Microsoft personal accounts
+      This should be consistent with the audience of users who can sign-in, as specified during the application registration
+    -->
+    <add key="ida:Tenant" value="organizations"/>
+    
+    <!--
+      ClientID (ApplicationID) of your application as registered in the App Registration under Azure Active Directory
+      in https://portal.azure.com
+   -->
     <add key="ida:ClientId" value="{Enter the Application Id that you copied from the App Registration Portal.}" />
-
-    <!-- TodoListServiceScope is either:
-     - the same as ida:ClientId, as V2 apps enable several platforms for a same application (a GUID)
-     - or otherwise the scope of the Web API created with aht App Registration portal, for instance api://[V2-WebApi-AppId]/access_as_user
-       where [V2-WebApi-AppId] is a GUID representing the Application ID of the Web API.
-     - or otherwise this can be the scope of a V1 Web API (created with https://portal.azure.com) for instance [V1_WebApi-AppId]/user_impersonation
-       where [V1-WebApi-AppId] is a GUID representing the Application ID (also named Client ID) of the V1 Web API created in https://portal.azure.com.
-       In that case (V1 app), the Authority used to build the PubliClientApplication in MainWindow.xaml.cs should be set to 
-       "https://login.microsoftonline.com/organizations/" instead of "https://login.microsoftonline.com/common/"
+    <!--
+      todo:TodoListServiceScope is the scope of the Web API you want to call. This can be:
+      - a scope for a V2 application (for instance api://b3682cc7-8b30-4bd2-aaba-080c6bf0fd31/access_as_user)
+      - a scope corresponding to a legacy application (for instance <GUID>/user_impersonation, where  <GUID> is the
+        clientId of a legacy application, created in the https://portal.azure.com portal.
     -->
 
     <add key="TodoListServiceScope" value="api://{Enter the Application Id of your TodoListService from the app registration portal}/access_as_user" />

TodoListClient/App.xaml.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 using System.Windows;
 
 namespace TodoListClient

TodoListClient/MainWindow.xaml

@@ -18,14 +18,16 @@
             </VisualBrush>
         </Grid.Resources>
         <StackPanel Grid.Row="0" Margin="5" VerticalAlignment="Top" Height="351">
-            <Button HorizontalAlignment="Right" Content="Sign In" Margin="0" Click="SignIn" x:Name="SignInButton" Width="80" Height="30">
-                <Button.Style>
-                    <Style TargetType="{x:Type Button}">
-                        <!-- "<Setter Property="IsEnabled" Value="False" /> -->
-                    </Style>
-                </Button.Style>
-
-            </Button>
+            <Grid HorizontalAlignment="Left" Width="346">
+                <Label HorizontalAlignment="Left" Content="Not Signed" Margin="0" x:Name="UserName" Width="261" Height="30"/>
+                <Button HorizontalAlignment="Right" Content="Sign In" Margin="0" Click="SignIn" x:Name="SignInButton" Width="80" Height="30">
+                    <Button.Style>
+                        <Style TargetType="{x:Type Button}">
+                            <!-- "<Setter Property="IsEnabled" Value="False" /> -->
+                        </Style>
+                    </Button.Style>
+                </Button>
+            </Grid>
             <GroupBox Margin="0,0,0,0" Header="Create a To Do item">
 
                 <Grid Margin="0" HorizontalAlignment="Left" Width="388" >