Skip to content

Commit c8d5565

Browse files
authored
Merge pull request #46 from RockSolidKnowledge/feature/sf/11696-update-samples
Update samples to .Net 8.0, OpenIddict 5.1 and IdentityServer 7.0.
2 parents e97b3fc + 8f875fa commit c8d5565

File tree

16 files changed

+89
-130
lines changed

16 files changed

+89
-130
lines changed
Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
32
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
54
<ImplicitUsings>enable</ImplicitUsings>
65
</PropertyGroup>
7-
86
<ItemGroup>
97
<Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
108
</ItemGroup>
11-
129
<ItemGroup>
13-
<PackageReference Include="Duende.IdentityServer" Version="6.0.0" />
14-
<PackageReference Include="Rsk.Saml" Version="5.0.0" />
15-
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="6.0.0" />
16-
17-
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
10+
<PackageReference Include="Duende.IdentityServer" Version="7.0.0" />
11+
<PackageReference Include="Rsk.Saml" Version="9.0.0" />
12+
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="9.0.0" />
13+
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
1814
</ItemGroup>
19-
2015
<ItemGroup>
2116
<None Update="idsrv3test.cer">
2217
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -25,7 +20,4 @@
2520
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2621
</None>
2722
</ItemGroup>
28-
29-
30-
3123
</Project>

DuendeIdentityServer/DuendeDynamicProviders/Pages/SecurityHeadersAttribute.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ public override void OnResultExecuting(ResultExecutingContext context)
1717
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options
1818
if (!context.HttpContext.Response.Headers.ContainsKey("X-Content-Type-Options"))
1919
{
20-
context.HttpContext.Response.Headers.Add("X-Content-Type-Options", "nosniff");
20+
context.HttpContext.Response.Headers.Append("X-Content-Type-Options", "nosniff");
2121
}
2222

2323
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
2424
if (!context.HttpContext.Response.Headers.ContainsKey("X-Frame-Options"))
2525
{
26-
context.HttpContext.Response.Headers.Add("X-Frame-Options", "SAMEORIGIN");
26+
context.HttpContext.Response.Headers.Append("X-Frame-Options", "SAMEORIGIN");
2727
}
2828

2929
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
@@ -36,19 +36,19 @@ public override void OnResultExecuting(ResultExecutingContext context)
3636
// once for standards compliant browsers
3737
if (!context.HttpContext.Response.Headers.ContainsKey("Content-Security-Policy"))
3838
{
39-
context.HttpContext.Response.Headers.Add("Content-Security-Policy", csp);
39+
context.HttpContext.Response.Headers.Append("Content-Security-Policy", csp);
4040
}
4141
// and once again for IE
4242
if (!context.HttpContext.Response.Headers.ContainsKey("X-Content-Security-Policy"))
4343
{
44-
context.HttpContext.Response.Headers.Add("X-Content-Security-Policy", csp);
44+
context.HttpContext.Response.Headers.Append("X-Content-Security-Policy", csp);
4545
}
4646

4747
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy
4848
var referrer_policy = "no-referrer";
4949
if (!context.HttpContext.Response.Headers.ContainsKey("Referrer-Policy"))
5050
{
51-
context.HttpContext.Response.Headers.Add("Referrer-Policy", referrer_policy);
51+
context.HttpContext.Response.Headers.Append("Referrer-Policy", referrer_policy);
5252
}
5353
}
5454
}
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
</PropertyGroup>
77

@@ -10,10 +10,10 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Duende.IdentityServer" Version="6.0.0" />
14-
<PackageReference Include="Rsk.Saml" Version="5.0.0" />
15-
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="6.0.0" />
13+
<PackageReference Include="Duende.IdentityServer" Version="7.0.0" />
14+
<PackageReference Include="Rsk.Saml" Version="9.0.0" />
15+
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="9.0.0" />
1616

17-
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
17+
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
1818
</ItemGroup>
1919
</Project>

DuendeIdentityServer/DuendeIdP/Pages/SecurityHeadersAttribute.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ public override void OnResultExecuting(ResultExecutingContext context)
1717
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options
1818
if (!context.HttpContext.Response.Headers.ContainsKey("X-Content-Type-Options"))
1919
{
20-
context.HttpContext.Response.Headers.Add("X-Content-Type-Options", "nosniff");
20+
context.HttpContext.Response.Headers.Append("X-Content-Type-Options", "nosniff");
2121
}
2222

2323
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
2424
if (!context.HttpContext.Response.Headers.ContainsKey("X-Frame-Options"))
2525
{
26-
context.HttpContext.Response.Headers.Add("X-Frame-Options", "SAMEORIGIN");
26+
context.HttpContext.Response.Headers.Append("X-Frame-Options", "SAMEORIGIN");
2727
}
2828

2929
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
@@ -36,19 +36,19 @@ public override void OnResultExecuting(ResultExecutingContext context)
3636
// once for standards compliant browsers
3737
if (!context.HttpContext.Response.Headers.ContainsKey("Content-Security-Policy"))
3838
{
39-
context.HttpContext.Response.Headers.Add("Content-Security-Policy", csp);
39+
context.HttpContext.Response.Headers.Append("Content-Security-Policy", csp);
4040
}
4141
// and once again for IE
4242
if (!context.HttpContext.Response.Headers.ContainsKey("X-Content-Security-Policy"))
4343
{
44-
context.HttpContext.Response.Headers.Add("X-Content-Security-Policy", csp);
44+
context.HttpContext.Response.Headers.Append("X-Content-Security-Policy", csp);
4545
}
4646

