Merge pull request #54 from deveel/53-support-the-newer-versions-of-t…

…he-net-runtime Multi-target .NET Frameowk for .NET 6.0 and .NET 7.0
deveel · Oct 28, 2023 · 7bee0f0 · 7bee0f0
2 parents 951c0c1 + 4755551
commit 7bee0f0
Show file tree

Hide file tree

Showing 35 changed files with 156 additions and 204 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -6,16 +6,18 @@ on:
 
 jobs:
   build:
-
+    name: "Build and Test"
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: Setup .NET 6.0
+    - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+            6.0.x
+            7.0.x
     
     - name: Add Deveel GitHub NuGet Source
       run: dotnet nuget add source "https://nuget.pkg.github.com/deveel/index.json" -n "Deveel GitHub" -u ${{ secrets.DEVEEL_NUGET_USER }} -p ${{ secrets.DEVEEL_NUGET_TOKEN }} --store-password-in-clear-text
@@ -38,7 +40,6 @@ jobs:
       run: dotnet pack --configuration Release --no-restore --no-build --include-symbols --version-suffix $GITHUB_RUN_ID --output ./nuget
 
     - name: Push Packages to GitHub NuGet
-
       run: dotnet nuget push ./nuget/**/*.nupkg --skip-duplicate --api-key ${{secrets.GITHUB_TOKEN}} --source "Deveel GitHub"
 
   clean:

diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml
@@ -10,15 +10,18 @@ on:
 
 jobs:
   build:
+    name: "Build and Test"
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: Setup .NET 6.0
+    - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+            6.0.x
+            7.0.x
     
     - name: Add Deveel GitHub NuGet Source
       run: dotnet nuget add source "https://nuget.pkg.github.com/deveel/index.json" -n "Deveel GitHub" -u ${{ secrets.DEVEEL_NUGET_USER }} -p ${{ secrets.DEVEEL_NUGET_TOKEN }} --store-password-in-clear-text

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -6,16 +6,18 @@ on:
 
 jobs:
   build:
-
+    name: "Build and Test"
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: Setup .NET 6.0
+    - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+            6.0.x
+            7.0.x
     
     - name: Add Deveel GitHub NuGet Source
       run: dotnet nuget add source "https://nuget.pkg.github.com/deveel/index.json" -n "Deveel GitHub" -u ${{ secrets.DEVEEL_NUGET_USER }} -p ${{ secrets.DEVEEL_NUGET_TOKEN }} --store-password-in-clear-text

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-
+    name: "Build and Test"
     runs-on: ubuntu-latest
 
     steps:
@@ -17,10 +17,12 @@ jobs:
         TAG=${{ github.event.release.tag_name }}
         echo "VERSION=${TAG#v}" >> $GITHUB_ENV
 
-    - name: Setup .NET 6.0
+    - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+            6.0.x
+            7.0.x
     
     - name: Add Deveel GitHub NuGet Source
       run: dotnet nuget add source "https://nuget.pkg.github.com/deveel/index.json" -n "Deveel GitHub" -u ${{ secrets.DEVEEL_NUGET_USER }} -p ${{ secrets.DEVEEL_NUGET_TOKEN }} --store-password-in-clear-text
@@ -43,5 +45,4 @@ jobs:
       run: dotnet pack --configuration Release --no-restore --no-build --include-symbols -p:PackageVersion=$VERSION --output ./nuget
 
     - name: Push Packages to GitHub NuGet
-
       run: dotnet nuget push ./nuget/**/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_API_KEY}} --source https://api.nuget.org/v3/index.json
diff --git a/src/Deveel.Webhooks.DynamicLinq/Deveel.Webhooks.DynamicLinq.csproj b/src/Deveel.Webhooks.DynamicLinq/Deveel.Webhooks.DynamicLinq.csproj
@@ -1,17 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>Deveel</RootNamespace>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <Title>Deveel Webhooks Dynamic LINQ Filters</Title>
     <Description>An engine of the Deveel Webhooks framework that uses the Dynamic LINQ expressions to evaluate filters</Description>
     <PackageTags>events;webhooks;abstractions;core;linq;dlinq;dynamic-linq;filter</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Webhooks\WebhookServiceBuilderExtensions.cs" />
-  </ItemGroup>
-
 	<ItemGroup>
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.2" />
   </ItemGroup>

diff --git a/src/Deveel.Webhooks.DynamicLinq/Webhooks/WebhookServiceBuilderExtensions.cs b/src/Deveel.Webhooks.DynamicLinq/Webhooks/WebhookServiceBuilderExtensions.cs
diff --git a/src/Deveel.Webhooks.Model/Deveel.Webhooks.Model.csproj b/src/Deveel.Webhooks.Model/Deveel.Webhooks.Model.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>Deveel</RootNamespace>
+    <Title>Deveel Webhooks Domain Model</Title>
     <Description>Abstractions defining the model of the Webhook domain within the Deveel Webhooks Framework</Description>
     <PackageTags>webhooks;webhook;events;model;abstractions</PackageTags>
   </PropertyGroup>  

