Skip to content

Commit 367cd3c

Browse files
RevsgaardRevsgaard
committed
.NET 7 support
1 parent 4b52cdd commit 367cd3c

File tree

7 files changed

+62
-28
lines changed

7 files changed

+62
-28
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
The ITfoxtec Identity Saml2 package adds SAML-P support for both Identity Provider (IdP) and Relying Party (RP).
44

5+
* **Support .NET 7.0**
56
* **Support .NET 6.0**
67
* **Support .NET 5.0**
78
* **Support .NET Core 3.1**

‎src/ITfoxtec.Identity.Saml2.Mvc/ITfoxtec.Identity.Saml2.Mvc.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ Support the Danish NemLog-in 2 / OIOSAML 2 and NemLog-in 3 / OIOSAML 3.</Descrip
2424
<PackageTags>SAML SAML 2.0 SAML2.0 SAML2 SAML 2 SAML-P SAMLP SSO Identity Provider (IdP) and Relying Party (RP) Authentication Metadata OIOSAML OIOSAML 2 OIOSAML 3 NemLogin NemLog-in 2 NemLog-in 3 ASP.NET MVC</PackageTags>
2525
<NeutralLanguage>en-US</NeutralLanguage>
2626
<PackageIconUrl>https://itfoxtec.com/favicon.ico</PackageIconUrl>
27-
<AssemblyVersion>4.8.3.3</AssemblyVersion>
28-
<FileVersion>4.8.3.3</FileVersion>
27+
<AssemblyVersion>4.8.3.4</AssemblyVersion>
28+
<FileVersion>4.8.3.4</FileVersion>
2929
<Copyright>Copyright © 2021</Copyright>
30-
<Version>4.8.3-beta3</Version>
30+
<Version>4.8.3-beta4</Version>
3131
<SignAssembly>true</SignAssembly>
3232
<AssemblyOriginatorKeyFile>ITfoxtec.SAML2.snk</AssemblyOriginatorKeyFile>
3333
<DelaySign>false</DelaySign>

‎src/ITfoxtec.Identity.Saml2.MvcCore/ITfoxtec.Identity.Saml2.MvcCore.csproj‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net48;net462</TargetFrameworks>
3+
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;net48;net462</TargetFrameworks>
44
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
55
<Authors>Anders Revsgaard</Authors>
66
<Company>ITfoxtec</Company>
@@ -10,6 +10,7 @@
1010
<Title>ITfoxtec Identity SAML 2.0 MVC Core</Title>
1111
<Description>ASP.NET MVC Core is supported by the ITfoxtec Identity SAML2 MVC Core package which helps to integrate the ITfoxtec Identity SAML2 package and add support for SAML-P and SAML 2.0 tokens.
1212

13+
Support .NET 7.0
1314
Support .NET 6.0
1415
Support .NET 5.0
1516
Support .NET Core 3.1
@@ -27,10 +28,10 @@ Support the Danish NemLog-in 2 / OIOSAML 2 and NemLog-in 3 / OIOSAML 3.</Descrip
2728
<PackageTags>SAML SAML 2.0 SAML2.0 SAML2 SAML 2 SAML-P SAMLP SSO Identity Provider (IdP) Relying Party (RP) Authentication Metadata OIOSAML OIOSAML 2 OIOSAML 3 NemLogin NemLog-in 2 NemLog-in 3 ASP.NET MVC Core</PackageTags>
2829
<NeutralLanguage>en-US</NeutralLanguage>
2930
<PackageIconUrl>https://itfoxtec.com/favicon.ico</PackageIconUrl>
30-
<AssemblyVersion>4.8.3.3</AssemblyVersion>
31-
<FileVersion>4.8.3.3</FileVersion>
31+
<AssemblyVersion>4.8.3.4</AssemblyVersion>
32+
<FileVersion>4.8.3.4</FileVersion>
3233
<Copyright>Copyright © 2021</Copyright>
33-
<Version>4.8.3-beta3</Version>
34+
<Version>4.8.3-beta4</Version>
3435
<SignAssembly>true</SignAssembly>
3536
<AssemblyOriginatorKeyFile>ITfoxtec.SAML2.snk</AssemblyOriginatorKeyFile>
3637
<DelaySign>false</DelaySign>
@@ -40,14 +41,27 @@ Support the Danish NemLog-in 2 / OIOSAML 2 and NemLog-in 3 / OIOSAML 3.</Descrip
4041

4142
<ItemGroup>
4243
<ProjectReference Include="..\ITfoxtec.Identity.Saml2\ITfoxtec.Identity.Saml2.csproj" />
44+
</ItemGroup>
45+
46+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
47+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
4348
</ItemGroup>
49+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0'">
50+
<DefineConstants>NET70;NET</DefineConstants>
51+
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0|AnyCPU'">
53+
<DebugType>pdbonly</DebugType>
54+
<DebugSymbols>true</DebugSymbols>
55+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
56+
<NoWarn>$(NoWarn);1591;1573</NoWarn>
57+
</PropertyGroup>
58+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0|AnyCPU'">
59+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
60+
<NoWarn>$(NoWarn);1591;1573</NoWarn>
61+
</PropertyGroup>
4462

4563
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
4664
<FrameworkReference Include="Microsoft.AspNetCore.App" />
47-
<PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="6.15.1" />
48-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.1" />
49-
<PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.0" />
50-
<PackageReference Include="System.ServiceModel.Security" Version="4.9.0" />
5165
</ItemGroup>
5266
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
5367
<DefineConstants>NET60;NET</DefineConstants>