4747
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy
4848
var referrer_policy = "no-referrer";
4949
if (!context.HttpContext.Response.Headers.ContainsKey("Referrer-Policy"))
5050
{
51-
context.HttpContext.Response.Headers.Add("Referrer-Policy", referrer_policy);
51+
context.HttpContext.Response.Headers.Append("Referrer-Policy", referrer_policy);
5252
}
5353
}
5454
}

DuendeIdentityServer/SLO/SamlOidcSLO/Common/Common.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-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<UserSecretsId>38ced442-cf32-4289-bb08-57d4a78831b3</UserSecretsId>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="AspNetCore.ReCaptcha" Version="1.7.0" />
9-
<PackageReference Include="Duende.IdentityServer.EntityFramework" Version="6.2.3" />
10-
<PackageReference Include="Microsoft.AspNetCore.Authentication.WsFederation" Version="7.0.4" />
11-
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="7.0.4" />
12-
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="7.0.4" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
14-
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.4" />
15-
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.4" />
8+
<PackageReference Include="AspNetCore.ReCaptcha" Version="1.8.1" />
9+
<PackageReference Include="Duende.IdentityServer.EntityFramework" Version="7.0.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.Authentication.WsFederation" Version="8.0.1" />
11+
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="8.0.1" />
12+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.1" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
14+
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.1" />
15+
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.1" />
1616
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
17-
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
18-
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="7.0.3" />
19-
<PackageReference Include="Rsk.Saml.DuendeIdentityServer.EntityFramework" Version="7.0.1" />
20-
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.4" />
22-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
23-
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.3.0" />
24-
<PackageReference Include="System.ServiceModel.Http" Version="4.10.2" />
25-
<PackageReference Include="System.ServiceModel.Primitives" Version="4.10.2" />
17+
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.130" />
18+
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="9.0.0" />
19+
<PackageReference Include="Rsk.Saml.DuendeIdentityServer.EntityFramework" Version="9.0.0" />
20+
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
21+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.1" />
22+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
23+
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.5.1" />
24+
<PackageReference Include="System.ServiceModel.Http" Version="8.0.0" />
25+
<PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />
2626
</ItemGroup>
2727
<ItemGroup>
2828
<None Update="Resources\testclient.cer">

DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/Pages/SecurityHeadersAttribute.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ public override void OnResultExecuting(ResultExecutingContext context)
1717
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options
1818
if (!context.HttpContext.Response.Headers.ContainsKey("X-Content-Type-Options"))
1919
{
20-
context.HttpContext.Response.Headers.Add("X-Content-Type-Options", "nosniff");
20+
context.HttpContext.Response.Headers.Append("X-Content-Type-Options", "nosniff");
2121
}
2222

2323
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
2424
if (!context.HttpContext.Response.Headers.ContainsKey("X-Frame-Options"))
2525
{
26-
context.HttpContext.Response.Headers.Add("X-Frame-Options", "SAMEORIGIN");
26+
context.HttpContext.Response.Headers.Append("X-Frame-Options", "SAMEORIGIN");
2727
}
2828

2929
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
@@ -36,19 +36,19 @@ public override void OnResultExecuting(ResultExecutingContext context)
3636
// once for standards compliant browsers
3737
if (!context.HttpContext.Response.Headers.ContainsKey("Content-Security-Policy"))
3838
{
39-
context.HttpContext.Response.Headers.Add("Content-Security-Policy", csp);
39+
context.HttpContext.Response.Headers.Append("Content-Security-Policy", csp);
4040
}
4141
// and once again for IE
4242
if (!context.HttpContext.Response.Headers.ContainsKey("X-Content-Security-Policy"))
4343
{
44-
context.HttpContext.Response.Headers.Add("X-Content-Security-Policy", csp);
44+
context.HttpContext.Response.Headers.Append("X-Content-Security-Policy", csp);
4545
}
4646

4747
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy
4848
var referrer_policy = "no-referrer";
4949
if (!context.HttpContext.Response.Headers.ContainsKey("Referrer-Policy"))
5050
{
51-
context.HttpContext.Response.Headers.Add("Referrer-Policy", referrer_policy);
51+
context.HttpContext.Response.Headers.Append("Referrer-Policy", referrer_policy);
5252
}
5353
}
5454
}

DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
app.Use(async (context, next) =>
5353
{
54-
context.Response.Headers.Add("X-Frame-Options", "SAMEORIGIN");
54+
context.Response.Headers.Append("X-Frame-Options", "SAMEORIGIN");
5555
await next();
5656
});
5757

DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<RootNamespace>WebClient</RootNamespace>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.13" />
12-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.22.0" />
13-
<PackageReference Include="Rsk.Saml" Version="5.4.1" />
11+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.1" />
12+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.3.0" />
13+
<PackageReference Include="Rsk.Saml" Version="9.0.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
32
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
54
<Nullable>enable</Nullable>
65
<ImplicitUsings>enable</ImplicitUsings>
76
<RootNamespace>WebClient</RootNamespace>
87
</PropertyGroup>
9-
108
<ItemGroup>
119
<Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
1210
</ItemGroup>
13-
1411
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.1" />
16-
<PackageReference Include="Rsk.Saml" Version="6.0.1" />
12+
<PackageReference Include="Rsk.Saml" Version="9.0.0" />
13+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.1" />
1714
</ItemGroup>
18-
1915
<ItemGroup>
2016
<None Update="testclient.pfx">
2117
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2218
</None>
2319
</ItemGroup>
24-
25-
26-
</Project>
20+
</Project>

0 commit comments

Comments
 (0)