diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index ca9e6728..973ee7d7 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -2,18 +2,6 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "fake-cli": {
-      "version": "5.20.4",
-      "commands": [
-        "fake"
-      ]
-    },
-    "paket": {
-      "version": "6.0.7",
-      "commands": [
-        "paket"
-      ]
-    },
     "fsharp.formatting.commandtool": {
       "version": "11.4.4",
       "commands": [
@@ -25,6 +13,18 @@
       "commands": [
         "fantomas"
       ]
+    },
+    "fake-cli": {
+      "version": "5.23.1",
+      "commands": [
+        "fake"
+      ]
+    },
+    "paket": {
+      "version": "7.2.0",
+      "commands": [
+        "paket"
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/build.fsx b/build.fsx
index 21937ba3..cdbcb4fd 100644
--- a/build.fsx
+++ b/build.fsx
@@ -182,7 +182,7 @@ Target.create
                               Runtime = Some runtime
                               SelfContained = Some false
                               Configuration = DotNet.BuildConfiguration.Release
-                              OutputPath = Some(sprintf "src/RProvider/bin/Release/net5.0/server/%s/" runtime) })
+                              OutputPath = Some(sprintf "src/RProvider/bin/Release/net7.0/server/%s/" runtime) })
                     "src/RProvider.Server"))
 
 Target.create
diff --git a/docs/expressions.fsx b/docs/expressions.fsx
index 7f65559c..819555a5 100644
--- a/docs/expressions.fsx
+++ b/docs/expressions.fsx
@@ -8,12 +8,12 @@ index: 4
 
 (*** condition: prepare ***)
 #nowarn "211"
-#r "../src/RProvider/bin/Release/net5.0/DynamicInterop.dll"
-#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
-#r "../src/RProvider/bin/Release/net5.0/RDotNet.FSharp.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
+#r "../src/RProvider/bin/Release/net7.0/DynamicInterop.dll"
+#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
+#r "../src/RProvider/bin/Release/net7.0/RDotNet.FSharp.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
 (*** condition: fsx ***)
 #if FSX
 #r "nuget: RProvider,{{package-version}}"
diff --git a/docs/fslab.fsx b/docs/fslab.fsx
index 5cff13fa..1a2bd7af 100644
--- a/docs/fslab.fsx
+++ b/docs/fslab.fsx
@@ -8,10 +8,10 @@ index: 6
 
 (*** condition: prepare ***)
 #nowarn "211"
-#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
+#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
 (*** condition: fsx ***)
 #if FSX
 #r "nuget: RProvider,{{package-version}}"
diff --git a/docs/operators.fsx b/docs/operators.fsx
index 2416b619..f347d820 100644
--- a/docs/operators.fsx
+++ b/docs/operators.fsx
@@ -8,12 +8,12 @@ index: 4
 
 (*** condition: prepare ***)
 #nowarn "211"
-#r "../src/RProvider/bin/Release/net5.0/DynamicInterop.dll"
-#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
-#r "../src/RProvider/bin/Release/net5.0/RDotNet.FSharp.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
+#r "../src/RProvider/bin/Release/net7.0/DynamicInterop.dll"
+#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
+#r "../src/RProvider/bin/Release/net7.0/RDotNet.FSharp.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
 (*** condition: fsx ***)
 #if FSX
 #r "nuget: RProvider,{{package-version}}"
diff --git a/docs/passing-data.fsx b/docs/passing-data.fsx
index a15dbc6f..00e8c9a1 100644
--- a/docs/passing-data.fsx
+++ b/docs/passing-data.fsx
@@ -8,11 +8,11 @@ index: 3
 
 (*** condition: prepare ***)
 #nowarn "211"
-#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
-#r "../src/RProvider/bin/Release/net5.0/RDotNet.FSharp.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
+#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
+#r "../src/RProvider/bin/Release/net7.0/RDotNet.FSharp.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
 (*** condition: fsx ***)
 #if FSX
 #r "nuget: RProvider,{{package-version}}"
diff --git a/docs/quickstart-charts.fsx b/docs/quickstart-charts.fsx
index 58195e11..c3b3f26c 100644
--- a/docs/quickstart-charts.fsx
+++ b/docs/quickstart-charts.fsx
@@ -8,11 +8,11 @@ index: 3
 
 (*** condition: prepare ***)
 #nowarn "211"
-#r "../src/RProvider/bin/Release/net5.0/DynamicInterop.dll"
-#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
+#r "../src/RProvider/bin/Release/net7.0/DynamicInterop.dll"
+#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
 (*** condition: fsx ***)
 #if FSX
 #r "nuget: RProvider,{{package-version}}"
