Skip to content

Commit 109d8ef

Browse files
jennyf19jennyf19
committed
update samples to take Microsoft Identity Web as a nuget package
1 parent 610e507 commit 109d8ef

File tree

111 files changed

+78
-6579
lines changed

Some content is hidden

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

111 files changed

+78
-6579
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,7 @@ cd "1-WebApp-OIDC\1-1-MyOrg"
164164
by this line:
165165
166166
```CSharp
167-
services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
168-
.AddSignIn("AzureAd", Configuration, options => Configuration.Bind("AzureAd", options));
167+
services.AddSignIn(Configuration);
169168
```
170169
171170
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public void ConfigureServices(IServiceCollection services)
3535

3636
// Sign-in users with the Microsoft identity platform
3737
//services.AddSignIn(Configuration);
38-
services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
39-
.AddSignIn("AzureAD", Configuration, options => Configuration.Bind("AzureAD", options));
38+
services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme);
39+
services.AddSignIn(Configuration);
4040

4141
services.AddControllersWithViews(options =>
4242
{

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,9 @@
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.1.0-localbuild" />
29+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-localbuild" />
2830
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
2931
</ItemGroup>
3032

31-
<ItemGroup>
32-
<ProjectReference Include="..\..\Microsoft.Identity.Web.UI\Microsoft.Identity.Web.UI.csproj" />
33-
<ProjectReference Include="..\..\Microsoft.Identity.Web\Microsoft.Identity.Web.csproj" />
34-
</ItemGroup>
35-
3633
</Project>

‎1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.sln‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ VisualStudioVersion = 16.0.29519.87
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApp-OpenIDConnect-DotNet", "WebApp-OpenIDConnect-DotNet.csproj", "{8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Web", "..\..\Microsoft.Identity.Web\Microsoft.Identity.Web.csproj", "{E0CEF26A-6CE6-4505-851B-6580D5564752}"
9-
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Identity.Web.UI", "..\..\Microsoft.Identity.Web.UI\Microsoft.Identity.Web.UI.csproj", "{57CF1884-743D-4BF3-B14B-4F8660469038}"
11-
EndProject
128
Global
139
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1410
Debug|Any CPU = Debug|Any CPU
@@ -19,14 +15,6 @@ Global
1915
{8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
2016
{8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
2117
{8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}.Release|Any CPU.Build.0 = Release|Any CPU
22-
{E0CEF26A-6CE6-4505-851B-6580D5564752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23-
{E0CEF26A-6CE6-4505-851B-6580D5564752}.Debug|Any CPU.Build.0 = Debug|Any CPU
24-
{E0CEF26A-6CE6-4505-851B-6580D5564752}.Release|Any CPU.ActiveCfg = Release|Any CPU
25-
{E0CEF26A-6CE6-4505-851B-6580D5564752}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{57CF1884-743D-4BF3-B14B-4F8660469038}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{57CF1884-743D-4BF3-B14B-4F8660469038}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{57CF1884-743D-4BF3-B14B-4F8660469038}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{57CF1884-743D-4BF3-B14B-4F8660469038}.Release|Any CPU.Build.0 = Release|Any CPU
3018
EndGlobalSection
3119
GlobalSection(SolutionProperties) = preSolution
3220
HideSolutionNode = FALSE

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,7 @@ cd "1-WebApp-OIDC\1-2-AnyOrg"
156156
by this line:
157157
158158
```CSharp
159-
services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
160-
.AddSignIn("AzureAd", Configuration, options => Configuration.Bind("AzureAd", options));
159+
services.AddSignIn(Configuration);
161160
```
162161
163162
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-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-
<ProjectReference Include="..\..\Microsoft.Identity.Web.UI\Microsoft.Identity.Web.UI.csproj" />
22-
<ProjectReference Include="..\..\Microsoft.Identity.Web\Microsoft.Identity.Web.csproj" />
21+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-localbuild" />
22+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-localbuild" />
2323
</ItemGroup>
2424

2525
</Project>

‎1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.sln‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ VisualStudioVersion = 16.0.29709.97
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApp-OpenIDConnect-DotNet", "WebApp-OpenIDConnect-DotNet.csproj", "{8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Web", "..\..\Microsoft.Identity.Web\Microsoft.Identity.Web.csproj", "{E0CEF26A-6CE6-4505-851B-6580D5564752}"
9-
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Web.UI", "..\..\Microsoft.Identity.Web.UI\Microsoft.Identity.Web.UI.csproj", "{32BCFB8C-7DF5-43D2-9B39-C48B4B707E0E}"
11-
EndProject
128
Global
139
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1410
Debug|Any CPU = Debug|Any CPU
@@ -19,14 +15,6 @@ Global
1915
{8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
2016
{8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
2117
{8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}.Release|Any CPU.Build.0 = Release|Any CPU
22-
{E0CEF26A-6CE6-4505-851B-6580D5564752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23-
{E0CEF26A-6CE6-4505-851B-6580D5564752}.Debug|Any CPU.Build.0 = Debug|Any CPU
24-
{E0CEF26A-6CE6-4505-851B-6580D5564752}.Release|Any CPU.ActiveCfg = Release|Any CPU
25-
{E0CEF26A-6CE6-4505-851B-6580D5564752}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{32BCFB8C-7DF5-43D2-9B39-C48B4B707E0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{32BCFB8C-7DF5-43D2-9B39-C48B4B707E0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{32BCFB8C-7DF5-43D2-9B39-C48B4B707E0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{32BCFB8C-7DF5-43D2-9B39-C48B4B707E0E}.Release|Any CPU.Build.0 = Release|Any CPU
3018
EndGlobalSection
3119
GlobalSection(SolutionProperties) = preSolution
3220
HideSolutionNode = FALSE

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,7 @@ In the **appsettings.json** file:
151151
by this line:
152152
153153
```CSharp
154-
services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
155-
.AddSignIn("AzureAd", Configuration, options => Configuration.Bind("AzureAd", options));
154+
services.AddSignIn(Configuration);
156155
```
157156
158157
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-3-AnyOrgOrPersonal/Startup.cs‎

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

3636
// Sign-in users with the Microsoft identity platform
37-
services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
38-
.AddSignIn("AzureAD", Configuration, options => Configuration.Bind("AzureAD", options));
37+
services.AddSignIn(Configuration);
3938

4039
services.AddControllersWithViews(options =>
4140
{

‎1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj‎

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

2020
<ItemGroup>
21-
<ProjectReference Include="..\..\Microsoft.Identity.Web.UI\Microsoft.Identity.Web.UI.csproj" />
22-
<ProjectReference Include="..\..\Microsoft.Identity.Web\Microsoft.Identity.Web.csproj" />
21+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-localbuild" />
2322
</ItemGroup>
2423

2524
</Project>

0 commit comments

Comments
 (0)