Skip to content
Snippets Groups Projects
Commit cd6b8453 authored by Petar Hristov's avatar Petar Hristov :speech_balloon:
Browse files

Merge branch 'dev' into 'master'

Release: Sprint/2022 06 :robot:

See merge request !18
parents 46dad738 4b94ef4f
No related branches found
No related tags found
2 merge requests!19Chore: 2.1.1,!18Release: Sprint/2022 06 :robot:
Pipeline #685730 passed
......@@ -3,14 +3,14 @@
<OutputType>Library</OutputType>
<RootNamespace>Coscine.JwtHandler.Tests</RootNamespace>
<AssemblyName>Coscine.JwtHandler.Tests</AssemblyName>
<TargetFrameworks>net5.0;net461</TargetFrameworks>
<TargetFrameworks>net6.0;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\JwtHandler\JwtHandler.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
</ItemGroup>
</Project>
\ No newline at end of file

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30320.27
# Visual Studio Version 17
VisualStudioVersion = 17.1.32228.430
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JwtHandler", "JwtHandler\JwtHandler.csproj", "{F17CF42D-AF36-45A4-9A81-1804E27857BD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JwtHandler", "JwtHandler\JwtHandler.csproj", "{F17CF42D-AF36-45A4-9A81-1804E27857BD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JwtHandler.Tests", "JwtHandler.Tests\JwtHandler.Tests.csproj", "{09823FA2-31B4-462B-B534-956C74B56DB3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JwtHandler.Tests", "JwtHandler.Tests\JwtHandler.Tests.csproj", "{09823FA2-31B4-462B-B534-956C74B56DB3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Coscine.JwtHandler</RootNamespace>
<AssemblyName>Coscine.JwtHandler</AssemblyName>
<TargetFrameworks>net5.0;net461</TargetFrameworks>
<Version>2.1.0</Version>
<TargetFrameworks>net6.0;net461</TargetFrameworks>
<Version>2.0.1</Version>
</PropertyGroup>
<PropertyGroup>
<Authors>RWTH Aachen University</Authors>
......@@ -24,7 +24,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Coscine.Configuration" Version="2.*-*" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.8.0" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.16.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.16.0" />
</ItemGroup>
</Project>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment