Skip to content

Update NuGet packages in all projects #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Update NuGet packages in all projects #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7cab0d1
Upgrade all NuGet packages for the Duende Identity Server samples.
SeanFarrow-RSK Oct 24, 2023
d0c44ae
Update the NuGet packages for the IdentityServer4 samples.
SeanFarrow-RSK Oct 24, 2023
a20ef5f
Update the NuGet packages for the OpenIddict sample.
SeanFarrow-RSK Oct 24, 2023
3f39005
Update NuGet pacakges for the spWithIdpInitiated sample.
SeanFarrow-RSK Oct 24, 2023
16ac5e2
Update the NuGet packages for the spWithMultipleIdps sample.
SeanFarrow-RSK Oct 24, 2023
a46bbcd
Update the NuGet pacakges in the spWithSingleIdp sample.
SeanFarrow-RSK Oct 24, 2023
4a32182
Update the Rsk.SAML packages to 8.0.0-preview2.
SeanFarrow-RSK Oct 30, 2023
d255ad3
Upgrade any out-of-date packages to the latest minor versions.
SeanFarrow-RSK Oct 30, 2023
30a5283
Ensure all projects target .Net 6.0 and that all packages are upgrade…
SeanFarrow-RSK Dec 13, 2023
402fc2c
Remove unwanted files.
SeanFarrow-RSK Dec 13, 2023
1963a85
Add the required DbContexts in one call in the OpenIddict IDP sample …
SeanFarrow-RSK Dec 13, 2023
c747640
Update the Rsk.Saml.* packages to version 8.0.0 except any projects t…
SeanFarrow-RSK Dec 14, 2023
4ffbc54
Update all the Rsk.* packages in the projects targeting .NetCore 3.1 …
SeanFarrow-RSK Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
<Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Duende.IdentityServer" Version="6.0.0" />
<PackageReference Include="Rsk.Saml" Version="5.0.0" />
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="6.0.0" />

<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Duende.IdentityServer" Version="6.3.6" />
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="8.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
11 changes: 5 additions & 6 deletions DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
<Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Duende.IdentityServer" Version="6.0.0" />
<PackageReference Include="Rsk.Saml" Version="5.0.0" />
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="6.0.0" />

<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Duende.IdentityServer" Version="6.3.6" />
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="8.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion DuendeIdentityServer/SLO/SamlOidcSLO/Common/Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
32 changes: 16 additions & 16 deletions DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>38ced442-cf32-4289-bb08-57d4a78831b3</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AspNetCore.ReCaptcha" Version="1.7.0" />
<PackageReference Include="Duende.IdentityServer.EntityFramework" Version="6.2.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.WsFederation" Version="7.0.4" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="7.0.4" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.4" />
<PackageReference Include="Duende.IdentityServer.EntityFramework" Version="6.3.6" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.WsFederation" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="6.0.25" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.25" />
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="6.0.25" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.25" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="7.0.3" />
<PackageReference Include="Rsk.Saml.DuendeIdentityServer.EntityFramework" Version="7.0.1" />
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.4" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.120" />
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="8.0.0" />
<PackageReference Include="Rsk.Saml.DuendeIdentityServer.EntityFramework" Version="8.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.25" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.3.0" />
<PackageReference Include="System.ServiceModel.Http" Version="4.10.2" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.10.2" />
<PackageReference Include="System.ServiceModel.Http" Version="6.1.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="6.1.0" />
</ItemGroup>
<ItemGroup>
<None Update="Resources\testclient.cer">
Expand Down
8 changes: 4 additions & 4 deletions DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>WebClient</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.13" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.22.0" />
<PackageReference Include="Rsk.Saml" Version="5.4.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.0.3" />
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>WebClient</RootNamespace>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
</ItemGroup>
<Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.1" />
<PackageReference Include="Rsk.Saml" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25"/>
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
11 changes: 5 additions & 6 deletions DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>WebClient</RootNamespace>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
<Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.1" />
<PackageReference Include="Rsk.Saml" Version="6.0.0-preview1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25"/>
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<None Update="testclient.pfx">
<ItemGroup> <None Update="testclient.pfx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions IdentityServer4/idp/idp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="Rsk.Saml" Version="5.0.0" />
<PackageReference Include="Rsk.Saml.IdentityServer4" Version="5.0.0" />
<PackageReference Include="Rsk.Saml" Version="5.4.1" />
<PackageReference Include="Rsk.Saml.IdentityServer4" Version="5.3.1" />

<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
Expand Down
8 changes: 4 additions & 4 deletions IdentityServer4/idpWithEf/idpWithEf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

<ItemGroup>
<PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.21" />
<PackageReference Include="Rsk.Saml" Version="5.0.0" />
<PackageReference Include="Rsk.Saml.IdentityServer4" Version="5.0.0" />
<PackageReference Include="Rsk.Saml.IdentityServer4.EntityFramework" Version="4.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.32" />
<PackageReference Include="Rsk.Saml" Version="5.4.1" />
<PackageReference Include="Rsk.Saml.IdentityServer4" Version="5.3.1" />
<PackageReference Include="Rsk.Saml.IdentityServer4.EntityFramework" Version="4.0.1" />