diff --git a/docs/quickstart-statistics.fsx b/docs/quickstart-statistics.fsx
index 6060ffa5..a770033f 100644
--- a/docs/quickstart-statistics.fsx
+++ b/docs/quickstart-statistics.fsx
@@ -8,11 +8,11 @@ index: 3
 
 (*** condition: prepare ***)
 #nowarn "211"
-#r "../src/RProvider/bin/Release/net5.0/DynamicInterop.dll"
-#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
+#r "../src/RProvider/bin/Release/net7.0/DynamicInterop.dll"
+#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
 #r "RProvider.dll"
 #r "RProvider.DesignTime.dll"
 (*** condition: fsx ***)
diff --git a/docs/reading-rdata.fsx b/docs/reading-rdata.fsx
index 5f7c2b9b..54756c52 100644
--- a/docs/reading-rdata.fsx
+++ b/docs/reading-rdata.fsx
@@ -8,10 +8,10 @@ index: 5
 
 (*** condition: prepare ***)
 #nowarn "211"
-#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
+#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
 (*** condition: fsx ***)
 #if FSX
 #r "nuget: RProvider,{{package-version}}"
@@ -42,7 +42,7 @@ file containing a couple of symbols from the sample `volcano` data set:
     volcanoList <- unlist(as.list(volcano))
     volcanoMean <- mean(volcanoList)
     symbols <- c("volcano", "volcanoList", "volcanoMean")
-    save(list=symols, file="C:/data/sample.rdata")
+    save(list=symbols, file="C:/data/sample.rdata")
 
 To import the data on the F# side, you can use the `RData` type provider that is
 available in the `RProvider` namespace. It takes a static parameter specifying the
@@ -108,4 +108,4 @@ unnecessary fileds.
 
 Once you save the file using the above command, you can re-load it again using
 the `RData` type provider, such as: `new RData<"C:/temp/volcano.rdata">()`.
-*)
\ No newline at end of file
+*)
diff --git a/docs/requirements.fsx b/docs/requirements.fsx
index 1919887f..44a2f854 100644
--- a/docs/requirements.fsx
+++ b/docs/requirements.fsx
@@ -8,10 +8,10 @@ index: 1
 
 (*** condition: prepare ***)
 #nowarn "211"
-#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
+#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
 (*** condition: fsx ***)
 #if FSX
 #r "nuget: RProvider,{{package-version}}"
diff --git a/docs/tutorial.fsx b/docs/tutorial.fsx
index 867d6b4b..413fa353 100644
--- a/docs/tutorial.fsx
+++ b/docs/tutorial.fsx
@@ -8,10 +8,10 @@ index: 1
 
 (*** condition: prepare ***)
 #nowarn "211"
-#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
-#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
+#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
+#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
 (*** condition: fsx ***)
 #if FSX
 #r "nuget: RProvider,{{package-version}}"
diff --git a/paket.dependencies b/paket.dependencies
index 8c37d99b..25becda5 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -1,6 +1,6 @@
 version 5.257.0
 source https://www.nuget.org/api/v2
-frameworks: netstandard2.0, net5.0
+frameworks: netstandard2.1, net7.0
 storage: none
 
 nuget FSharp.Data
@@ -9,7 +9,7 @@ nuget FsCheck 2.16.3
 nuget FsCheck.Xunit 2.16.3
 nuget xunit 2.4.1
 nuget xunit.runner.visualstudio 2.4.3
-nuget FSharp.Core 4.6.2
+nuget FSharp.Core 7.0.0
 nuget Microsoft.NET.Test.Sdk 16.11.0
 nuget ILRepack.MSBuild.Task 2.0.13
 nuget PipeMethodCalls 3.0.4
@@ -21,4 +21,4 @@ nuget System.ComponentModel.Composition 5.0.0
 nuget System.Reflection.MetadataLoadContext 5.0.0
 
 github fsprojects/FSharp.TypeProviders.SDK:f4aca36af04aa84b16ec04df6f6bf55ac2f17a73 src/ProvidedTypes.fsi
-github fsprojects/FSharp.TypeProviders.SDK:f4aca36af04aa84b16ec04df6f6bf55ac2f17a73 src/ProvidedTypes.fs
+github fsprojects/FSharp.TypeProviders.SDK:f4aca36af04aa84b16ec04df6f6bf55ac2f17a73 src/ProvidedTypes.fs
\ No newline at end of file
diff --git a/paket.lock b/paket.lock
index efe80028..31974ce7 100644
--- a/paket.lock
+++ b/paket.lock
@@ -1,5 +1,5 @@
 STORAGE: NONE
