Skip to content

Commit

Permalink
fix nuget packages bogus references
Browse files Browse the repository at this point in the history
  • Loading branch information
kirill-abblix committed Apr 3, 2024
1 parent 9a56f5f commit 7fc341b
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 108 deletions.
8 changes: 3 additions & 5 deletions Abblix.DependencyInjection/Abblix.DependencyInjection.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<Description>
Enhances .NET applications with Abblix's sophisticated dependency injection patterns,
offering features like service aliasing, composite services, and decorators for streamlined service registration.
</Description>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>Enhances .NET applications with Abblix's sophisticated dependency injection patterns, offering features like service aliasing, composite services, and decorators for streamlined service registration.</Description>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions Abblix.Jwt.UnitTests/Abblix.Jwt.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
15 changes: 5 additions & 10 deletions Abblix.Jwt/Abblix.Jwt.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,14 @@
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<Description>
A lightweight, easy-to-use library for generating, validating, and working with JSON Web Tokens (JWT) in .NET applications.
Whether you're developing web APIs, microservices, or serverless applications that require secure, stateless authentication
and authorization solutions, Abblix.Jwt provides a robust set of features to incorporate JWT-based authentication
with minimal effort. Features include token validation, custom claims, signature verification, and audience validation,
making it an ideal choice for developers looking to secure their .NET applications efficiently.
</Description>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>A lightweight, easy-to-use library for generating, validating, and working with JSON Web Tokens (JWT) in .NET applications. Whether you're developing web APIs, microservices, or serverless applications that require secure, stateless authentication and authorization solutions, Abblix.Jwt provides a robust set of features to incorporate JWT-based authentication with minimal effort. Features include token validation, custom claims, signature verification, and audience validation, making it an ideal choice for developers looking to secure their .NET applications efficiently.</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 2 additions & 6 deletions Abblix.Oidc.Server.Mvc/Abblix.Oidc.Server.Mvc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>
The package integrates Abblix's OpenID Connect Server capabilities with ASP.NET MVC, offering seamless
support for authentication and authorization in MVC applications. It enables rapid implementation of
secure OpenID Connect protocols, ensuring robust security features are accessible within the MVC framework.
</Description>
<Description>The package integrates Abblix's OpenID Connect Server capabilities with ASP.NET MVC, offering seamless support for authentication and authorization in MVC applications. It enables rapid implementation of secure OpenID Connect protocols, ensuring robust security features are accessible within the MVC framework.</Description>
</PropertyGroup>

<ItemGroup>
Expand All @@ -24,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
</ItemGroup>

<PropertyGroup>
Expand Down
27 changes: 14 additions & 13 deletions Abblix.Oidc.Server.Mvc/ActionResults/CookieOptionsExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,27 @@ public static class CookieOptionsExtensions
/// </summary>
/// <param name="options">The custom cookie options to convert.</param>
/// <returns>The converted <see cref="CookieOptions"/> suitable for ASP.NET Core.</returns>
public static CookieOptions ConvertOptions(this Common.CookieOptions options)
=> new()
{
Domain = options.Domain,
Path = options.Path,
Secure = options.Secure,
IsEssential = options.IsEssential,
HttpOnly = options.HttpOnly,
SameSite = options.SameSite.ConvertSameSite(),
Expires = options.Expires,
MaxAge = options.MaxAge,
};
public static CookieOptions ConvertOptions(this Common.CookieOptions options) => new()
{
Domain = options.Domain,
Path = options.Path,
Secure = options.Secure,
IsEssential = options.IsEssential,
HttpOnly = options.HttpOnly,
SameSite = options.SameSite.ConvertSameSite(),
Expires = options.Expires,
MaxAge = options.MaxAge,
};

/// <summary>
/// Converts a string representation of the SameSite attribute to its <see cref="SameSiteMode"/> equivalent.
/// </summary>
/// <param name="sameSite">The string representation of the SameSite attribute.</param>
/// <returns>The <see cref="SameSiteMode"/> value corresponding to the input string.</returns>
private static SameSiteMode ConvertSameSite(this string? sameSite)
=> sameSite.HasValue()
{
return sameSite.HasValue()
? Enum.Parse<SameSiteMode>(sameSite, true)
: SameSiteMode.Unspecified;
}
}
8 changes: 4 additions & 4 deletions Abblix.Oidc.Server.Tests/Abblix.Oidc.Server.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

<ItemGroup>
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
15 changes: 0 additions & 15 deletions Abblix.Oidc.Server/Abblix.Oidc.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<RepositoryUrl>https://github.com/Abblix/Oidc.Server</RepositoryUrl>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup>
Expand All @@ -29,18 +28,4 @@
<ProjectReference Include="..\Abblix.Jwt\Abblix.Jwt.csproj" />
</ItemGroup>

<ItemGroup>
<None Include="bin\Release\net6.0\Abblix.Utils.dll" Pack="true" PackagePath="lib\net6.0" />
<None Include="bin\Release\net6.0\Abblix.Jwt.dll" Pack="true" PackagePath="lib\net6.0" />
<None Include="bin\Release\net6.0\Abblix.DependencyInjection.dll" Pack="true" PackagePath="lib\net6.0" />

<None Include="bin\Release\net7.0\Abblix.Utils.dll" Pack="true" PackagePath="lib\net7.0" />
<None Include="bin\Release\net7.0\Abblix.Jwt.dll" Pack="true" PackagePath="lib\net7.0" />
<None Include="bin\Release\net7.0\Abblix.DependencyInjection.dll" Pack="true" PackagePath="lib\net7.0" />

<None Include="bin\Release\net8.0\Abblix.Utils.dll" Pack="true" PackagePath="lib\net8.0" />
<None Include="bin\Release\net8.0\Abblix.Jwt.dll" Pack="true" PackagePath="lib\net8.0" />
<None Include="bin\Release\net8.0\Abblix.DependencyInjection.dll" Pack="true" PackagePath="lib\net8.0" />
</ItemGroup>

</Project>
42 changes: 0 additions & 42 deletions Abblix.Oidc.Server/Abblix.Oidc.Server.nuspec

This file was deleted.

8 changes: 4 additions & 4 deletions Abblix.Utils.UnitTests/Abblix.Utils.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
4 changes: 3 additions & 1 deletion Abblix.Utils/Abblix.Utils.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

</PropertyGroup>

</Project>

0 comments on commit 7fc341b

Please sign in to comment.