Skip to content

Commit d677df3

Browse files
SeanFarrow-RSKSeanFarrow-RSK
committed
Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.
1 parent 0464959 commit d677df3

File tree

13 files changed

+44
-31
lines changed

13 files changed

+44
-31
lines changed

‎DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Duende.IdentityServer" Version="6.3.5" />
9+
<PackageReference Include="Duende.IdentityServer" Version="6.3.6" />
1010
<PackageReference Include="Rsk.Saml" Version="6.2.2" />
1111
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="7.2.2" />
1212

‎DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Duende.IdentityServer" Version="6.3.5" />
9+
<PackageReference Include="Duende.IdentityServer" Version="6.3.6" />
1010
<PackageReference Include="Rsk.Saml" Version="6.2.2" />
1111
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="7.2.2" />
1212

‎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>net6.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<UserSecretsId>38ced442-cf32-4289-bb08-57d4a78831b3</UserSecretsId>
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="AspNetCore.ReCaptcha" Version="1.7.0" />
9-
<PackageReference Include="Duende.IdentityServer.EntityFramework" Version="6.3.5" />
10-
<PackageReference Include="Microsoft.AspNetCore.Authentication.WsFederation" Version="7.0.13" />
11-
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="7.0.13" />
12-
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="7.0.13" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.13" />
14-
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.13" />
15-
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.13" />
9+
<PackageReference Include="Duende.IdentityServer.EntityFramework" Version="6.3.6" />
10+
<PackageReference Include="Microsoft.AspNetCore.Authentication.WsFederation" Version="6.0.25" />
11+
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="6.0.25" />
12+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="6.0.25" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.25" />
14+
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="6.0.25" />
15+
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.25" />
1616
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1717
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.120" />
1818
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="7.2.2" />
1919
<PackageReference Include="Rsk.Saml.DuendeIdentityServer.EntityFramework" Version="7.2.2" />
2020
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.13" />
21+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.25" />
2222
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
2323
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.3.0" />
2424
<PackageReference Include="System.ServiceModel.Http" Version="6.1.0" />

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

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net6.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="7.0.13" />
11+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25" />
1212
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.0.3" />
1313
<PackageReference Include="Rsk.Saml" Version="6.2.2" />
1414
</ItemGroup>

‎DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net6.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="7.0.13" />
11+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25" />
1212
<PackageReference Include="Rsk.Saml" Version="6.2.2" />
1313
</ItemGroup>
1414

‎DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net6.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="7.0.13" />
11+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25" />
1212
<PackageReference Include="Rsk.Saml" Version="6.2.2" />
1313
</ItemGroup>
1414

‎OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
66
</PropertyGroup>
77

88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.13" />
11-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.13" />
12-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.25" />
11+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.25" />
12+
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
1313
<PackageReference Include="Rsk.Saml.OpenIddict.AspNetCore.Identity" Version="8.0.0-preview2" />
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.13" />
18-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.13" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.13" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="all" Version="7.0.13" />
21-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
17+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.25" />
18+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.25" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.25" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="all" Version="6.0.25" />
21+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
2222
<PackageReference Include="OpenIddict.Quartz" Version="4.9.0" />
2323
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.7.0" />
2424
<PackageReference Include="Rsk.Saml.OpenIddict" Version="8.0.0-preview2" />

‎OpenIddict/OpenIddictIdP/Startup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
using Rsk.Saml.Configuration;
1212
using Rsk.Saml.OpenIddict.AspNetCore.Identity.Configuration.DependencyInjection;
1313
using Rsk.Saml.OpenIddict.Configuration.DependencyInjection;
14-
using Rsk.Saml.OpenIddict.EntityFrameworkCore.Configuration.DependacyInjection;
1514
using openiddictidp.Data;
15+
using Rsk.Saml.OpenIddict.EntityFrameworkCore.Configuration.DependencyInjection;
1616
using static OpenIddict.Abstractions.OpenIddictConstants;
1717

1818
namespace openiddictidp;

‎spWithIdpInitiated/spWithIdpInitiated.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Rsk.Saml" Version="8.0.0-preview2" />
8+
<PackageReference Include="Rsk.Saml" Version="8.0.0-rc1" />
99
</ItemGroup>
1010

1111
<ItemGroup>

0 commit comments

Comments
 (0)