Skip to content

Commit c747640

Browse files
SeanFarrow-RSKSeanFarrow-RSK
committed
Update the Rsk.Saml.* packages to version 8.0.0 except any projects that work with IdentityServer version 4.
1 parent 1963a85 commit c747640

File tree

11 files changed

+18
-52
lines changed

11 files changed

+18
-52
lines changed

‎DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,14 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<<<<<<< HEAD
109
<Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
1110
</ItemGroup>
1211

1312
<ItemGroup>
14-
<PackageReference Include="Duende.IdentityServer" Version="6.3.5" />
15-
=======
1613
<PackageReference Include="Duende.IdentityServer" Version="6.3.6" />
17-
>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.)
18-
<PackageReference Include="Rsk.Saml" Version="6.2.2" />
19-
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="7.2.2" />
20-
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
14+
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
15+
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="8.0.0" />
16+
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
2117
</ItemGroup>
2218

2319
<ItemGroup>

‎DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,13 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<<<<<<< HEAD
109
<Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
1110
</ItemGroup>
1211

1312
<ItemGroup>
14-
<PackageReference Include="Duende.IdentityServer" Version="6.0.0" />
15-
<PackageReference Include="Rsk.Saml" Version="5.0.0" />
16-
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="6.0.0" />
17-
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
18-
=======
1913
<PackageReference Include="Duende.IdentityServer" Version="6.3.6" />
20-
<PackageReference Include="Rsk.Saml" Version="6.2.2" />
21-
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="7.2.2" />
22-
14+
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
15+
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="8.0.0" />
2316
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
24-
>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.)
2517
</ItemGroup>
2618
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<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" />
18-
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="7.2.2" />
19-
<PackageReference Include="Rsk.Saml.DuendeIdentityServer.EntityFramework" Version="7.2.2" />
18+
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="8.0.0" />
19+
<PackageReference Include="Rsk.Saml.DuendeIdentityServer.EntityFramework" Version="8.0.0" />
2020
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
2121
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.25" />
2222
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25" />
1212
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.0.3" />
13-
<PackageReference Include="Rsk.Saml" Version="6.2.2" />
13+
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,13 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<<<<<<< HEAD
1211
<Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
1312
</ItemGroup>
1413

1514
<ItemGroup>
16-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.1" />
17-
<PackageReference Include="Rsk.Saml" Version="6.0.1" />
18-
</ItemGroup>
19-
=======
20-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25" />
21-
<PackageReference Include="Rsk.Saml" Version="6.2.2" />
15+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25"/>
16+
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
2217
</ItemGroup>
23-
>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.)
2418

2519
<ItemGroup>
2620
<None Update="testclient.pfx">

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,15 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<<<<<<< HEAD
1211
<Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
1312
</ItemGroup>
1413

1514
<ItemGroup>
16-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.1" />
17-
=======
18-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25" />
19-
>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.)
20-
<PackageReference Include="Rsk.Saml" Version="6.2.2" />
15+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25"/>
16+
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
2117
</ItemGroup>
2218

23-
<ItemGroup>
24-
<None Update="testclient.pfx">
19+
<ItemGroup> <None Update="testclient.pfx">
2520
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2621
</None>
2722
</ItemGroup>

‎OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.25" />
1515
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.25" />
1616
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
17-
<PackageReference Include="Rsk.Saml.OpenIddict.AspNetCore.Identity" Version="8.0.0-preview2" />
17+
<PackageReference Include="Rsk.Saml.OpenIddict.AspNetCore.Identity" Version="8.0.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>
@@ -25,9 +25,9 @@
2525
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
2626
<PackageReference Include="OpenIddict.Quartz" Version="4.9.0" />
2727
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.7.0" />
28-
<PackageReference Include="Rsk.Saml.OpenIddict" Version="8.0.0-preview2" />
29-
<PackageReference Include="Rsk.Saml.OpenIddict.EntityFrameworkCore" Version="8.0.0-preview2" />
30-
<PackageReference Include="Rsk.Saml.OpenIddict.Quartz" Version="8.0.0-preview2" />
28+
<PackageReference Include="Rsk.Saml.OpenIddict" Version="8.0.0" />
29+
<PackageReference Include="Rsk.Saml.OpenIddict.EntityFrameworkCore" Version="8.0.0" />
30+
<PackageReference Include="Rsk.Saml.OpenIddict.Quartz" Version="8.0.0" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎OpenIddict/OpenIddictIdP/Startup.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@
1212
using Rsk.Saml.OpenIddict.AspNetCore.Identity.Configuration.DependencyInjection;
1313
using Rsk.Saml.OpenIddict.Configuration.DependencyInjection;
1414
using openiddictidp.Data;
15-
<<<<<<< HEAD
1615
using Rsk.Saml.Samples;
17-
=======
1816
using Rsk.Saml.OpenIddict.EntityFrameworkCore.Configuration.DependencyInjection;
19-
>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.)
2017
using static OpenIddict.Abstractions.OpenIddictConstants;
2118

2219
namespace openiddictidp;

‎spWithIdpInitiated/spWithIdpInitiated.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<<<<<<< HEAD
98
<Compile Include="..\LicenseKey.cs" Link="LicenseKey.cs" />
10-
=======
11-
<PackageReference Include="Rsk.Saml" Version="8.0.0-rc1" />
12-
>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.)
139
</ItemGroup>
1410

1511
<ItemGroup>

‎spWithMultipleIdps/spWithMultipleIdps.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<<<<<<< HEAD
98
<Compile Include="..\LicenseKey.cs" Link="LicenseKey.cs" />
10-
=======
11-
<PackageReference Include="Rsk.Saml" Version="8.0.0-rc1" />
12-
>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.)
139
</ItemGroup>
1410

1511
<ItemGroup>

0 commit comments

Comments
 (0)