-RESTRICTION: || (== net5.0) (== netstandard2.0)
+RESTRICTION: || (== net7.0) (== netstandard2.1)
 NUGET
   remote: https://www.nuget.org/api/v2
     DynamicInterop (0.9.1)
@@ -8,76 +8,74 @@ NUGET
     FsCheck.Xunit (2.16.3)
       FsCheck (2.16.3)
       xunit.extensibility.execution (>= 2.2 < 3.0)
-    FSharp.Compiler.Service (37.0)
-      FSharp.Core (>= 4.6.2)
-      Microsoft.Build.Framework (>= 16.6)
-      Microsoft.Build.Tasks.Core (>= 16.6)
-      Microsoft.Build.Utilities.Core (>= 16.6)
-      System.Buffers (>= 4.5)
-      System.Collections.Immutable (>= 1.5)
-      System.Memory (>= 4.5.3)
-      System.Reflection.Emit (>= 4.3)
-      System.Reflection.Metadata (>= 1.6)
-      System.Reflection.TypeExtensions (>= 4.3)
-      System.Runtime.Loader (>= 4.0)
-    FSharp.Core (4.6.2)
-    FSharp.Data (3.3.3)
-      FSharp.Core (>= 4.3.4)
-    FSharp.Formatting (7.2.9)
-      FSharp.Compiler.Service (>= 36.0.3)
+    FSharp.Compiler.Service (42.7.101)
+      FSharp.Core (7.0)
+      Microsoft.Build.Framework (>= 17.4)
+      Microsoft.Build.Tasks.Core (>= 17.4)
+      Microsoft.Build.Utilities.Core (>= 17.4)
+      System.Buffers (>= 4.5.1)
+      System.Collections.Immutable (>= 6.0)
+      System.Memory (>= 4.5.5)
+      System.Reflection.Emit (>= 4.7)
+      System.Reflection.Metadata (>= 6.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+    FSharp.Core (7.0)
+    FSharp.Data (5.0.2)
+      FSharp.Core (>= 5.0.1)
+    FSharp.Formatting (17.4.1)
+      FSharp.Compiler.Service (42.7.101)
     ILRepack.MSBuild.Task (2.0.13)
       Microsoft.Build.Framework (>= 15.9.20)
       Microsoft.Build.Utilities.Core (>= 15.9.20)
-    Microsoft.Build.Framework (16.11)
-      System.Security.Permissions (>= 4.7)
-    Microsoft.Build.Tasks.Core (16.11)
-      Microsoft.Build.Framework (>= 16.11)
-      Microsoft.Build.Utilities.Core (>= 16.11)
-      Microsoft.NET.StringTools (>= 1.0)
-      Microsoft.Win32.Registry (>= 4.3)
-      System.CodeDom (>= 4.4)
-      System.Collections.Immutable (>= 5.0)
-      System.Reflection.Metadata (>= 1.6)
-      System.Resources.Extensions (>= 4.6)
-      System.Security.Cryptography.Pkcs (>= 4.7)
-      System.Security.Cryptography.Xml (>= 4.7)
-      System.Security.Permissions (>= 4.7)
-      System.Threading.Tasks.Dataflow (>= 4.9)
-    Microsoft.Build.Utilities.Core (16.11)
-      Microsoft.Build.Framework (>= 16.11)
-      Microsoft.NET.StringTools (>= 1.0)
-      Microsoft.Win32.Registry (>= 4.3)
-      System.Collections.Immutable (>= 5.0)
-      System.Configuration.ConfigurationManager (>= 4.7)
-      System.Security.Permissions (>= 4.7)
-      System.Text.Encoding.CodePages (>= 4.0.1)
-    Microsoft.CodeCoverage (16.11) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net45)) (&& (== netstandard2.0) (>= netcoreapp1.0))
+    Microsoft.Build.Framework (17.5)
+      Microsoft.Win32.Registry (>= 5.0) - restriction: == netstandard2.1
+      System.Security.Permissions (>= 6.0)
+    Microsoft.Build.Tasks.Core (17.5)
+      Microsoft.Build.Framework (>= 17.5)
+      Microsoft.Build.Utilities.Core (>= 17.5)
+      Microsoft.NET.StringTools (>= 17.5)
+      Microsoft.Win32.Registry (>= 5.0) - restriction: == netstandard2.1
+      System.CodeDom (>= 6.0)
+      System.Collections.Immutable (>= 6.0)
+      System.Reflection.Metadata (>= 6.0)
+      System.Resources.Extensions (>= 6.0)
+      System.Security.Cryptography.Pkcs (>= 6.0.1)
+      System.Security.Cryptography.Xml (>= 6.0.1)
+      System.Security.Permissions (>= 6.0)
+      System.Threading.Tasks.Dataflow (>= 6.0)
+    Microsoft.Build.Utilities.Core (17.5)
+      Microsoft.Build.Framework (>= 17.5)
+      Microsoft.NET.StringTools (>= 17.5)
+      Microsoft.Win32.Registry (>= 5.0) - restriction: == netstandard2.1
+      System.Collections.Immutable (>= 6.0)
+      System.Configuration.ConfigurationManager (>= 6.0)
+      System.Security.Permissions (>= 6.0) - restriction: == netstandard2.1
+      System.Text.Encoding.CodePages (>= 6.0) - restriction: == netstandard2.1
+    Microsoft.CodeCoverage (17.5) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net45)) (&& (== netstandard2.1) (>= netcoreapp1.0))
     Microsoft.CSharp (4.7)
