From 3d391e24af04d6f0a44d7582d0af412efd0f5ff8 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Mon, 10 May 2021 12:33:18 +0200
Subject: [PATCH] Revert multi-targeting

---
 .../Elsa.Activities.Http.csproj                     |  2 +-
 .../Elsa.Activities.Webhooks.csproj                 |  2 +-
 src/server/Elsa.Server.Api/Elsa.Server.Api.csproj   | 13 +++----------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj b/src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj
index 0d397d533..2f39f892c 100644
--- a/src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj
+++ b/src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj
@@ -4,7 +4,7 @@
     <Import Project="..\..\..\configureawait.props" />
     
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFramework>net5.0</TargetFramework>
         <Description>
             Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application.
             This package provides the following Console activities:
diff --git a/src/activities/Elsa.Activities.Webhooks/Elsa.Activities.Webhooks.csproj b/src/activities/Elsa.Activities.Webhooks/Elsa.Activities.Webhooks.csproj
index 89899a60f..d4b4ece11 100644
--- a/src/activities/Elsa.Activities.Webhooks/Elsa.Activities.Webhooks.csproj
+++ b/src/activities/Elsa.Activities.Webhooks/Elsa.Activities.Webhooks.csproj
@@ -4,7 +4,7 @@
     <Import Project="..\..\..\configureawait.props" />
     
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFramework>net5.0</TargetFramework>
         <Description>
             Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application.
             This package provides the Webhooks activities.
diff --git a/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj b/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj
index 331e1779f..3a45b3768 100644
--- a/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj
+++ b/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj
@@ -4,25 +4,18 @@
     <Import Project="..\..\..\configureawait.props" />
     
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFramework>net5.0</TargetFramework>
         <Description>
             Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application.
             This package provides API endpoints to interact with the workflow host.
         </Description>       
         <PackageTags>elsa, workflows, asp.net core</PackageTags>
     </PropertyGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.14" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />
-    </ItemGroup>
-
+    
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
         <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.0.0" />