Merge pull request #45 from Azure-Samples/jennyf/msal4.6

update msal and fix su_si authority name

Author: jennyf19

active-directory-b2c-wpf/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
-</configuration>
+</configuration>

active-directory-b2c-wpf/App.xaml.cs

@@ -20,7 +20,7 @@ public partial class App : Application
         public static string[] ApiScopes = { "https://fabrikamb2c.onmicrosoft.com/helloapi/demo.read" };
         public static string ApiEndpoint = "https://fabrikamb2chello.azurewebsites.net/hello";
         private static string AuthorityBase = $"https://{AzureAdB2CHostname}/tfp/{Tenant}/";
-        public static string AuthoritySignInSignUp = $"{AuthorityBase}{PolicySignUpSignIn}";
+        public static string AuthoritySignUpSignIn = $"{AuthorityBase}{PolicySignUpSignIn}";
         public static string AuthorityEditProfile = $"{AuthorityBase}{PolicyEditProfile}";
         public static string AuthorityResetPassword = $"{AuthorityBase}{PolicyResetPassword}";
 
@@ -29,7 +29,7 @@ public partial class App : Application
         static App()
         {
             PublicClientApp = PublicClientApplicationBuilder.Create(ClientId)
-                .WithB2CAuthority(AuthoritySignInSignUp)
+                .WithB2CAuthority(AuthoritySignUpSignIn)
                 .WithLogging(Log, LogLevel.Verbose, false) //PiiEnabled set to false
                 .Build();
 

active-directory-b2c-wpf/MainWindow.xaml.cs

@@ -201,7 +201,7 @@ private async void Window_Loaded(object sender, RoutedEventArgs e)
                 DisplayUserInfo(authResult);
                 UpdateSignInState(true);
             }
-            catch (MsalUiRequiredException ex)
+            catch (MsalUiRequiredException)
             {
                 // Ignore, user will need to sign in interactively.
                 ResultText.Text = "You need to sign-in first, and then Call API";

active-directory-b2c-wpf/Properties/Resources.Designer.cs

@@ -27,30 +27,13 @@
 
 using System.IO;
 using System.Security.Cryptography;
+using System.Windows.Controls;
 using Microsoft.Identity.Client;
 
 namespace active_directory_b2c_wpf
 {
     static class TokenCacheHelper
     {
-
-        /// <summary>
-        /// Get the user token cache
-        /// </summary>
-        /// <returns></returns>
-        public static TokenCache GetUserCache()
-        {
-            if (usertokenCache == null)
-            {
-                usertokenCache = new TokenCache();
-                usertokenCache.SetBeforeAccess(BeforeAccessNotification);
-                usertokenCache.SetAfterAccess(AfterAccessNotification);
-            }
-            return usertokenCache;
-        }
-
-        static TokenCache usertokenCache;
-
         /// <summary>
         /// Path to the token cache
         /// </summary>

active-directory-b2c-wpf/Properties/Settings.Designer.cs

@@ -8,11 +8,12 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>active_directory_b2c_wpf</RootNamespace>
     <AssemblyName>active_directory_b2c_wpf</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,8 +35,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Identity.Client, Version=4.5.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Identity.Client.4.5.0\lib\net45\Microsoft.Identity.Client.dll</HintPath>
+    <Reference Include="Microsoft.Identity.Client, Version=4.6.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Identity.Client.4.6.0\lib\net45\Microsoft.Identity.Client.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>

active-directory-b2c-wpf/TokenCacheHelper.cs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Identity.Client" version="4.5.0" targetFramework="net452" />
+  <package id="Microsoft.Identity.Client" version="4.6.0" targetFramework="net452" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.1" targetFramework="net452" />
   <package id="Microsoft.NETCore.Targets" version="1.1.3" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net452" />