-    Microsoft.NET.StringTools (1.0)
-      System.Memory (>= 4.5.4)
-      System.Runtime.CompilerServices.Unsafe (>= 5.0)
+    Microsoft.NET.StringTools (17.5)
+      System.Memory (>= 4.5.5) - restriction: || (&& (== net7.0) (>= net472)) (== netstandard2.1)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net7.0) (>= net472)) (== netstandard2.1)
     Microsoft.NET.Test.Sdk (16.11)
-      Microsoft.CodeCoverage (>= 16.11) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net45)) (&& (== netstandard2.0) (>= netcoreapp1.0))
-      Microsoft.TestPlatform.TestHost (>= 16.11) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp1.0))
-    Microsoft.NETCore.Platforms (5.0.3)
-    Microsoft.NETCore.Targets (5.0)
-    Microsoft.TestPlatform.ObjectModel (16.11) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp1.0))
-      NuGet.Frameworks (>= 5.0)
+      Microsoft.CodeCoverage (>= 16.11) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net45)) (&& (== netstandard2.1) (>= netcoreapp1.0))
+      Microsoft.TestPlatform.TestHost (>= 16.11) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp1.0))
+    Microsoft.NETCore.Platforms (7.0.1)
+    Microsoft.TestPlatform.ObjectModel (17.5) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1))
+      NuGet.Frameworks (>= 5.11)
       System.Reflection.Metadata (>= 1.6)
-    Microsoft.TestPlatform.TestHost (16.11) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp1.0))
-      Microsoft.TestPlatform.ObjectModel (>= 16.11) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= uap10.0))
-      Newtonsoft.Json (>= 9.0.1) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= uap10.0))
+    Microsoft.TestPlatform.TestHost (17.5) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp1.0))
+      Microsoft.TestPlatform.ObjectModel (>= 17.5) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1))
+      Newtonsoft.Json (>= 13.0.1) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1))
     Microsoft.Win32.Registry (5.0)
-      System.Buffers (>= 4.5.1) - restriction: || (&& (== net5.0) (>= monoandroid) (< netstandard1.3)) (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (>= xamarinios)) (&& (== net5.0) (>= xamarinmac)) (&& (== net5.0) (>= xamarintvos)) (&& (== net5.0) (>= xamarinwatchos)) (== netstandard2.0)
-      System.Memory (>= 4.5.4) - restriction: || (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
+      System.Buffers (>= 4.5.1) - restriction: || (&& (== net7.0) (>= monoandroid) (< netstandard1.3)) (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (>= xamarinios)) (&& (== net7.0) (>= xamarinmac)) (&& (== net7.0) (>= xamarintvos)) (&& (== net7.0) (>= xamarinwatchos)) (== netstandard2.1)
+      System.Memory (>= 4.5.4) - restriction: || (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (>= uap10.1)) (== netstandard2.1)
       System.Security.AccessControl (>= 5.0)
       System.Security.Principal.Windows (>= 5.0)
-    Microsoft.Win32.SystemEvents (5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
-      Microsoft.NETCore.Platforms (>= 5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp2.0))
+    Microsoft.Win32.SystemEvents (7.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0))
     NETStandard.Library (2.0.3)
       Microsoft.NETCore.Platforms (>= 1.1)
     Newtonsoft.Json (13.0.1)
-    NuGet.Frameworks (5.11) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= netcoreapp2.1))
+    NuGet.Frameworks (6.5) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1))
     PipeMethodCalls (3.0.4)
     R.NET (1.9)
       DynamicInterop (>= 0.9.1)
@@ -88,99 +86,65 @@ NUGET
       FSharp.Core (>= 4.6.2)
       R.NET (>= 1.9)
     System.Buffers (4.5.1)
-    System.CodeDom (5.0)
-    System.Collections.Immutable (5.0)
-      System.Memory (>= 4.5.4) - restriction: || (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
+    System.CodeDom (7.0)
+    System.Collections.Immutable (7.0)
+      System.Memory (>= 4.5.5) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.1)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.1)
     System.ComponentModel.Composition (5.0)
