Skip to content

Commit 57d0ca5

Browse files
RevsgaardRevsgaard
committed
Support .NET 6.
1 parent 9294b0f commit 57d0ca5

File tree

5 files changed

+62
-19
lines changed

5 files changed

+62
-19
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ Support the Danish NemLog-in 2 / OIOSAML 2 and NemLog-in 3 / OIOSAML 3.</Descrip
2222
<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>
2323
<NeutralLanguage>en-US</NeutralLanguage>
2424
<PackageIconUrl>https://itfoxtec.com/favicon.ico</PackageIconUrl>
25-
<AssemblyVersion>4.7.1.0</AssemblyVersion>
26-
<FileVersion>4.7.1.0</FileVersion>
25+
<AssemblyVersion>4.8.0.0</AssemblyVersion>
26+
<FileVersion>4.8.0.0</FileVersion>
2727
<Copyright>Copyright © 2021</Copyright>
28-
<Version>4.7.1</Version>
28+
<Version>4.8.0</Version>
2929
<SignAssembly>true</SignAssembly>
3030
<AssemblyOriginatorKeyFile>ITfoxtec.SAML2.snk</AssemblyOriginatorKeyFile>
3131
<DelaySign>false</DelaySign>

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

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net5.0;netcoreapp3.1;net472;net461</TargetFrameworks>
3+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net472;net461</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 6.0
1314
Support .NET 5.0
1415
Support .NET Core 3.1
1516
Support .NET Framework 4.6.1 and 4.7.2
@@ -24,10 +25,10 @@ Support the Danish NemLog-in 2 / OIOSAML 2 and NemLog-in 3 / OIOSAML 3.</Descrip
2425
<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>
2526
<NeutralLanguage>en-US</NeutralLanguage>
2627
<PackageIconUrl>https://itfoxtec.com/favicon.ico</PackageIconUrl>
27-
<AssemblyVersion>4.7.1.0</AssemblyVersion>
28-
<FileVersion>4.7.1.0</FileVersion>
28+
<AssemblyVersion>4.8.0.0</AssemblyVersion>
29+
<FileVersion>4.8.0.0</FileVersion>
2930
<Copyright>Copyright © 2021</Copyright>
30-
<Version>4.7.1</Version>
31+
<Version>4.8.0</Version>
3132
<SignAssembly>true</SignAssembly>
3233
<AssemblyOriginatorKeyFile>ITfoxtec.SAML2.snk</AssemblyOriginatorKeyFile>
3334
<DelaySign>false</DelaySign>
@@ -38,7 +39,28 @@ Support the Danish NemLog-in 2 / OIOSAML 2 and NemLog-in 3 / OIOSAML 3.</Descrip
3839
<ItemGroup>
3940
<ProjectReference Include="..\ITfoxtec.Identity.Saml2\ITfoxtec.Identity.Saml2.csproj" />
4041
</ItemGroup>
41-
42+
43+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
44+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
45+
<PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="6.15.1" />
46+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.1" />
47+
<PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.0" />
48+
<PackageReference Include="System.ServiceModel.Security" Version="4.9.0" />
49+
</ItemGroup>
50+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
51+
<DefineConstants>NET60</DefineConstants>
52+
</PropertyGroup>
53+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.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|net6.0|AnyCPU'">
60+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
61+
<NoWarn>$(NoWarn);1591;1573</NoWarn>
62+
</PropertyGroup>
63+
4264
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0'">
4365
<FrameworkReference Include="Microsoft.AspNetCore.App" />
4466
<PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="6.8.0" />

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

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net472;net461</TargetFrameworks>
3+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net472;net461</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 6.0
1314
Support .NET 5.0
1415
Support .NET Core 3.1
1516
Support .NET Standard 2.1
@@ -25,17 +26,37 @@ Support the Danish NemLog-in 2 / OIOSAML 2 and NemLog-in 3 / OIOSAML 3.</Descrip
2526
<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>
2627
<NeutralLanguage>en-US</NeutralLanguage>
2728
<PackageIconUrl>https://itfoxtec.com/favicon.ico</PackageIconUrl>
28-
<AssemblyVersion>4.7.1.0</AssemblyVersion>
29-
<FileVersion>4.7.1.0</FileVersion>
29+
<AssemblyVersion>4.8.0.0</AssemblyVersion>
30+
<FileVersion>4.8.0.0</FileVersion>
3031
<Copyright>Copyright © 2021</Copyright>
31-
<Version>4.7.1</Version>
32+
<Version>4.8.0</Version>
3233
<SignAssembly>true</SignAssembly>
3334
<AssemblyOriginatorKeyFile>ITfoxtec.SAML2.snk</AssemblyOriginatorKeyFile>
3435
<DelaySign>false</DelaySign>
3536
<PackageProjectUrl>https://itfoxtec.com/IdentitySaml2</PackageProjectUrl>
3637
<RepositoryUrl>https://github.com/ITfoxtec/ITfoxtec.Identity.Saml2</RepositoryUrl>
3738
</PropertyGroup>
3839

40+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
41+
<PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="6.15.1" />
42+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.1" />
43+
<PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.0" />
44+
<PackageReference Include="System.ServiceModel.Security" Version="4.9.0" />
45+
</ItemGroup>
46+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
47+
<DefineConstants>NET60</DefineConstants>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
50+
<DebugType>pdbonly</DebugType>
51+
<DebugSymbols>true</DebugSymbols>
52+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
53+
<NoWarn>$(NoWarn);1591;1573</NoWarn>
54+
</PropertyGroup>
55+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
56+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
57+
<NoWarn>$(NoWarn);1591;1573</NoWarn>
58+
</PropertyGroup>
59+
3960
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0'">
4061
<PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="6.8.0" />
4162
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.8.0" />

‎test/TestIdPCore/TestIdPCore.csproj‎

Lines changed: 3 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>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<AssemblyName>TestIdPCore</AssemblyName>
55
<PackageId>TestIdPCore</PackageId>
6-
<Version>5.0.0</Version>
6+
<Version>6.0.0</Version>
77
<Authors>Anders Revsgaard</Authors>
88
<Company>ITfoxtec</Company>
99
<Copyright>Copyright © 2019</Copyright>
@@ -23,6 +23,6 @@
2323

2424
<ItemGroup>
2525
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
26-
<PackageReference Include="System.ServiceModel.Security" Version="4.8.0" />
26+
<PackageReference Include="System.ServiceModel.Security" Version="4.9.0" />
2727
</ItemGroup>
2828
</Project>

‎test/TestWebAppCore/TestWebAppCore.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<AssemblyName>TestWebAppCore</AssemblyName>
55
<PackageId>TestWebAppCore</PackageId>
6-
<Version>5.0.0</Version>
6+
<Version>6.0.0</Version>
77
<Authors>Anders Revsgaard</Authors>
88
<Company>ITfoxtec</Company>
9-
<Copyright>Copyright © 2019</Copyright>
9+
<Copyright>Copyright © 2022</Copyright>
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<Content Remove="package-lock.json" />
@@ -23,6 +23,6 @@
2323

2424
<ItemGroup>
2525
<PackageReference Include="BuildBundlerMinifier" Version="3.2.447" />
26-
<PackageReference Include="System.ServiceModel.Security" Version="4.8.0" />
26+
<PackageReference Include="System.ServiceModel.Security" Version="4.9.0" />
2727
</ItemGroup>
2828
</Project>

0 commit comments

Comments
 (0)