Skip to content

Commit 881da70

Browse files
jmprieurjmprieur
committed
Fixing the 4th sample
Reamins to do: remove the files from the Microsoft.Identity.Web which have nothing to do with PoP
1 parent 3acc966 commit 881da70

File tree

8 files changed

+101
-1470
lines changed

8 files changed

+101
-1470
lines changed

‎4.-Console-app-calls-web-API-with-PoP/Desktop-App-calls-Web-API-using-PoP.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1212
README.md = README.md
1313
EndProjectSection
1414
EndProject
15-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Web", "..\Microsoft.Identity.Web\Microsoft.Identity.Web.csproj", "{F29C8FF6-5725-4C26-B0B4-682FCF218E6D}"
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Web.Future", "..\Microsoft.Identity.Web\Microsoft.Identity.Web.Future.csproj", "{F29C8FF6-5725-4C26-B0B4-682FCF218E6D}"
1616
EndProject
1717
Global
1818
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎4.-Console-app-calls-web-API-with-PoP/TodoListClient/TodoListClient.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</ItemGroup>
9494
<ItemGroup>
9595
<PackageReference Include="Microsoft.Identity.Client">
96-
<Version>4.10.0</Version>
96+
<Version>4.11.0</Version>
9797
</PackageReference>
9898
<PackageReference Include="Newtonsoft.Json">
9999
<Version>11.0.2</Version>

‎4.-Console-app-calls-web-API-with-PoP/TodoListService/TodoListService.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" Condition="'$(Configuration)' == 'Debug'" />
10+
<PackageReference Include="Microsoft.Identity.Web" Version="1.0.0-localbuild" />
1211
</ItemGroup>
1312

1413
<ItemGroup>
15-
<ProjectReference Include="..\..\Microsoft.Identity.Web\Microsoft.Identity.Web.csproj" />
14+
<ProjectReference Include="..\..\Microsoft.Identity.Web\Microsoft.Identity.Web.Future.csproj" />
1615
</ItemGroup>
1716
</Project>

‎Microsoft.Identity.Web/Architecture.dgml‎

Lines changed: 0 additions & 1183 deletions
This file was deleted.

‎Microsoft.Identity.Web/Diagrams.cd‎

Lines changed: 0 additions & 115 deletions
This file was deleted.

‎Microsoft.Identity.Web/Microsoft.Identity.Web.Future.csproj‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
4+
<!--This should be passed from the VSTS build-->
5+
<ClientSemVer Condition="'$(ClientSemVer)' == ''">1.0.0-localbuild</ClientSemVer>
6+
<!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
7+
<Version>$(ClientSemVer)</Version>
8+
9+
<DefineConstants>$(DefineConstants);WEB</DefineConstants>
10+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
11+
<Authors>Microsoft</Authors>
12+
<Company>Microsoft</Company>
13+
<Description>This package enables ASP.NET Core Web apps and Web APIs to use the Microsoft identity platform (formerly Azure AD v2.0). When they call Web APIs, MSAL.NET is used to acquire tokens</Description>
14+
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
15+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
16+
<PackageProjectUrl>https://github.com/AzureAD/microsoft-authentication-extensions-for-dotnet</PackageProjectUrl>
17+
<RepositoryUrl>https://github.com/AzureAD/microsoft-authentication-extensions-for-dotnet</RepositoryUrl>
18+
<PackageTags>Microsoft Authentication Library MSAL Azure Active Directory AAD Identity .NET ASP.NET Core</PackageTags>
19+
</PropertyGroup>
20+
21+
<PropertyGroup Label="Source Link">
22+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
23+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
24+
<!-- Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
25+
<IncludeSymbols>true</IncludeSymbols>
26+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
27+
</PropertyGroup>
28+
29+
<ItemGroup>
30+
<Compile Remove="InstanceDiscovery\**" />
31+
<Compile Remove="Resource\**" />
32+
<Compile Remove="TokenCacheProviders\**" />
33+
<EmbeddedResource Remove="InstanceDiscovery\**" />
34+
<EmbeddedResource Remove="Resource\**" />
35+
<EmbeddedResource Remove="TokenCacheProviders\**" />
36+
<None Remove="InstanceDiscovery\**" />
37+
<None Remove="Resource\**" />
38+
<None Remove="TokenCacheProviders\**" />
39+
</ItemGroup>
40+
41+
<ItemGroup>
42+
<Compile Remove="AccountExtensions.cs" />
43+
<Compile Remove="AuthorizeForScopesAttribute.cs" />
44+
<Compile Remove="ClaimConstants.cs" />
45+
<Compile Remove="ClaimsPrincipalExtensions.cs" />
46+
<Compile Remove="ClaimsPrincipalFactory.cs" />
47+
<Compile Remove="Extensions.cs" />
48+
<Compile Remove="HttpContextExtensions.cs" />
49+
<Compile Remove="InternalsVisibleTo.cs" />
50+
<Compile Remove="ITokenAcquisition.cs" />
51+
<Compile Remove="OidcConstants.cs" />
52+
<Compile Remove="ServiceCollectionExtensions.cs" />
53+
<Compile Remove="TokenAcquisition.cs" />
54+
<Compile Remove="WebAppServiceCollectionExtensions.cs" />
55+
</ItemGroup>
56+
57+
<ItemGroup>
58+
<None Remove="NuGet.Config" />
59+
<None Remove="README.md" />
60+
</ItemGroup>
61+
62+
<ItemGroup Label="Build Tools" Condition="$([MSBuild]::IsOsPlatform('Windows'))">
63+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
64+
</ItemGroup>
65+
66+
67+
<PropertyGroup>
68+
<TargetFramework>netcoreapp3.1</TargetFramework>
69+
</PropertyGroup>
70+
71+
72+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
73+
<CodeAnalysisRuleSet>Microsoft.Identity.Web.ruleset</CodeAnalysisRuleSet>
74+
</PropertyGroup>
75+
76+
77+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
78+
<CodeAnalysisRuleSet>Microsoft.Identity.Web.ruleset</CodeAnalysisRuleSet>
79+
</PropertyGroup>
80+
81+
<ItemGroup>
82+
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.0" />
83+
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.0" />
84+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
85+
<PackageReference Include="Microsoft.Identity.Client" Version="4.10.0" />
86+
<PackageReference Include="Microsoft.Identity.Web" Version="1.0.0-localbuild" />
87+
<PackageReference Include="Microsoft.IdentityModel.Protocols.SignedHttpRequest" Version="6.5.0" />
88+
<PackageReference Include="System.Collections" Version="4.3.0" />
89+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.5.0" />
90+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.5.0" />
91+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.5.0" />
92+
</ItemGroup>
93+
</Project>