-    System.Configuration.ConfigurationManager (5.0)
-      System.Security.Cryptography.ProtectedData (>= 5.0)
-      System.Security.Permissions (>= 5.0)
-    System.Drawing.Common (5.0.2) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
-      Microsoft.Win32.SystemEvents (>= 5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp2.0)) (&& (== netstandard2.0) (>= netcoreapp3.0))
-    System.Formats.Asn1 (5.0)
-      System.Buffers (>= 4.5.1) - restriction: || (&& (== net5.0) (>= monoandroid) (< netstandard2.0)) (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (>= xamarinios)) (&& (== net5.0) (>= xamarinmac)) (&& (== net5.0) (>= xamarintvos)) (&& (== net5.0) (>= xamarinwatchos)) (== netstandard2.0)
-      System.Memory (>= 4.5.4) - restriction: || (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
-    System.IO (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-      System.Text.Encoding (>= 4.3)
-      System.Threading.Tasks (>= 4.3)
-    System.Memory (4.5.4)
-      System.Buffers (>= 4.5.1) - restriction: || (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= xamarinios)) (&& (== net5.0) (>= xamarinmac)) (&& (== net5.0) (>= xamarintvos)) (&& (== net5.0) (>= xamarinwatchos)) (== netstandard2.0)
-      System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net5.0) (< netcoreapp2.0)) (== netstandard2.0)
-      System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= uap10.1)) (&& (== net5.0) (>= xamarinios)) (&& (== net5.0) (>= xamarinmac)) (&& (== net5.0) (>= xamarintvos)) (&& (== net5.0) (>= xamarinwatchos)) (== netstandard2.0)
-    System.Numerics.Vectors (4.5) - restriction: || (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (== netstandard2.0)
-    System.Reflection (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.IO (>= 4.3)
-      System.Reflection.Primitives (>= 4.3)
-      System.Runtime (>= 4.3)
+    System.Configuration.ConfigurationManager (7.0)
+      System.Diagnostics.EventLog (>= 7.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net7.0))
+      System.Security.Cryptography.ProtectedData (>= 7.0)
+      System.Security.Permissions (>= 7.0)
+    System.Diagnostics.EventLog (7.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net7.0))
+    System.Drawing.Common (7.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0))
+      Microsoft.Win32.SystemEvents (>= 7.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0))
+    System.Formats.Asn1 (7.0)
+      System.Buffers (>= 4.5.1) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.1)
+      System.Memory (>= 4.5.5) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.1)
+    System.Memory (4.5.5)
+      System.Buffers (>= 4.5.1) - restriction: || (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netstandard1.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= xamarinios)) (&& (== net7.0) (>= xamarinmac)) (&& (== net7.0) (>= xamarintvos)) (&& (== net7.0) (>= xamarinwatchos)) (== netstandard2.1)
+      System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net7.0) (< netcoreapp2.0)) (== netstandard2.1)
+      System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (< netstandard1.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= uap10.1)) (&& (== net7.0) (>= xamarinios)) (&& (== net7.0) (>= xamarinmac)) (&& (== net7.0) (>= xamarintvos)) (&& (== net7.0) (>= xamarinwatchos)) (== netstandard2.1)
+    System.Numerics.Vectors (4.5) - restriction: || (&& (== net7.0) (< netcoreapp2.0)) (== netstandard2.1)
     System.Reflection.Emit (4.7)
-      System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net5.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
-    System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (== net5.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
-    System.Reflection.Metadata (5.0)
-      System.Collections.Immutable (>= 5.0) - restriction: || (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) (== netstandard2.0)
+    System.Reflection.Metadata (7.0.1)
+      System.Collections.Immutable (>= 7.0)
+      System.Memory (>= 4.5.5) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.1)
     System.Reflection.MetadataLoadContext (5.0)
