fix nuget packages bogus references

Abblix · Apr 3, 2024 · 40fa221 · 40fa221
1 parent 9a56f5f
commit 40fa221
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 106 deletions.
diff --git a/Abblix.DependencyInjection/Abblix.DependencyInjection.csproj b/Abblix.DependencyInjection/Abblix.DependencyInjection.csproj
@@ -5,10 +5,7 @@
     <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>
+    <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>

diff --git a/Abblix.Jwt.UnitTests/Abblix.Jwt.UnitTests.csproj b/Abblix.Jwt.UnitTests/Abblix.Jwt.UnitTests.csproj
@@ -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>

diff --git a/Abblix.Jwt/Abblix.Jwt.csproj b/Abblix.Jwt/Abblix.Jwt.csproj
@@ -5,18 +5,12 @@
     <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>
+    <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>

diff --git a/Abblix.Oidc.Server.Mvc/Abblix.Oidc.Server.Mvc.csproj b/Abblix.Oidc.Server.Mvc/Abblix.Oidc.Server.Mvc.csproj
@@ -8,23 +8,21 @@
         <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>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\Abblix.DependencyInjection\Abblix.DependencyInjection.csproj" PrivateAssets="All" />
+        <ProjectReference Include="..\Abblix.Jwt\Abblix.Jwt.csproj" PrivateAssets="All" />
         <ProjectReference Include="..\Abblix.Oidc.Server\Abblix.Oidc.Server.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+      <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
     </ItemGroup>
 
     <PropertyGroup>

diff --git a/Abblix.Oidc.Server.Mvc/ActionResults/CookieOptionsExtensions.cs b/Abblix.Oidc.Server.Mvc/ActionResults/CookieOptionsExtensions.cs
@@ -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;
+    }
 }
diff --git a/Abblix.Oidc.Server.Tests/Abblix.Oidc.Server.Tests.csproj b/Abblix.Oidc.Server.Tests/Abblix.Oidc.Server.Tests.csproj
@@ -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>
@@ -26,6 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Abblix.Jwt\Abblix.Jwt.csproj" />
     <ProjectReference Include="..\Abblix.Oidc.Server\Abblix.Oidc.Server.csproj" />
   </ItemGroup>
 

diff --git a/Abblix.Oidc.Server.UnitTests/Abblix.Oidc.Server.UnitTests.csproj b/Abblix.Oidc.Server.UnitTests/Abblix.Oidc.Server.UnitTests.csproj
@@ -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>

diff --git a/Abblix.Oidc.Server/Abblix.Oidc.Server.csproj b/Abblix.Oidc.Server/Abblix.Oidc.Server.csproj
@@ -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>
@@ -25,22 +24,25 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Abblix.DependencyInjection\Abblix.DependencyInjection.csproj" />
-      <ProjectReference Include="..\Abblix.Jwt\Abblix.Jwt.csproj" />
+      <ProjectReference Include="..\Abblix.DependencyInjection\Abblix.DependencyInjection.csproj" PrivateAssets="all" />
+      <ProjectReference Include="..\Abblix.Jwt\Abblix.Jwt.csproj" PrivateAssets="all" />
     </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>
+    <!-- Add this Target to include DLLs directly in the NuGet package -->
+    <Target Name="IncludeDependencies" AfterTargets="Build">
+        <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>
+    </Target>
 
 </Project>
diff --git a/Abblix.Oidc.Server/Abblix.Oidc.Server.nuspec b/Abblix.Oidc.Server/Abblix.Oidc.Server.nuspec
diff --git a/Abblix.Utils.UnitTests/Abblix.Utils.UnitTests.csproj b/Abblix.Utils.UnitTests/Abblix.Utils.UnitTests.csproj
@@ -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>