Upgrading the version of the framework to .NET 5.0

deveel · Mar 31, 2022 · bff4342 · bff4342
1 parent 9272f6c
commit bff4342
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 40 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -13,10 +13,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET
+
+    - name: Setup .NET 5.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.x
+        dotnet-version: 5.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/src/Deveel.Webhooks.DynamicLinq/Deveel.Webhooks.DynamicLinq.csproj b/src/Deveel.Webhooks.DynamicLinq/Deveel.Webhooks.DynamicLinq.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <VersionPrefix>1.0.3</VersionPrefix>
+    <TargetFramework>net5.0</TargetFramework>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <RootNamespace>Deveel</RootNamespace>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

diff --git a/src/Deveel.Webhooks.Model/Deveel.Webhooks.Model.csproj b/src/Deveel.Webhooks.Model/Deveel.Webhooks.Model.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <VersionPrefix>1.0.1</VersionPrefix>
+    <TargetFramework>net5.0</TargetFramework>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <RootNamespace>Deveel</RootNamespace>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

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,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <VersionPrefix>1.0.1</VersionPrefix>
+    <TargetFramework>net5.0</TargetFramework>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <RootNamespace>Deveel</RootNamespace>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Authors>antonello</Authors>

diff --git a/src/Deveel.Webhooks.Receiver/Deveel.Webhooks.Receiver.csproj b/src/Deveel.Webhooks.Receiver/Deveel.Webhooks.Receiver.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <VersionPrefix>1.0.1</VersionPrefix>
+    <TargetFramework>net5.0</TargetFramework>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <RootNamespace>Deveel</RootNamespace>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Authors>Antonello Provenzano</Authors>
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.17" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 

diff --git a/src/Deveel.Webhooks.Service.MongoDb/Deveel.Webhooks.MongoDb.csproj b/src/Deveel.Webhooks.Service.MongoDb/Deveel.Webhooks.MongoDb.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <VersionPrefix>1.0.3</VersionPrefix>
+    <TargetFramework>net5.0</TargetFramework>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <RootNamespace>Deveel</RootNamespace>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

diff --git a/src/Deveel.Webhooks.Service/Deveel.Webhooks.Service.csproj b/src/Deveel.Webhooks.Service/Deveel.Webhooks.Service.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <VersionPrefix>1.0.3</VersionPrefix>
+    <TargetFramework>net5.0</TargetFramework>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <RootNamespace>Deveel</RootNamespace>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -18,15 +18,6 @@
     <PackageTags>webhook event schema management subscriptions subscription</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Webhooks\DefaultWebhookSubscriptionResolver.cs" />
-    <Compile Remove="Webhooks\IWebhookServiceBuilder.cs" />
-    <Compile Remove="Webhooks\IWebhookSubscriptionFactory.cs" />
-    <Compile Remove="Webhooks\IWebhookSubscriptionManager.cs" />
-    <Compile Remove="Webhooks\WebhookServiceBuilderExtensions.cs" />
-    <Compile Remove="Webhooks\WebhookSubscriptionManager.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\..\deveel-logo.png">
       <Pack>True</Pack>

diff --git a/src/Deveel.Webhooks/Deveel.Webhooks.csproj b/src/Deveel.Webhooks/Deveel.Webhooks.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <VersionPrefix>1.0.3</VersionPrefix>
+    <TargetFramework>net5.0</TargetFramework>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <RootNamespace>Deveel</RootNamespace>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -30,9 +30,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.17" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.18" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.18" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Polly" Version="7.2.2" />
     <PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />

diff --git a/test/Deveel.Events.Webhooks.XUnit/Deveel.Webhooks.XUnit.csproj b/test/Deveel.Events.Webhooks.XUnit/Deveel.Webhooks.XUnit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
@@ -15,9 +15,10 @@
     </PackageReference>
     <PackageReference Include="MartinCostello.Logging.XUnit" Version="0.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.17" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="Mongo2Go" Version="3.1.3" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/test/Deveel.Webhooks.Receiver.XUnit/Deveel.Webhooks.Receiver.XUnit.csproj b/test/Deveel.Webhooks.Receiver.XUnit/Deveel.Webhooks.Receiver.XUnit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
@@ -20,9 +20,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.22" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
     <PackageReference Include="coverlet.collector" Version="3.1.2">
       <PrivateAssets>all</PrivateAssets>