update to latest build and api

jennyf19 · jennyf19 · commit cd0528f405e7 · 2020-07-07T20:58:46.000-07:00
diff --git a/1-WebApp-OIDC/1-1-MyOrg/README.md b/1-WebApp-OIDC/1-1-MyOrg/README.md
@@ -160,11 +160,10 @@ cd "1-WebApp-OIDC\1-1-MyOrg"
               .AddAzureAD(options => Configuration.Bind("AzureAd", options));
      ```
 
-     with these two:
+     by this line:
 
      ```CSharp
-      services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-              .AddMicrosoftWebApp(Configuration);
+       services.AddMicrosoftWebAppAuthentication(Configuration);
      ```
 
      This enables your application to use the Microsoft identity platform endpoint. This endpoint is capable of signing-in users both with their Work and School and Microsoft Personal accounts.
diff --git a/1-WebApp-OIDC/1-1-MyOrg/Startup.cs b/1-WebApp-OIDC/1-1-MyOrg/Startup.cs
@@ -34,8 +34,7 @@ public void ConfigureServices(IServiceCollection services)
             });
 
             // Sign-in users with the Microsoft identity platform
-            services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-                    .AddMicrosoftWebApp(Configuration);
+            services.AddMicrosoftWebAppAuthentication(Configuration);
 
             services.AddControllersWithViews(options =>
             {
diff --git a/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj
@@ -25,8 +25,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-preview" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
   </ItemGroup>
 
diff --git a/1-WebApp-OIDC/1-2-AnyOrg/README-1-1-to-1-2.md b/1-WebApp-OIDC/1-2-AnyOrg/README-1-1-to-1-2.md
@@ -57,15 +57,14 @@ The actual sign-in audience (accounts to sign-in) is the lowest set of what is s
 
 In order to restrict users from specific organizations from signing-in to your web app, you'll need to customize your code a bit more to restrict issuers. In Azure AD, the token issuers are the Azure AD tenants which issue tokens to applications.
 
-In the `Startup.cs` file, in the `ConfigureServices` method, after `services.AddMicrosoftWebApp(Configuration)` add some code to validate specific issuers by overriding the `TokenValidationParameters.IssuerValidator` delegate.
+In the `Startup.cs` file, in the `ConfigureServices` method, after `services.AddMicrosoftWebAppAuthentication(Configuration)` add some code to validate specific issuers by overriding the `TokenValidationParameters.IssuerValidator` delegate.
 
 ```CSharp
     public void ConfigureServices(IServiceCollection services)
     {
     ...
     // Sign-in users with the Microsoft identity platform
-    services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-            .AddMicrosoftWebApp(Configuration, options =>
+    services.AddMicrosoftWebAppAuthentication(Configuration, options =>
     {
         Configuration.Bind("AzureAd", options);
         // Restrict users to specific belonging to specific tenants
diff --git a/1-WebApp-OIDC/1-2-AnyOrg/README.md b/1-WebApp-OIDC/1-2-AnyOrg/README.md
@@ -152,11 +152,10 @@ cd "1-WebApp-OIDC\1-2-AnyOrg"
               .AddAzureAD(options => Configuration.Bind("AzureAd", options));
      ```
 
-     with these lines:
+     by this line:
 
      ```CSharp
-      services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-              .AddMicrosoftWebApp(Configuration);
+      services.AddMicrosoftWebAppAuthentication(Configuration);
      ```
 
      This enables your application to use the Microsoft identity platform endpoint. This endpoint is capable of signing-in users both with their Work and School and Microsoft Personal accounts.
diff --git a/1-WebApp-OIDC/1-2-AnyOrg/Startup.cs b/1-WebApp-OIDC/1-2-AnyOrg/Startup.cs
@@ -34,8 +34,7 @@ public void ConfigureServices(IServiceCollection services)
             });
 
             // Sign-in users with the Microsoft identity platform
-            services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-                .AddMicrosoftWebApp(Configuration);
+            services.AddMicrosoftWebAppAuthentication(Configuration);
 
             services.AddControllersWithViews(options =>
             {
diff --git a/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-preview" />
   </ItemGroup>
 
 </Project>
diff --git a/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/README.md b/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/README.md
@@ -147,12 +147,11 @@ In the **appsettings.json** file:
               .AddAzureAD(options => Configuration.Bind("AzureAd", options));
      ```
 
-     with these lines:
+     by this line:
 
      ```CSharp
 
-    services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-            .AddMicrosoftWebApp(Configuration);
+    services.AddMicrosoftWebAppAuthentication(Configuration);
 
      ```
 
diff --git a/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/Startup.cs b/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/Startup.cs
@@ -34,8 +34,7 @@ public void ConfigureServices(IServiceCollection services)
             });
 
             // Sign-in users with the Microsoft identity platform
-            services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-                    .AddMicrosoftWebApp(Configuration);
+            services.AddMicrosoftWebAppAuthentication(Configuration);
 
             services.AddControllersWithViews(options =>
             {
diff --git a/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-preview" />
   </ItemGroup>
 
 </Project>
diff --git a/1-WebApp-OIDC/1-4-Sovereign/README.md b/1-WebApp-OIDC/1-4-Sovereign/README.md
@@ -118,11 +118,10 @@ cd "1-WebApp-OIDC\1-4-Sovereign"
                  .AddAzureAD(options => Configuration.Bind("AzureAd", options));
      ```
 
-     by these lines:
+     by this line:
 
      ```CSharp
-      services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-              .AddMicrosoftWebApp(Configuration);
+         services.AddMicrosoftWebAppAuthentication(Configuration);
      ```
 
      This enables your application to use the Microsoft identity platform endpoint. This endpoint is capable of signing-in users both with their Work and School and Microsoft Personal accounts.
diff --git a/1-WebApp-OIDC/1-4-Sovereign/Startup.cs b/1-WebApp-OIDC/1-4-Sovereign/Startup.cs
@@ -34,8 +34,7 @@ public void ConfigureServices(IServiceCollection services)
             });
 
             // Sign-in users with the Microsoft identity platform
-            services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-                    .AddMicrosoftWebApp(Configuration);
+            services.AddMicrosoftWebAppAuthentication(Configuration);
 
             services.AddControllersWithViews(options =>
             {
diff --git a/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-preview" />
   </ItemGroup>
 
 </Project>
diff --git a/1-WebApp-OIDC/1-5-B2C/README.md b/1-WebApp-OIDC/1-5-B2C/README.md
@@ -125,13 +125,12 @@ You can trigger the middleware to send an OpenID Connect sign-in request by deco
 Here is the middleware example:
 
 ```csharp
-      services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-              .AddMicrosoftWebApp(Configuration, "AzureAdB2C");
+      services.AddMicrosoftWebAppAuthentication(Configuration, "AzureAdB2C");
 ```
 
 Important things to notice:
 
-- The method `AddMicrosoftWebApp` will configure the authentication based on the `MicrosoftIdentityOptions.cs` options. Feel free to bind more properties on `AzureAdB2C` section on `appsettings.json` if you need to set more options.
+- The method `AddMicrosoftWebAppAuthenticatio` will configure the authentication based on the `MicrosoftIdentityOptions.cs` options. Feel free to bind more properties on `AzureAdB2C` section on `appsettings.json` if you need to set more options.
 - The urls you set for `CallbackPath` and `SignedOutCallbackPath` should be registered on the **Reply Urls** of your application, in [Azure Portal](https://portal.azure.com).
 
 ## Next steps
diff --git a/1-WebApp-OIDC/1-5-B2C/Startup.cs b/1-WebApp-OIDC/1-5-B2C/Startup.cs
@@ -35,8 +35,7 @@ public void ConfigureServices(IServiceCollection services)
             });
 
             // Configuration to sign-in users with Azure AD B2C
-            services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
-                    .AddMicrosoftWebApp(Configuration, "AzureAdB2C");
+            services.AddMicrosoftWebAppAuthentication(Configuration, "AzureAdB2C");
 
             services.AddControllersWithViews()
                 .AddMicrosoftIdentityUI();
diff --git a/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-preview" />
   </ItemGroup>
 
 </Project>
diff --git a/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj b/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj
@@ -19,8 +19,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Graph" Version="1.21.0" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-preview" />
   </ItemGroup>
 
 </Project>
diff --git a/2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj b/2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj
@@ -20,8 +20,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1" />
     <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-preview" />
   </ItemGroup>
 
 </Project>
diff --git a/2-WebApp-graph-user/2-3-Multi-Tenant/README.md b/2-WebApp-graph-user/2-3-Multi-Tenant/README.md
@@ -212,7 +212,8 @@ These steps are encapsulated in the [Microsoft.Identity.Web](..\..\Microsoft.Ide
 In order to be able to sign-in users from multiple tenants, the [/common endpoint](https://docs.microsoft.com/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant#update-your-code-to-send-requests-to-common) must be used. In the sample, this endpoint is used as a result of setting the value for `TenantId` as `organizations` on the `appsettings.json` file, and configuring the middleware to read the values from it.
 
 ```csharp
-services.AddMicrosoftWebApp(Configuration);
+services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
+        .AddMicrosoftWebApp(Configuration)
 ```
 
  You can read about the various endpoints of the Microsoft Identity Platform [here](https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-protocols#endpoints).
diff --git a/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-OpenIDConnect-DotNet.csproj b/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-OpenIDConnect-DotNet.csproj
@@ -22,8 +22,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1" />
     <PackageReference Include="Microsoft.Graph" Version="1.20.0" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-preview" />
   </ItemGroup>
 
 </Project>
diff --git a/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj b/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-preview" />
   </ItemGroup>
 
 </Project>
diff --git a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj
@@ -19,8 +19,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Graph" Version="1.12.0" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-preview" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
   </ItemGroup>
 
diff --git a/4-WebApp-your-API/4-1-MyOrg/Client/Startup.cs b/4-WebApp-your-API/4-1-MyOrg/Client/Startup.cs
@@ -43,7 +43,8 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddOptions();
 
-            services.AddMicrosoftWebApp(Configuration);
+            services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
+                     .AddMicrosoftWebApp(Configuration)
 
             // This is required to be instantiated before the OpenIdConnectOptions starts getting configured.
             // By default, the claims mapping will map claim names in the old format to accommodate older SAML applications.
@@ -53,8 +54,8 @@ public void ConfigureServices(IServiceCollection services)
 
             // Token acquisition service based on MSAL.NET
             // and chosen token cache implementation
-            services.AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] })
-                    .AddInMemoryTokenCaches();
+                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] });
+            services.AddInMemoryTokenCaches();
 
             // Add APIs
             services.AddTodoListService(Configuration);
diff --git a/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj b/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj
@@ -24,8 +24,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.1" />
     <PackageReference Include="Microsoft.Graph" Version="1.16.0" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-preview" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
   </ItemGroup>
 
diff --git a/4-WebApp-your-API/4-1-MyOrg/README-incremental-instructions.md b/4-WebApp-your-API/4-1-MyOrg/README-incremental-instructions.md
@@ -208,9 +208,10 @@ Add a reference to the `Microsoft.Identity.Web` library if not already present.
 1. Update the `configureServices` method in `startup.cs` to add the MSAL library and a token cache.
 
 ```CSharp
-    services.AddMicrosoftWebApp(Configuration)
-            .AddMicrosoftWebAppCallsWebApi(new string[] { Configuration["TodoList:TodoListScope"] })
-            .AddInMemoryTokenCaches();
+     services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
+             .AddMicrosoftWebApp(Configuration)
+             .AddMicrosoftWebAppCallsWebApi(new string[] { Configuration["TodoList:TodoListScope"] })
+     services.AddInMemoryTokenCaches();
  ```
 
 ### Creating the Web API project (TodoListService)
diff --git a/4-WebApp-your-API/4-1-MyOrg/README.md b/4-WebApp-your-API/4-1-MyOrg/README.md
@@ -246,12 +246,13 @@ Explore the sample by signing in into the TodoList client, adding items to the T
               .AddAzureAD(options => Configuration.Bind("AzureAd", options));
      ```
 
-     by this line:
+     with these lines:
 
      ```CSharp
-     services.AddMicrosoftWebApp(Configuration)
-          .AddMicrosoftWebAppCallsWebApi(new string[] { Configuration["TodoList:TodoListScope"] })
-          .AddInMemoryTokenCaches();
+     services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
+             .AddMicrosoftWebApp(Configuration)
+             .AddMicrosoftWebAppCallsWebApi(new string[] { Configuration["TodoList:TodoListScope"] })
+     services.AddInMemoryTokenCaches();
      ```
 
      This enables your application to use the Microsoft identity platform endpoint. This endpoint is capable of signing-in users both with their Work and School and Microsoft Personal accounts.
@@ -280,9 +281,10 @@ Explore the sample by signing in into the TodoList client, adding items to the T
 1. Update the `configureServices` method in `startup.cs` to add the MSAL library and a token cache.
 
     ```CSharp
-     services.AddMicrosoftWebApp(Configuration)
-          .AddMicrosoftWebAppCallsWebApi(new string[] { Configuration["TodoList:TodoListScope"] })
-          .AddInMemoryTokenCaches();
+     services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
+             .AddMicrosoftWebApp(Configuration)
+             .AddMicrosoftWebAppCallsWebApi(new string[] { Configuration["TodoList:TodoListScope"] })
+     services.AddInMemoryTokenCaches();
     ```
 1. Update the `Configure` method to include **app.UseAuthentication();** before **app.UseMvc();**  
 
@@ -332,8 +334,7 @@ using Microsoft.Identity.Web.Client.TokenCacheProviders;
   with
 
   ```Csharp
-    services.AddMicrosoftWebApi(Configuration)
-         .AddInMemoryTokenCaches();
+    services.AddMicrosoftWebApiAuthentication(Configuration);
   ```
 - Add the method **app.UseAuthentication()** before **app.UseMvc()** in the `Configure` method
 
diff --git a/4-WebApp-your-API/4-1-MyOrg/TodoListService/Startup.cs b/4-WebApp-your-API/4-1-MyOrg/TodoListService/Startup.cs
@@ -31,7 +31,7 @@ public void ConfigureServices(IServiceCollection services)
             // JwtSecurityTokenHandler.DefaultMapInboundClaims = false;
 
             // Adds Microsoft Identity platform (AAD v2.0) support to protect this Api
-            services.AddMicrosoftWebApi(Configuration);
+            services.AddMicrosoftWebApiAuthentication(Configuration);
 
             services.AddControllers();
         }
diff --git a/4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj b/4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
   </ItemGroup>
 
 </Project>
diff --git a/4-WebApp-your-API/4-2-B2C/Client/Startup.cs b/4-WebApp-your-API/4-2-B2C/Client/Startup.cs
@@ -42,7 +42,8 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddOptions();
 
-            services.AddMicrosoftWebApp(Configuration, "AzureAdB2C");
+            services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
+                    .AddMicrosoftWebApp(Configuration, "AzureAdB2C")
 
             // This is required to be instantiated before the OpenIdConnectOptions starts getting configured.
             // By default, the claims mapping will map claim names in the old format to accommodate older SAML applications.
@@ -52,8 +53,8 @@ public void ConfigureServices(IServiceCollection services)
 
             // Token acquisition service based on MSAL.NET
             // and chosen token cache implementation
-            services.AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] }, configSectionName: "AzureAdB2C")
-                    .AddInMemoryTokenCaches();
+                    .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] }, configSectionName: "AzureAdB2C");
+            services.AddInMemoryTokenCaches();
 
             // Add APIs
             services.AddTodoListService(Configuration);