<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
Expand Down
4 changes: 2 additions & 2 deletions IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="Rsk.Saml" Version="5.0.0" />
<PackageReference Include="Rsk.Saml.IdentityServer4" Version="5.0.0" />
<PackageReference Include="Rsk.Saml" Version="5.4.1" />
<PackageReference Include="Rsk.Saml.IdentityServer4" Version="5.3.1" />

<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
Expand Down
4 changes: 2 additions & 2 deletions IdentityServer4/sp/sp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="Rsk.Saml" Version="5.0.0" />
<PackageReference Include="Rsk.Saml.IdentityServer4" Version="5.0.0" />
<PackageReference Include="Rsk.Saml" Version="5.4.1" />
<PackageReference Include="Rsk.Saml.IdentityServer4" Version="5.3.1" />

<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
Expand Down
28 changes: 14 additions & 14 deletions OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
</PropertyGroup>

Expand All @@ -11,23 +11,23 @@


<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.12" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.12" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="Rsk.Saml.OpenIddict.AspNetCore.Identity" Version="8.0.0-preview1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.25" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Rsk.Saml.OpenIddict.AspNetCore.Identity" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.12" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.12" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.12" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="all" Version="7.0.12" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.25" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.25" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="all" Version="6.0.25" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
<PackageReference Include="OpenIddict.Quartz" Version="4.9.0" />
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.6.3" />
<PackageReference Include="Rsk.Saml.OpenIddict" Version="8.0.0-preview1" />
<PackageReference Include="Rsk.Saml.OpenIddict.EntityFrameworkCore" Version="8.0.0-preview1" />
<PackageReference Include="Rsk.Saml.OpenIddict.Quartz" Version="1.0.0" />
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.7.0" />
<PackageReference Include="Rsk.Saml.OpenIddict" Version="8.0.0" />
<PackageReference Include="Rsk.Saml.OpenIddict.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Rsk.Saml.OpenIddict.Quartz" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
19 changes: 7 additions & 12 deletions OpenIddict/OpenIddictIdP/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
using Rsk.Saml.Configuration;
using Rsk.Saml.OpenIddict.AspNetCore.Identity.Configuration.DependencyInjection;
using Rsk.Saml.OpenIddict.Configuration.DependencyInjection;
using Rsk.Saml.OpenIddict.EntityFrameworkCore.Configuration.DependacyInjection;
using openiddictidp.Data;
using Rsk.Saml.Samples;
using Rsk.Saml.OpenIddict.EntityFrameworkCore.Configuration.DependencyInjection;
using static OpenIddict.Abstractions.OpenIddictConstants;

namespace openiddictidp;
Expand Down Expand Up @@ -120,20 +120,15 @@ public void ConfigureServices(IServiceCollection services)
{
//use quartz to prune old SAML messages every 14 days.
builder.PruneSamlMessages();
builder.PruneSamlArtifacts();

//Already added the DbContext above
builder.UseSamlEntityFrameworkCore()
.AddSamlMessageDbContext(optionsBuilder =>
{
//Configure the database provider to use.
optionsBuilder.UseSqlServer(defaultConnectionString, x =>x.MigrationsAssembly(typeof(Startup).Assembly.FullName));
})
.AddSamlConfigurationDbContext(optionsBuilder =>
{
//Configure the database provider to use.
optionsBuilder.UseSqlServer(defaultConnectionString,
x => x.MigrationsAssembly(typeof(Startup).Assembly.FullName));
});
.AddSamlDbContexts(optionsBuilder =>
{
//Configure the database provider to use.
optionsBuilder.UseSqlServer(defaultConnectionString, x => x.MigrationsAssembly(typeof(Startup).Assembly.FullName));
});

builder.ConfigureSamlOpenIddictServerOptions(serverOptions =>
{
Expand Down
6 changes: 3 additions & 3 deletions spWithIdpInitiated/spWithIdpInitiated.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="..\LicenseKey.cs" Link="LicenseKey.cs" />
<Compile Include="..\LicenseKey.cs" Link="LicenseKey.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Rsk.Saml" Version="5.0.0" />
</ItemGroup>
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<None Update="idsrv3test.cer">
Expand Down
4 changes: 2 additions & 2 deletions spWithMultipleIdps/spWithMultipleIdps.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Rsk.Saml" Version="6.0.0" />
</ItemGroup>
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<None Update="idsrv3test.cer">
Expand Down
2 changes: 1 addition & 1 deletion spWithSingleIdp/spWithSingleIdp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Rsk.Saml" Version="6.0.0" />
<PackageReference Include="Rsk.Saml" Version="8.0.0" />
</ItemGroup>

</Project>