‎Microsoft.Identity.Web/Microsoft.Identity.Web.csproj‎

Lines changed: 4 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
4-
<!--This should be passed from the VSTS build-->
5-
<ClientSemVer Condition="'$(ClientSemVer)' == ''">1.0.0-localbuild</ClientSemVer>
6-
<!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
7-
<Version>$(ClientSemVer)</Version>
8-
9-
<DefineConstants>$(DefineConstants);WEB</DefineConstants>
10-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
11-
<Authors>Microsoft</Authors>
12-
<Company>Microsoft</Company>
13-
<Description>This package enables ASP.NET Core Web apps and Web APIs to use the Microsoft identity platform (formerly Azure AD v2.0). When they call Web APIs, MSAL.NET is used to acquire tokens</Description>
14-
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
15-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
16-
<PackageProjectUrl>https://github.com/AzureAD/microsoft-authentication-extensions-for-dotnet</PackageProjectUrl>
17-
<RepositoryUrl>https://github.com/AzureAD/microsoft-authentication-extensions-for-dotnet</RepositoryUrl>
18-
<PackageTags>Microsoft Authentication Library MSAL Azure Active Directory AAD Identity .NET ASP.NET Core</PackageTags>
19-
</PropertyGroup>
20-
21-
<PropertyGroup Label="Source Link">
22-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
23-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
24-
<!-- Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
25-
<IncludeSymbols>true</IncludeSymbols>
26-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
27-
</PropertyGroup>
28-
29-
<ItemGroup>
30-
<None Include="..\LICENSE">
31-
<Pack>True</Pack>
32-
<PackagePath></PackagePath>
33-
</None>
34-
</ItemGroup>
35-
36-
<ItemGroup Label="Build Tools" Condition="$([MSBuild]::IsOsPlatform('Windows'))">
37-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
38-
</ItemGroup>
39-
40-
41-
<PropertyGroup>
42-
<TargetFramework>netcoreapp3.1</TargetFramework>
43-
</PropertyGroup>
44-
45-
46-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
47-
<CodeAnalysisRuleSet>Microsoft.Identity.Web.ruleset</CodeAnalysisRuleSet>
48-
</PropertyGroup>
49-
50-
51-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
52-
<CodeAnalysisRuleSet>Microsoft.Identity.Web.ruleset</CodeAnalysisRuleSet>
53-
</PropertyGroup>
54-
55-
<ItemGroup>
56-
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.0" />
57-
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.0" />
58-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
59-
<PackageReference Include="Microsoft.Identity.Client" Version="4.10.0" />
60-
<PackageReference Include="Microsoft.IdentityModel.Protocols.SignedHttpRequest" Version="6.5.0" />
61-
<PackageReference Include="System.Collections" Version="4.3.0" />
62-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.5.0" />
63-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.5.0" />
64-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.5.0" />
65-
</ItemGroup>
66-
</Project>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup />
4+
</Project>

0 commit comments

Comments
 (0)