diff --git a/...eiver.AspNetCore.NewtonsoftJson/Deveel.Webhooks.Receiver.AspNetCore.NewtonsoftJson.csproj b/...eiver.AspNetCore.NewtonsoftJson/Deveel.Webhooks.Receiver.AspNetCore.NewtonsoftJson.csproj
@@ -1,17 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <RootNamespace>Deveel</RootNamespace>
-        <PackageTags>webhooks;webhook;receiver;receivers;aspnet;aspnetcore;httpcontext;httprequest;newtonsoft;json;jsonparser</PackageTags>
-        <Description>Extends the ASP.NET Core receivers with webhook parsers implemented using the Newtonsoft.Json library</Description>
-    </PropertyGroup>
+  <PropertyGroup>
+    <Title>Deveel Webhooks ASP.NET Core Netwonsoft JSON Serializer</Title>
+    <PackageTags>webhooks;webhook;receiver;receivers;aspnet;aspnetcore;httpcontext;httprequest;newtonsoft;json;jsonparser</PackageTags>
+    <Description>Extends the ASP.NET Core receivers with webhook parsers implemented using the Newtonsoft.Json library</Description>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Deveel.Webhooks.Receiver.AspNetCore\Deveel.Webhooks.Receiver.AspNetCore.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Deveel.Webhooks.Receiver.AspNetCore\Deveel.Webhooks.Receiver.AspNetCore.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/src/Deveel.Webhooks.Receiver.AspNetCore/Deveel.Webhooks.Receiver.AspNetCore.csproj b/src/Deveel.Webhooks.Receiver.AspNetCore/Deveel.Webhooks.Receiver.AspNetCore.csproj
@@ -1,20 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <RootNamespace>Deveel</RootNamespace>
-        <PackageTags>webhooks;webhooks;receiver;receivers;aspnet;aspnetcore;httprequest;middleware</PackageTags>
-        <Description>Provides an implementation of the webhook receivers supporting the ASP.NET Core infrastructure</Description>
-    </PropertyGroup>
+  <PropertyGroup>
+    <Title>Deveel Webhooks ASP.NET Core Receiver</Title>
+    <PackageTags>webhooks;webhooks;receiver;receivers;aspnet;aspnetcore;httprequest;middleware</PackageTags>
+    <Description>Provides an implementation of the webhook receivers supporting the ASP.NET Core infrastructure</Description>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <FrameworkReference Include="Microsoft.AspNetCore.App"/>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0"/>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0"/>
-        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0"/>
-    </ItemGroup>
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0"/>
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Deveel.Webhooks.Signers\Deveel.Webhooks.Signers.csproj"/>
-    </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Deveel.Webhooks.Signers\Deveel.Webhooks.Signers.csproj"/>
+  </ItemGroup>
 </Project>
diff --git a/src/Deveel.Webhooks.Receiver.Facebook/Deveel.Webhooks.Receiver.Facebook.csproj b/src/Deveel.Webhooks.Receiver.Facebook/Deveel.Webhooks.Receiver.Facebook.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>Deveel</RootNamespace>
+    <Title>Deveel Webhooks Facebook Receiver</Title>
     <PackageTags>webhooks;webhook;receiver;receivers;aspnet;aspnetcore;httpcontext;httprequest;facebook;messenger;message;fb</PackageTags>
     <Description>An implementation of the Deveel Webhooks ASP.NET Core Receiver that is able to receive webhooks from Facebook</Description>
   </PropertyGroup>

diff --git a/src/Deveel.Webhooks.Receiver.SendGrid/Deveel.Webhooks.Receiver.SendGrid.csproj b/src/Deveel.Webhooks.Receiver.SendGrid/Deveel.Webhooks.Receiver.SendGrid.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>Deveel</RootNamespace>
+    <Title>Deveel Webhooks SendGrid Receiver</Title>
     <PackageTags>webhooks;webhook;receiver;receivers;aspnet;aspnetcore;httpcontext;httprequest;sendgrid;sg;email;mail</PackageTags>
     <Description>An implementation of the Deveel Webhooks ASP.NET Core Receiver that is able to receive webhooks and e-mails from SendGrid</Description>
   </PropertyGroup>