‎src/ITfoxtec.Identity.Saml2/ITfoxtec.Identity.Saml2.csproj‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net462</TargetFrameworks>
3+
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net462</TargetFrameworks>
44
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
55
<Authors>Anders Revsgaard</Authors>
66
<Company>ITfoxtec</Company>
@@ -10,6 +10,7 @@
1010
<Title>ITfoxtec Identity SAML 2.0</Title>
1111
<Description>The ITfoxtec Identity Saml2 package adds SAML-P support for both Identity Provider (IdP) and Relying Party (RP) on top of the SAML 2.0 functionality implemented in .NET.
1212

13+
Support .NET 7.0
1314
Support .NET 6.0
1415
Support .NET 5.0
1516
Support .NET Core 3.1
@@ -28,23 +29,44 @@ Support the Danish NemLog-in 2 / OIOSAML 2 and NemLog-in 3 / OIOSAML 3.</Descrip
2829
<PackageTags>SAML SAML 2.0 SAML2.0 SAML2 SAML 2 SAML-P SAMLP SSO Identity Provider (IdP) Relying Party (RP) Authentication Metadata OIOSAML OIOSAML 2 OIOSAML 3 NemLogin NemLog-in 2 NemLog-in 3</PackageTags>
2930
<NeutralLanguage>en-US</NeutralLanguage>
3031
<PackageIconUrl>https://itfoxtec.com/favicon.ico</PackageIconUrl>
31-
<AssemblyVersion>4.8.3.3</AssemblyVersion>
32-
<FileVersion>4.8.3.3</FileVersion>
32+
<AssemblyVersion>4.8.3.4</AssemblyVersion>
33+
<FileVersion>4.8.3.4</FileVersion>
3334
<Copyright>Copyright © 2021</Copyright>
34-
<Version>4.8.3-beta3</Version>
35+
<Version>4.8.3-beta4</Version>
3536
<SignAssembly>true</SignAssembly>
3637
<AssemblyOriginatorKeyFile>ITfoxtec.SAML2.snk</AssemblyOriginatorKeyFile>
3738
<DelaySign>false</DelaySign>
3839
<PackageProjectUrl>https://itfoxtec.com/IdentitySaml2</PackageProjectUrl>
3940
<RepositoryUrl>https://github.com/ITfoxtec/ITfoxtec.Identity.Saml2</RepositoryUrl>
4041
</PropertyGroup>
4142

43+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
44+
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
45+
<PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="6.25.0" />
46+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
47+
<PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.0" />
48+
<PackageReference Include="System.ServiceModel.Security" Version="4.10.0" />
49+
</ItemGroup>
50+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0'">
51+
<DefineConstants>NET70;NET</DefineConstants>
52+
</PropertyGroup>
53+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0|AnyCPU'">
54+
<DebugType>pdbonly</DebugType>
55+
<DebugSymbols>true</DebugSymbols>
56+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
57+
<NoWarn>$(NoWarn);1591;1573</NoWarn>
58+
</PropertyGroup>
59+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0|AnyCPU'">
60+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
61+
<NoWarn>$(NoWarn);1591;1573</NoWarn>
62+
</PropertyGroup>
63+
4264
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
4365
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
44-
<PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="6.15.1" />
45-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.1" />
46-
<PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.0" />
47-
<PackageReference Include="System.ServiceModel.Security" Version="4.9.0" />
66+
<PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="6.25.0" />
67+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
68+
<PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.0" />
69+
<PackageReference Include="System.ServiceModel.Security" Version="4.10.0" />
4870
</ItemGroup>
4971
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
5072
<DefineConstants>NET60;NET</DefineConstants>

‎test/TestIdPCore/TestIdPCore.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<AssemblyName>TestIdPCore</AssemblyName>
55
<PackageId>TestIdPCore</PackageId>
6-
<Version>6.0.0</Version>
6+
<Version>7.0.0</Version>
77
<Authors>Anders Revsgaard</Authors>
88
<Company>ITfoxtec</Company>
99
<Copyright>Copyright © 2019</Copyright>
@@ -23,6 +23,5 @@
2323

2424
<ItemGroup>
2525
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
26-
<PackageReference Include="System.ServiceModel.Security" Version="4.9.0" />
2726
</ItemGroup>
2827
</Project>

‎test/TestWebAppCore/TestWebAppCore.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<AssemblyName>TestWebAppCore</AssemblyName>
55
<PackageId>TestWebAppCore</PackageId>
6-
<Version>6.0.0</Version>
6+
<Version>7.0.0</Version>
77
<Authors>Anders Revsgaard</Authors>
88
<Company>ITfoxtec</Company>
99
<Copyright>Copyright © 2022</Copyright>
@@ -23,6 +23,5 @@
2323

2424
<ItemGroup>
2525
<PackageReference Include="BuildBundlerMinifier" Version="3.2.447" />
26-
<PackageReference Include="System.ServiceModel.Security" Version="4.9.0" />
2726
</ItemGroup>
2827
</Project>

‎test/TestWebAppCoreArtifact/TestWebAppCoreArtifact.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<AssemblyName>TestWebAppCoreArtifact</AssemblyName>
55
<PackageId>TestWebAppCoreArtifact</PackageId>
6-
<Version>6.0.0</Version>
6+
<Version>7.0.0</Version>
77
<Authors>Anders Revsgaard</Authors>
88
<Company>ITfoxtec</Company>
99
<Copyright>Copyright © 2022</Copyright>
@@ -23,6 +23,5 @@
2323

2424
<ItemGroup>
2525
<PackageReference Include="BuildBundlerMinifier" Version="3.2.447" />
26-
<PackageReference Include="System.ServiceModel.Security" Version="4.9.0" />
2726
</ItemGroup>
2827
</Project>

0 commit comments

Comments
 (0)