Skip to content

Commit 380246a

Browse files
martincostellomartincostello
committed
Update to ASP.NET 5
Updates to support ASP.NET 5, using preview 6. Remove obsolete members.
1 parent 8278845 commit 380246a

File tree

91 files changed

+112
-131
lines changed

Some content is hidden

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

91 files changed

+112
-131
lines changed

‎Directory.Packages.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<PackageVersion Include="JetBrains.Annotations" Version="2020.1.0" />
55
<PackageVersion Include="JustEat.HttpClientInterception" Version="3.0.0" />
66
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.1.0" />
7-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="3.1.5" />
8-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.5" />
9-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.5" />
10-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.5" />
7+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="5.0.0-preview.6.*" />
8+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="5.0.0-preview.6.*" />
9+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.0-preview.6.*" />
10+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="5.0.0-preview.6.*" />
1111
<PackageVersion Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" />
12-
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="5.5.0" />
12+
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.6.0" />
1313
<PackageVersion Include="Microsoft.NetCore.Analyzers" Version="3.0.0" />
1414
<PackageVersion Include="Moq" Version="4.14.5" />
1515
<PackageVersion Include="Shouldly" Version="3.0.2" />
1616
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
17-
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="5.5.0" />
17+
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.6.0" />
1818
</ItemGroup>
1919

2020
</Project>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22

33
<PropertyGroup>
4-
<MajorVersion>3</MajorVersion>
5-
<MinorVersion>1</MinorVersion>
6-
<PatchVersion>3</PatchVersion>
4+
<MajorVersion>5</MajorVersion>
5+
<MinorVersion>0</MinorVersion>
6+
<PatchVersion>0</PatchVersion>
77
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
88
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
99
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "3.1.301"
3+
"dotnet": "5.0.100-preview.6.20318.15"
44
},
55

66
"msbuild-sdks": {

‎samples/Mvc.Client/Mvc.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net5.0</TargetFrameworks>
55
<UserSecretsId>AspNet.Security.OAuth.Providers.Mvc.Client</UserSecretsId>
66
</PropertyGroup>
77

‎src/AspNet.Security.OAuth.Amazon/AspNet.Security.OAuth.Amazon.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net5.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>

‎src/AspNet.Security.OAuth.Apple/AppleAuthenticationHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ protected virtual IEnumerable<Claim> ExtractClaimsFromUser([NotNull] JsonElement
176176

177177
if (user.TryGetProperty("email", out var email))
178178
{
179-
claims.Add(new Claim(ClaimTypes.Email, email.GetString(), ClaimValueTypes.String, ClaimsIssuer));
179+
claims.Add(new Claim(ClaimTypes.Email, email.GetString() ?? string.Empty, ClaimValueTypes.String, ClaimsIssuer));
180180
}
181181

182182
return claims;

‎src/AspNet.Security.OAuth.Apple/AspNet.Security.OAuth.Apple.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net5.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>

‎src/AspNet.Security.OAuth.ArcGIS/AspNet.Security.OAuth.ArcGIS.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net5.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>

‎src/AspNet.Security.OAuth.Asana/AspNet.Security.OAuth.Asana.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net5.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>

‎src/AspNet.Security.OAuth.Autodesk/AspNet.Security.OAuth.Autodesk.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net5.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>

0 commit comments

Comments
 (0)