-      System.Collections.Immutable (>= 5.0) - restriction: || (&& (== net5.0) (>= monoandroid) (< netstandard2.0)) (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (< netcoreapp3.0)) (&& (== net5.0) (>= xamarinios)) (&& (== net5.0) (>= xamarinmac)) (&& (== net5.0) (>= xamarintvos)) (&& (== net5.0) (>= xamarinwatchos)) (== netstandard2.0)
-      System.Memory (>= 4.5.4) - restriction: || (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.1)) (== netstandard2.0)
-      System.Reflection.Metadata (>= 5.0) - restriction: || (&& (== net5.0) (>= monoandroid) (< netstandard2.0)) (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (< netcoreapp3.0)) (&& (== net5.0) (>= xamarinios)) (&& (== net5.0) (>= xamarinmac)) (&& (== net5.0) (>= xamarintvos)) (&& (== net5.0) (>= xamarinwatchos)) (== netstandard2.0)
-    System.Reflection.Primitives (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-    System.Reflection.TypeExtensions (4.7)
-    System.Resources.Extensions (5.0)
-      System.Memory (>= 4.5.4) - restriction: || (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.1)) (== netstandard2.0)
-    System.Runtime (4.3.1)
-      Microsoft.NETCore.Platforms (>= 1.1.1)
-      Microsoft.NETCore.Targets (>= 1.1.3)
-    System.Runtime.CompilerServices.Unsafe (5.0)
-    System.Runtime.Loader (4.3)
-      System.IO (>= 4.3)
-      System.Reflection (>= 4.3)
-      System.Runtime (>= 4.3)
-    System.Security.AccessControl (5.0)
-      Microsoft.NETCore.Platforms (>= 5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp2.0))
-      System.Security.Principal.Windows (>= 5.0)
-    System.Security.Cryptography.Cng (5.0)
-      System.Formats.Asn1 (>= 5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
-    System.Security.Cryptography.Pkcs (5.0.1)
-      System.Buffers (>= 4.5.1) - restriction: || (&& (== net5.0) (< netcoreapp2.0) (< netstandard2.1)) (== netstandard2.0)
-      System.Formats.Asn1 (>= 5.0)
-      System.Memory (>= 4.5.4) - restriction: || (&& (== net5.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net5.0) (< netcoreapp2.1) (< netstandard2.1)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
-      System.Security.Cryptography.Cng (>= 5.0)
-    System.Security.Cryptography.ProtectedData (5.0)
-      System.Memory (>= 4.5.4) - restriction: || (&& (== net5.0) (< netcoreapp2.1)) (== netstandard2.0)
-    System.Security.Cryptography.Xml (5.0)
-      System.Memory (>= 4.5.4) - restriction: || (&& (== net5.0) (< netcoreapp2.1)) (== netstandard2.0)
-      System.Security.Cryptography.Pkcs (>= 5.0)
-      System.Security.Permissions (>= 5.0)
-    System.Security.Permissions (5.0)
-      System.Security.AccessControl (>= 5.0)
-      System.Windows.Extensions (>= 5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
+      System.Collections.Immutable (>= 5.0) - restriction: || (&& (== net7.0) (>= monoandroid) (< netstandard2.0)) (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (< netcoreapp3.0)) (&& (== net7.0) (>= xamarinios)) (&& (== net7.0) (>= xamarinmac)) (&& (== net7.0) (>= xamarintvos)) (&& (== net7.0) (>= xamarinwatchos)) (== netstandard2.1)
+      System.Memory (>= 4.5.4) - restriction: || (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.1)) (== netstandard2.1)
+      System.Reflection.Metadata (>= 5.0) - restriction: || (&& (== net7.0) (>= monoandroid) (< netstandard2.0)) (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (< netcoreapp3.0)) (&& (== net7.0) (>= xamarinios)) (&& (== net7.0) (>= xamarinmac)) (&& (== net7.0) (>= xamarintvos)) (&& (== net7.0) (>= xamarinwatchos)) (== netstandard2.1)
+    System.Resources.Extensions (7.0)
+      System.Memory (>= 4.5.5) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.1)
+    System.Runtime.CompilerServices.Unsafe (6.0)
+    System.Security.AccessControl (6.0)
+      System.Security.Principal.Windows (>= 5.0) - restriction: || (&& (== net7.0) (>= net461)) (&& (== net7.0) (< net6.0)) (== netstandard2.1)
+    System.Security.Cryptography.Cng (5.0) - restriction: || (&& (== net7.0) (< net6.0)) (&& (== net7.0) (< netstandard2.1)) (== netstandard2.1)
+    System.Security.Cryptography.Pkcs (7.0.1)
+      System.Formats.Asn1 (>= 7.0)
+      System.Security.Cryptography.Cng (>= 5.0) - restriction: || (&& (== net7.0) (< net6.0)) (&& (== net7.0) (< netstandard2.1)) (== netstandard2.1)
+    System.Security.Cryptography.ProtectedData (7.0.1)
+      System.Memory (>= 4.5.5) - restriction: || (&& (== net7.0) (< net6.0)) (== netstandard2.1)
+    System.Security.Cryptography.Xml (7.0.1)
+      System.Memory (>= 4.5.5) - restriction: || (&& (== net7.0) (< net6.0)) (== netstandard2.1)
+      System.Security.AccessControl (>= 6.0) - restriction: || (&& (== net7.0) (< net6.0)) (== netstandard2.1)
+      System.Security.Cryptography.Pkcs (>= 7.0)
+    System.Security.Permissions (7.0)
+      System.Security.AccessControl (>= 6.0) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.1)
+      System.Windows.Extensions (>= 7.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0))
     System.Security.Principal.Windows (5.0)
