diff --git a/src/NLU.DevOps.CommandLine.Tests/NLU.DevOps.CommandLine.Tests.csproj b/src/NLU.DevOps.CommandLine.Tests/NLU.DevOps.CommandLine.Tests.csproj
index 26d97d3..fd2fd33 100644
--- a/src/NLU.DevOps.CommandLine.Tests/NLU.DevOps.CommandLine.Tests.csproj
+++ b/src/NLU.DevOps.CommandLine.Tests/NLU.DevOps.CommandLine.Tests.csproj
@@ -2,13 +2,12 @@
   <Import Project="..\CodeAnalysis.props" />
   <Import Project="..\CodeCoverage.props" />
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
-  <Target Name="PublishProviders"
-          BeforeTargets="CoreBuild">
+  <Target Name="PublishProviders" BeforeTargets="CoreBuild">
     <ItemGroup>
       <PluginProject Include="..\NLU.DevOps.Luis\NLU.DevOps.Luis.csproj" />
       <PluginProject Include="..\NLU.DevOps.LuisV3\NLU.DevOps.LuisV3.csproj" />
@@ -16,9 +15,7 @@
       <PluginProject Include="..\NLU.DevOps.Dialogflow\NLU.DevOps.Dialogflow.csproj" />
     </ItemGroup>
 
-    <MSBuild Projects="@(PluginProject)"
-             Targets="Publish"
-             Properties="Configuration=$(Configuration);PublishDir=$(TargetDir)providers\%(FileName)\" />
+    <MSBuild Projects="@(PluginProject)" Targets="Publish" Properties="Configuration=$(Configuration);PublishDir=$(TargetDir)providers\%(FileName)\" />
   </Target>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.5.3" />
diff --git a/src/NLU.DevOps.CommandLine/NLU.DevOps.CommandLine.csproj b/src/NLU.DevOps.CommandLine/NLU.DevOps.CommandLine.csproj
index a00a3b0..f10b48a 100644
--- a/src/NLU.DevOps.CommandLine/NLU.DevOps.CommandLine.csproj
+++ b/src/NLU.DevOps.CommandLine/NLU.DevOps.CommandLine.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\CommonNuget.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>dotnet-nlu</AssemblyName>
     <PackAsTool>true</PackAsTool>
   </PropertyGroup>
@@ -16,8 +16,7 @@
     <TargetsForTfmSpecificContentInPackage>PublishProviders;$(TargetsForTfmSpecificContentInPackage)</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 
-  <Target Name="PublishProviders"
-          BeforeTargets="CoreBuild">
+  <Target Name="PublishProviders" BeforeTargets="CoreBuild">
 
     <ItemGroup>
       <PluginProject Include="..\NLU.DevOps.Luis\NLU.DevOps.Luis.csproj" />
@@ -26,9 +25,7 @@
       <PluginProject Include="..\NLU.DevOps.Dialogflow\NLU.DevOps.Dialogflow.csproj" />
     </ItemGroup>
 
-    <MSBuild Projects="@(PluginProject)"
-             Targets="Publish"
-             Properties="Configuration=$(Configuration);PublishDir=$(TargetDir)providers\%(FileName)\" />
+    <MSBuild Projects="@(PluginProject)" Targets="Publish" Properties="Configuration=$(Configuration);PublishDir=$(TargetDir)providers\%(FileName)\" />
 
     <ItemGroup>
       <TfmSpecificPackageFile Include="$(TargetDir)providers\**\*">
diff --git a/src/NLU.DevOps.Core.Tests/NLU.DevOps.Core.Tests.csproj b/src/NLU.DevOps.Core.Tests/NLU.DevOps.Core.Tests.csproj
index 0d41f59..ce812eb 100644
--- a/src/NLU.DevOps.Core.Tests/NLU.DevOps.Core.Tests.csproj
+++ b/src/NLU.DevOps.Core.Tests/NLU.DevOps.Core.Tests.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\CodeCoverage.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/NLU.DevOps.Core/NLU.DevOps.Core.csproj b/src/NLU.DevOps.Core/NLU.DevOps.Core.csproj
index e6ea6b0..dd2d8e5 100644
--- a/src/NLU.DevOps.Core/NLU.DevOps.Core.csproj
+++ b/src/NLU.DevOps.Core/NLU.DevOps.Core.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\CommonNuget.props" />
   <Import Project="..\CodeAnalysis.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