diff --git a/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj b/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj
@@ -24,8 +24,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.1" />
     <PackageReference Include="Microsoft.Graph" Version="1.16.0" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-localbuild" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-localbuild" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="0.2.0-preview" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.0-preview" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
   </ItemGroup>
 
diff --git a/4-WebApp-your-API/4-2-B2C/README-incremental-instructions.md b/4-WebApp-your-API/4-2-B2C/README-incremental-instructions.md
diff --git a/4-WebApp-your-API/4-2-B2C/README.md b/4-WebApp-your-API/4-2-B2C/README.md
diff --git a/4-WebApp-your-API/4-2-B2C/TodoListService/Startup.cs b/4-WebApp-your-API/4-2-B2C/TodoListService/Startup.cs
diff --git a/4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj b/4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj
diff --git a/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj b/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj
diff --git a/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj b/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,7 @@ public void ConfigureServices(IServiceCollection services)`
`34`	`34`	`});`
`35`	`35`
`36`	`36`	`// Sign-in users with the Microsoft identity platform`
`37`		`- services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)`
`38`		`- .AddMicrosoftWebApp(Configuration);`
	`37`	`+ services.AddMicrosoftWebAppAuthentication(Configuration);`
`39`	`38`
`40`	`39`	`services.AddControllersWithViews(options =>`
`41`	`40`	`{`