-    System.Text.Encoding (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-    System.Text.Encoding.CodePages (5.0)
-      Microsoft.NETCore.Platforms (>= 5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0)) (&& (== netstandard2.0) (>= netcoreapp2.0))
-      System.Runtime.CompilerServices.Unsafe (>= 5.0) - restriction: || (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (== netstandard2.0)
-    System.Threading.Tasks (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-    System.Threading.Tasks.Dataflow (5.0)
-    System.Windows.Extensions (5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
-      System.Drawing.Common (>= 5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
+    System.Text.Encoding.CodePages (7.0) - restriction: == netstandard2.1
+      System.Memory (>= 4.5.5) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.1)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.1)
+    System.Threading.Tasks.Dataflow (7.0)
+    System.Windows.Extensions (7.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0))
+      System.Drawing.Common (>= 7.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0))
     xunit (2.4.1)
       xunit.analyzers (>= 0.10)
       xunit.assert (2.4.1)
       xunit.core (2.4.1)
     xunit.abstractions (2.0.3)
-    xunit.analyzers (0.10)
+    xunit.analyzers (1.1)
     xunit.assert (2.4.1)
       NETStandard.Library (>= 1.6.1)
     xunit.core (2.4.1)
diff --git a/samples/stocks.fsx b/samples/stocks.fsx
index 512b4f43..b5e553e5 100644
--- a/samples/stocks.fsx
+++ b/samples/stocks.fsx
@@ -1,4 +1,4 @@
-#I "../src/RProvider/bin/Release/net5.0/"
+#I "../src/RProvider/bin/Release/net7.0/"
 #r "RDotNet.dll"
 #r "RProvider.DesignTime.dll"
 #r "RProvider.Runtime.dll"
diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs
index e437c21c..f4083e08 100644
--- a/src/Common/AssemblyInfo.fs
+++ b/src/Common/AssemblyInfo.fs
@@ -6,7 +6,7 @@ open System.Reflection
 [<assembly: AssemblyCompanyAttribute("BlueMountain Capital, FsLab")>]
 [<assembly: AssemblyProductAttribute("RProvider")>]
 [<assembly: AssemblyDescriptionAttribute("An F# Type Provider providing strongly typed access to the R statistical package.")>]
-[<assembly: AssemblyVersionAttribute("2.0.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.0.3")>]
+[<assembly: AssemblyVersionAttribute("2.1.0")>]
+[<assembly: AssemblyFileVersionAttribute("2.1.0")>]
 do ()
 
diff --git a/src/RProvider.DesignTime/RProvider.DesignTime.fsproj b/src/RProvider.DesignTime/RProvider.DesignTime.fsproj
index 734a7063..5e04e3b4 100644
--- a/src/RProvider.DesignTime/RProvider.DesignTime.fsproj
+++ b/src/RProvider.DesignTime/RProvider.DesignTime.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/src/RProvider.Runtime/RInterop.fs b/src/RProvider.Runtime/RInterop.fs
index dbbcee49..0b85561d 100644
--- a/src/RProvider.Runtime/RInterop.fs
+++ b/src/RProvider.Runtime/RInterop.fs
@@ -569,7 +569,6 @@ module RInterop =
                         [ for arg in v.Split([| "c("; ", "; ")" |], StringSplitOptions.RemoveEmptyEntries) do
                               yield arg.Substring(1, arg.Length - 2) ]
                     | v -> List.ofArray [| v |]
-                    | null -> []
 
                 let hasVarArgs = argList |> List.exists (fun p -> p = "...")
                 RValue.Function(argList, hasVarArgs)