diff --git a/src/NLU.DevOps.Dialogflow.Tests/NLU.DevOps.Dialogflow.Tests.csproj b/src/NLU.DevOps.Dialogflow.Tests/NLU.DevOps.Dialogflow.Tests.csproj
index 8c375cd..40492d1 100644
--- a/src/NLU.DevOps.Dialogflow.Tests/NLU.DevOps.Dialogflow.Tests.csproj
+++ b/src/NLU.DevOps.Dialogflow.Tests/NLU.DevOps.Dialogflow.Tests.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\CodeCoverage.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/NLU.DevOps.Dialogflow/NLU.DevOps.Dialogflow.csproj b/src/NLU.DevOps.Dialogflow/NLU.DevOps.Dialogflow.csproj
index 6a6867f..4adb940 100644
--- a/src/NLU.DevOps.Dialogflow/NLU.DevOps.Dialogflow.csproj
+++ b/src/NLU.DevOps.Dialogflow/NLU.DevOps.Dialogflow.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <AssemblyName>dotnet-nlu-dialogflow</AssemblyName>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
diff --git a/src/NLU.DevOps.Lex.Tests/NLU.DevOps.Lex.Tests.csproj b/src/NLU.DevOps.Lex.Tests/NLU.DevOps.Lex.Tests.csproj
index 3ee087e..4a087df 100644
--- a/src/NLU.DevOps.Lex.Tests/NLU.DevOps.Lex.Tests.csproj
+++ b/src/NLU.DevOps.Lex.Tests/NLU.DevOps.Lex.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\CodeAnalysis.props" />
   <Import Project="..\CodeCoverage.props" />
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
diff --git a/src/NLU.DevOps.Lex/NLU.DevOps.Lex.csproj b/src/NLU.DevOps.Lex/NLU.DevOps.Lex.csproj
index 964ea6b..15b7d3c 100644
--- a/src/NLU.DevOps.Lex/NLU.DevOps.Lex.csproj
+++ b/src/NLU.DevOps.Lex/NLU.DevOps.Lex.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\CodeAnalysis.props" />
   <PropertyGroup>
     <AssemblyName>dotnet-nlu-lex</AssemblyName>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
diff --git a/src/NLU.DevOps.Luis.Tests/NLU.DevOps.Luis.Tests.csproj b/src/NLU.DevOps.Luis.Tests/NLU.DevOps.Luis.Tests.csproj
index ff146bf..21fbee9 100644
--- a/src/NLU.DevOps.Luis.Tests/NLU.DevOps.Luis.Tests.csproj
+++ b/src/NLU.DevOps.Luis.Tests/NLU.DevOps.Luis.Tests.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\CodeCoverage.props" />
   <Import Project="..\CodeAnalysis.props" />
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DefineConstants>$(DefineConstants);LUIS_V2</DefineConstants>
   </PropertyGroup>
 
diff --git a/src/NLU.DevOps.Luis/NLU.DevOps.Luis.csproj b/src/NLU.DevOps.Luis/NLU.DevOps.Luis.csproj
index 1270109..5c4b1d7 100644
--- a/src/NLU.DevOps.Luis/NLU.DevOps.Luis.csproj
+++ b/src/NLU.DevOps.Luis/NLU.DevOps.Luis.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\CodeAnalysis.props" />
   <PropertyGroup>
     <AssemblyName>dotnet-nlu-luis</AssemblyName>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <DefineConstants>$(DefineConstants);LUIS_V2</DefineConstants>
diff --git a/src/NLU.DevOps.LuisV3.Tests/NLU.DevOps.LuisV3.Tests.csproj b/src/NLU.DevOps.LuisV3.Tests/NLU.DevOps.LuisV3.Tests.csproj
index 64636f0..4143450 100644
--- a/src/NLU.DevOps.LuisV3.Tests/NLU.DevOps.LuisV3.Tests.csproj
+++ b/src/NLU.DevOps.LuisV3.Tests/NLU.DevOps.LuisV3.Tests.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\CodeCoverage.props" />
   <Import Project="..\CodeAnalysis.props" />
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DefineConstants>$(DefineConstants);LUIS_V3</DefineConstants>
   </PropertyGroup>
 