diff --git a/src/Deveel.Webhooks.Receiver.Twilio/Deveel.Webhooks.Receiver.Twilio.csproj b/src/Deveel.Webhooks.Receiver.Twilio/Deveel.Webhooks.Receiver.Twilio.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <RootNamespace>Deveel</RootNamespace>
-        <PackageTags>webhooks;webhook;receiver;receivers;aspnet;aspnetcore;httpcontext;httprequest;twilio;sms;voice;whatsapp</PackageTags>
-        <Description>An implementation of the Deveel Webhooks ASP.NET Core Receiver that is able to receive webhooks from Twilio</Description>
-    </PropertyGroup>
+  <PropertyGroup>
+    <Title>Deveel Webhooks Twilio Receiver</Title>
+    <PackageTags>webhooks;webhook;receiver;receivers;aspnet;aspnetcore;httpcontext;httprequest;twilio;sms;voice;whatsapp</PackageTags>
+    <Description>An implementation of the Deveel Webhooks ASP.NET Core Receiver that is able to receive webhooks from Twilio</Description>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Deveel.Webhooks.Receiver.AspNetCore\Deveel.Webhooks.Receiver.AspNetCore.csproj"/>
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Deveel.Webhooks.Receiver.AspNetCore\Deveel.Webhooks.Receiver.AspNetCore.csproj"/>
+  </ItemGroup>
 
 </Project>
diff --git a/src/Deveel.Webhooks.Sender.NewtonsoftJson/Deveel.Webhooks.Sender.NewtonsoftJson.csproj b/src/Deveel.Webhooks.Sender.NewtonsoftJson/Deveel.Webhooks.Sender.NewtonsoftJson.csproj
@@ -1,18 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <RootNamespace>Deveel</RootNamespace>
-        <PackageTags>webhooks;webhook;sender;senders;newtonsoft;json;serializer;json-serializer</PackageTags>
-        <Description>Extends the senders with a webhook serializer implemented using the Newtonsoft.Json library</Description>
-    </PropertyGroup>
+  <PropertyGroup>
+    <Title>Deveel Webhooks Sender Newtonsoft JSON Serializer</Title>
+    <PackageTags>webhooks;webhook;sender;senders;newtonsoft;json;serializer;json-serializer</PackageTags>
+    <Description>Extends the senders with a webhook serializer implemented using the Newtonsoft.Json library</Description>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Deveel.Webhooks.Sender\Deveel.Webhooks.Sender.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Deveel.Webhooks.Sender\Deveel.Webhooks.Sender.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Deveel.Webhooks.Sender/Deveel.Webhooks.Sender.csproj b/src/Deveel.Webhooks.Sender/Deveel.Webhooks.Sender.csproj
@@ -1,18 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>Deveel</RootNamespace>
+    <Title>Deveel Webhooks Sender</Title>
     <Description>Provides services for the sending of Webhooks to receivers</Description>
     <PackageTags>webhooks;webhook;events;event;sender;send;delivery;http</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Polly" Version="7.2.4" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
-    <PackageReference Include="Polly" Version="7.2.4" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
+  </ItemGroup>
+
 
   <ItemGroup>
     <ProjectReference Include="..\Deveel.Webhooks.Signers\Deveel.Webhooks.Signers.csproj" />

diff --git a/src/Deveel.Webhooks.Service.EntityFramework/Deveel.Webhooks.EntityFramework.csproj b/src/Deveel.Webhooks.Service.EntityFramework/Deveel.Webhooks.EntityFramework.csproj
@@ -1,11 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<RootNamespace>Deveel</RootNamespace>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Title>Deveel Webhooks Entity Framework Data Layer</Title>
     <Description>An implementation of the Deveel Webhooks storage layer based on the Entity Framework ORM</Description>
     <PackageTags>webhooks;webhook;data;ef;entityframework;sql;subscription;subscriptions</PackageTags>
 	</PropertyGroup>

diff --git a/src/Deveel.Webhooks.Service.MongoDb/Deveel.Webhooks.MongoDb.csproj b/src/Deveel.Webhooks.Service.MongoDb/Deveel.Webhooks.MongoDb.csproj
@@ -1,18 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <RootNamespace>Deveel</RootNamespace>
-        <Description>An implementation of the Deveel Webhooks storage layer based on MongoDb</Description>
-        <PackageTags>webhooks;webhook;data;mongodb;mongo;subscription;subscriptions</PackageTags>
-    </PropertyGroup>
+  <PropertyGroup>
+    <Title>Deveel Webhooks MongoDB Data Layer</Title>
+    <Description>An implementation of the Deveel Webhooks storage layer based on MongoDb</Description>
+    <PackageTags>webhooks;webhook;data;mongodb;mongo;subscription;subscriptions</PackageTags>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Deveel.Repository.MongoFramework" Version="1.2.7" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Deveel.Repository.MongoFramework" Version="1.2.7" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Deveel.Webhooks.Service\Deveel.Webhooks.Service.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Deveel.Webhooks.Service\Deveel.Webhooks.Service.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Deveel.Webhooks.Service/Deveel.Webhooks.Service.csproj b/src/Deveel.Webhooks.Service/Deveel.Webhooks.Service.csproj
@@ -1,15 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>Deveel</RootNamespace>
+    <Title>Deveel Webhooks Service</Title>
     <Description>Abstractions and default services for the management Webhook subscriptions and their resolution</Description>
     <PackageTags>webhooks;webhook;event;management;subscription-management;subscriptions;subscription</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Deveel.Repository.Manager" Version="1.2.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
   </ItemGroup>
 
   <ItemGroup>