diff --git a/src/RProvider.Runtime/RProvider.Runtime.fsproj b/src/RProvider.Runtime/RProvider.Runtime.fsproj
index 688fdc0a..0926d4dc 100644
--- a/src/RProvider.Runtime/RProvider.Runtime.fsproj
+++ b/src/RProvider.Runtime/RProvider.Runtime.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/RProvider.Server/RProvider.Server.fsproj b/src/RProvider.Server/RProvider.Server.fsproj
index af60fa01..b578acf4 100644
--- a/src/RProvider.Server/RProvider.Server.fsproj
+++ b/src/RProvider.Server/RProvider.Server.fsproj
@@ -2,8 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework Condition="'$(RuntimeIdentifier)'=='osx-arm64'">net6.0</TargetFramework>
-    <TargetFramework Condition="'$(RuntimeIdentifier)'!='osx-arm64'">net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
+    <!-- <TargetFramework Condition="'$(RuntimeIdentifier)'=='osx-arm64'">net6.0</TargetFramework> -->
+    <!-- <TargetFramework Condition="'$(RuntimeIdentifier)'!='osx-arm64'">net5.0</TargetFramework> -->
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <PublishSingleFile>true</PublishSingleFile>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
diff --git a/src/RProvider/RProvider.Runtime.dll.config b/src/RProvider/RProvider.Runtime.dll.config
index 9345f827..ed138b5b 100644
--- a/src/RProvider/RProvider.Runtime.dll.config
+++ b/src/RProvider/RProvider.Runtime.dll.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <appSettings>
-    <add key="ProbingLocations" value="../../../../*/*/lib/netstandard1.2;../../../../*/*/lib/netstandard2.0;../../../../*/*/lib/netstandard2.1;../../../../*/*/lib/net5.0" />
+    <add key="ProbingLocations" value="../../../../*/*/lib/netstandard1.2;../../../../*/*/lib/netstandard2.0;../../../../*/*/lib/netstandard2.1;../../../../*/*/lib/net7.0" />
   </appSettings>
 </configuration>
diff --git a/src/RProvider/RProvider.dll.config b/src/RProvider/RProvider.dll.config
index 9345f827..ed138b5b 100644
--- a/src/RProvider/RProvider.dll.config
+++ b/src/RProvider/RProvider.dll.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <appSettings>
-    <add key="ProbingLocations" value="../../../../*/*/lib/netstandard1.2;../../../../*/*/lib/netstandard2.0;../../../../*/*/lib/netstandard2.1;../../../../*/*/lib/net5.0" />
+    <add key="ProbingLocations" value="../../../../*/*/lib/netstandard1.2;../../../../*/*/lib/netstandard2.0;../../../../*/*/lib/netstandard2.1;../../../../*/*/lib/net7.0" />
   </appSettings>
 </configuration>
diff --git a/src/RProvider/RProvider.fsproj b/src/RProvider/RProvider.fsproj
index 8d5bbc75..64fbd4d1 100644
--- a/src/RProvider/RProvider.fsproj
+++ b/src/RProvider/RProvider.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
@@ -18,10 +18,10 @@
     <None Include="../../docs/img/logo.png" Pack="true" PackagePath="/">
         <PackageCopyToOutput>true</PackageCopyToOutput>
     </None>
-    <None Include="bin/Release/net5.0/server/**" Pack="true" PackagePath="/lib/net5.0/server/">
+    <None Include="bin/Release/net7.0/server/**" Pack="true" PackagePath="/lib/net7.0/server/">
         <PackageCopyToOutput>true</PackageCopyToOutput>
     </None>
-    <None Include="RProvider.Runtime.dll.config" Pack="true" PackagePath="/lib/net5.0/">
+    <None Include="RProvider.Runtime.dll.config" Pack="true" PackagePath="/lib/net7.0/">
         <PackageCopyToOutput>true</PackageCopyToOutput>
     </None>
   </ItemGroup>
diff --git a/src/RWrapperGenerator/RWrapperGenerator.fsproj b/src/RWrapperGenerator/RWrapperGenerator.fsproj
index 1c806392..f56afb38 100644
--- a/src/RWrapperGenerator/RWrapperGenerator.fsproj
+++ b/src/RWrapperGenerator/RWrapperGenerator.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>
   <ItemGroup>
@@ -17,11 +17,5 @@
   <ItemGroup>
     <Project Include="../RProvider/RProvider.Runtime.fsproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="R.NET" Version="1.9.0" />
-    <PackageReference Include="R.NET.FSharp" Version="1.9.0" />
-    <PackageReference Include="System.ComponentModel.Composition" Version="5.0.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
-  </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/RWrapperGenerator/paket.references b/src/RWrapperGenerator/paket.references
index 827e3179..5d774961 100644
--- a/src/RWrapperGenerator/paket.references
+++ b/src/RWrapperGenerator/paket.references
@@ -1,3 +1,4 @@
 R.NET
 R.NET.FSharp
-System.ComponentModel.Composition
\ No newline at end of file
+System.ComponentModel.Composition
+System.Configuration.ConfigurationManager
\ No newline at end of file
diff --git a/tests/Test.RProvider/Test.RProvider.fsproj b/tests/Test.RProvider/Test.RProvider.fsproj
index c1afb6e6..bf09b6a7 100644
--- a/tests/Test.RProvider/Test.RProvider.fsproj
+++ b/tests/Test.RProvider/Test.RProvider.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>