diff --git a/src/NLU.DevOps.LuisV3/NLU.DevOps.LuisV3.csproj b/src/NLU.DevOps.LuisV3/NLU.DevOps.LuisV3.csproj
index 2e02229..b634839 100644
--- a/src/NLU.DevOps.LuisV3/NLU.DevOps.LuisV3.csproj
+++ b/src/NLU.DevOps.LuisV3/NLU.DevOps.LuisV3.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\CodeAnalysis.props" />
   <PropertyGroup>
     <AssemblyName>dotnet-nlu-luisV3</AssemblyName>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <RootNamespace>NLU.DevOps.Luis</RootNamespace>
diff --git a/src/NLU.DevOps.MockProvider/NLU.DevOps.MockProvider.csproj b/src/NLU.DevOps.MockProvider/NLU.DevOps.MockProvider.csproj
index 4002dcf..e9369f3 100644
--- a/src/NLU.DevOps.MockProvider/NLU.DevOps.MockProvider.csproj
+++ b/src/NLU.DevOps.MockProvider/NLU.DevOps.MockProvider.csproj
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <AssemblyName>dotnet-nlu-mock</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <PackAsTool>true</PackAsTool>
   </PropertyGroup>
 
diff --git a/src/NLU.DevOps.ModelPerformance.Tests/NLU.DevOps.ModelPerformance.Tests.csproj b/src/NLU.DevOps.ModelPerformance.Tests/NLU.DevOps.ModelPerformance.Tests.csproj
index 2c1ce5c..1ade6a1 100644
--- a/src/NLU.DevOps.ModelPerformance.Tests/NLU.DevOps.ModelPerformance.Tests.csproj
+++ b/src/NLU.DevOps.ModelPerformance.Tests/NLU.DevOps.ModelPerformance.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\CodeAnalysis.props" />
   <Import Project="..\CodeCoverage.props" />
   <PropertyGroup>
-      <TargetFramework>netcoreapp2.1</TargetFramework>
+      <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
diff --git a/src/NLU.DevOps.ModelPerformance/NLU.DevOps.ModelPerformance.csproj b/src/NLU.DevOps.ModelPerformance/NLU.DevOps.ModelPerformance.csproj
index e328187..cab7398 100644
--- a/src/NLU.DevOps.ModelPerformance/NLU.DevOps.ModelPerformance.csproj
+++ b/src/NLU.DevOps.ModelPerformance/NLU.DevOps.ModelPerformance.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\CodeAnalysis.props" />
   <Import Project="..\CodeCoverage.props" />
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
diff --git a/src/NLU.DevOps.Models/NLU.DevOps.Models.csproj b/src/NLU.DevOps.Models/NLU.DevOps.Models.csproj
index c7e5df9..59596c1 100644
--- a/src/NLU.DevOps.Models/NLU.DevOps.Models.csproj
+++ b/src/NLU.DevOps.Models/NLU.DevOps.Models.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\CommonNuget.props" />
   <Import Project="..\CodeAnalysis.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
diff --git a/src/NLU.DevOps.sln b/src/NLU.DevOps.sln
index 609b4d0..52091da 100644
--- a/src/NLU.DevOps.sln
+++ b/src/NLU.DevOps.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.757
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32210.238
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLU.DevOps.Models", "NLU.DevOps.Models\NLU.DevOps.Models.csproj", "{6B6B7069-F43F-43AD-87EB-7F0B7583404E}"
 EndProject
@@ -42,7 +42,11 @@ EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		NLU.DevOps.Luis.Shared\NLU.DevOps.Luis.Shared.projitems*{03cc905a-48d1-466c-a816-e19bf944a7ee}*SharedItemsImports = 13
+		NLU.DevOps.Luis.Tests.Shared\NLU.DevOps.Luis.Tests.Shared.projitems*{280b55da-272d-44d5-ae73-8730ca96ec0b}*SharedItemsImports = 5
+		NLU.DevOps.Luis.Shared\NLU.DevOps.Luis.Shared.projitems*{874c5d08-0dd9-4385-878a-0fb7cd6a4314}*SharedItemsImports = 5
+		NLU.DevOps.Luis.Shared\NLU.DevOps.Luis.Shared.projitems*{b52ddc83-32c8-4dca-8c39-8dbd0a550382}*SharedItemsImports = 5
 		NLU.DevOps.Luis.Tests.Shared\NLU.DevOps.Luis.Tests.Shared.projitems*{d7f8ef09-9289-432d-9255-677844f96a5b}*SharedItemsImports = 13
+		NLU.DevOps.Luis.Tests.Shared\NLU.DevOps.Luis.Tests.Shared.projitems*{f5ce52e9-c95f-4601-9575-c654c619a767}*SharedItemsImports = 5
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU