Skip to content

Commit ab97754

Browse files
authored
Merge pull request #395 from Azure-Samples/jennyf/0.3.0-preview
initial commit to update to 0.3.0-preview, change nuget package name …
2 parents fab815e + 90c018e commit ab97754

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+141
-143
lines changed

1-WebApp-OIDC/1-1-MyOrg/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ cd "1-WebApp-OIDC\1-1-MyOrg"
163163
by this line:
164164
165165
```CSharp
166-
services.AddMicrosoftWebAppAuthentication(Configuration);
166+
services.AddMicrosoftIdentityWebAppAuthentication(Configuration);
167167
```
168168
169169
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.

1-WebApp-OIDC/1-1-MyOrg/Startup.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
2-
using Microsoft.AspNetCore.Authorization;
1+
using Microsoft.AspNetCore.Authorization;
32
using Microsoft.AspNetCore.Builder;
43
using Microsoft.AspNetCore.Hosting;
54
using Microsoft.AspNetCore.Http;
@@ -34,7 +33,7 @@ public void ConfigureServices(IServiceCollection services)
3433
});
3534

3635
// Sign-in users with the Microsoft identity platform
37-
services.AddMicrosoftWebAppAuthentication(Configuration);
36+
services.AddMicrosoftIdentityWebAppAuthentication(Configuration);
3837

3938
services.AddControllersWithViews(options =>
4039
{

1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>
2727
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
28-
<PackageReference Include="Microsoft.Identity.Web" Version="0.2.2-preview" />
29-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.2-preview" />
28+
<PackageReference Include="Microsoft.Identity.Web" Version="0.3.0-preview" />
29+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.3.0-preview" />
3030
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
3131
</ItemGroup>
3232

1-WebApp-OIDC/1-2-AnyOrg/README-1-1-to-1-2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ description: "Change your ASP.NET Core Web app to sign-in users in any org with
2525

2626
![Sign in with Azure AD](ReadmeFiles/sign-in.png)
2727

28-
> This is the second chapter of the first phase of this ASP.NET Core Web App tutorial. You learnt previously how to build an ASP.NET Core Web app signing-in users with the Microsoft identity platform in [your organization](../1-1-MyOrg). This chapter describes how to change that application to enable users to sign-in from any organization.
28+
> This is the second chapter of the first phase of this ASP.NET Core Web App tutorial. You learned previously how to build an ASP.NET Core Web app signing-in users with the Microsoft identity platform in [your organization](../1-1-MyOrg). This chapter describes how to change that application to enable users to sign-in from any organization.
2929
>
3030
> If you are not interested in the differentials, but want to understand all the steps, read the full [Readme.md](./Readme.md)
3131
@@ -65,7 +65,7 @@ In the `Startup.cs` file, in the `ConfigureServices` method, after `services.Add
6565
...
6666
// Sign-in users with the Microsoft identity platform
6767
services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
68-
.AddMicrosoftWebApp(options =>
68+
.AddMicrosoftIdentityWebApp(options =>
6969
{
7070
Configuration.Bind("AzureAd", options);
7171
// Restrict users to specific belonging to specific tenants

1-WebApp-OIDC/1-2-AnyOrg/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ cd "1-WebApp-OIDC\1-2-AnyOrg"
155155
by this line:
156156
157157
```CSharp
158-
services.AddMicrosoftWebAppAuthentication(Configuration);
158+
services.AddMicrosoftIdentityWebAppAuthentication(Configuration);
159159
```
160160
161161
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.
@@ -228,7 +228,7 @@ In the `Startup.cs` file, in the `ConfigureServices` method, after `services.Add
228228
{
229229
...
230230
// Sign-in users with the Microsoft identity platform
231-
services.AddMicrosoftWebAppAuthentication(Configuration);
231+
services.AddMicrosoftIdentityWebAppAuthentication(Configuration);
232232
233233
// Restrict users to specific belonging to specific tenants
234234
services.Configure<OpenIdConnectOptions>(OpenIdConnectDefaults.AuthenticationScheme, options =>

1-WebApp-OIDC/1-2-AnyOrg/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void ConfigureServices(IServiceCollection services)
3434
});
3535

3636
// Sign-in users with the Microsoft identity platform
37-
services.AddMicrosoftWebAppAuthentication(Configuration);
37+
services.AddMicrosoftIdentityWebAppAuthentication(Configuration);
3838

3939
services.AddControllersWithViews(options =>
4040
{

1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Identity.Web" Version="0.2.2-preview" />
22-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.2.2-preview" />
21+
<PackageReference Include="Microsoft.Identity.Web" Version="0.3.0-preview" />
22+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.3.0-preview" />
2323
</ItemGroup>
2424

2525
</Project>

1-WebApp-OIDC/1-3-AnyOrgOrPersonal/README-1-1-to-1-3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ endpoint: Microsoft identity platform
1616

1717
![Sign in with Azure AD](ReadmeFiles/sign-in.png)
1818

19-
> This is the third chapter of the first phase of this ASP.NET Core Web App tutorials. You learnt previously how to build an ASP.NET Core Web app that signs-in users with the Microsoft identity platform in [your organization](../1-1-MyOrg) or [any organization](../1-2-AnyOrg). This chapter describes how to change that application to enable users to sign-in from any work or school account or Microsoft personal account.
19+
> This is the third chapter of the first phase of this ASP.NET Core Web App tutorials. You learned previously how to build an ASP.NET Core Web app that signs-in users with the Microsoft identity platform in [your organization](../1-1-MyOrg) or [any organization](../1-2-AnyOrg). This chapter describes how to change that application to enable users to sign-in from any work or school account or Microsoft personal account.
2020
>
2121
> If you are not interested in the differentials, but want to understand all the steps, read the full [Readme.md](./Readme.md)
2222

1-WebApp-OIDC/1-3-AnyOrgOrPersonal/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ There is one project in this sample. To register it, you can:
5454
6. If your account is present in more than one Azure AD tenant, select `Directory + Subscription` at the top right corner in the menu on top of the page, and switch your portal session to the desired Azure AD tenant.
5555
8. Navigate to the Microsoft identity platform for developers [App registrations](https://go.microsoft.com/fwlink/?linkid=2083908) page.
5656
and locate your newly created app in the list.
57-
> Tip: If you register your apps with the the provided Powershell scripts, you can navigate directly to the app registration portal page of your newly created app, using links provided in the [AppCreationScripts\createdApps.html](AppCreationScripts\createdApps.html). This file is generated by the scripts during the app registration and configuration process.
57+
> Tip: If you register your apps with the provided Powershell scripts, you can navigate directly to the app registration portal page of your newly created app, using links provided in the [AppCreationScripts\createdApps.html](AppCreationScripts\createdApps.html). This file is generated by the scripts during the app registration and configuration process.
5858
9. Select the **Manifest** section for your app.
5959
10. Search for **signInAudience** and make sure it's set to **AzureADandPersonalMicrosoftAccount**
6060
@@ -150,7 +150,7 @@ In the **appsettings.json** file:
150150
- by this line:
151151
152152
```CSharp
153-
services.AddMicrosoftWebAppAuthentication(Configuration);
153+
services.AddMicrosoftIdentityWebAppAuthentication(Configuration);
154154
```
155155
156156
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.
@@ -226,7 +226,7 @@ You can also learn from the [1. WebApp signs-in users with Microsoft Identity (O
226226

227227
### Options 4: Restrict access to specific tenants.
228228

229-
See restrict restrict users from [specific organizations](../1-2-AnyOrg/README-1-1-to-1-2.md#How-to-restrict-users-from-specific-organizations-to-sign-in-to-your-web-app) to sign-in to your web app
229+
See restrict users from [specific organizations](../1-2-AnyOrg/README-1-1-to-1-2.md#How-to-restrict-users-from-specific-organizations-to-sign-in-to-your-web-app) to sign-in to your web app
230230

231231
## Toubleshooting
232232

@@ -270,4 +270,4 @@ To understand more about app registration, see:
270270
271271
## Previous steps
272272
- enable [your organization](../1-1-MyOrg) only or [any Microsoft accounts](../1-3-AnyOrgOrPersonal) to sign-in to your Web app
273-
- restrict restrict users from [specific organizations](./README-1-1-to-1-2.md#How-to-restrict-users-from-specific-organizations-to-sign-in-to-your-web-app) to sign-in to your web app
273+
- restrict users from [specific organizations](./README-1-1-to-1-2.md#How-to-restrict-users-from-specific-organizations-to-sign-in-to-your-web-app) to sign-in to your web app

1-WebApp-OIDC/1-3-AnyOrgOrPersonal/Startup.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Microsoft.Extensions.DependencyInjection;
88
using Microsoft.Identity.Web;
99
using Microsoft.Extensions.Hosting;
10-
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
1110
using Microsoft.Identity.Web.UI;
1211

1312
namespace WebApp_OpenIDConnect_DotNet
@@ -34,7 +33,7 @@ public void ConfigureServices(IServiceCollection services)
3433
});
3534

3635
// Sign-in users with the Microsoft identity platform
37-
services.AddMicrosoftWebAppAuthentication(Configuration);
36+
services.AddMicrosoftIdentityWebAppAuthentication(Configuration);
3837

3938
services.AddControllersWithViews(options =>
4039
{

0 commit comments

Comments
 (0)