diff --git a/Build-LanguageServer.ps1 b/Build-LanguageServer.ps1
index 8237ba9..7133920 100644
--- a/Build-LanguageServer.ps1
+++ b/Build-LanguageServer.ps1
@@ -12,5 +12,5 @@ $serverRoot = Join-Path $PSScriptRoot 'lib\server'
 $publishRoot = Join-Path $PSScriptRoot 'out'
 
 & $dotnet restore "$serverRoot\MSBuildProjectTools.sln" /p:VersionPrefix="$VersionPrefix" /p:VersionSuffix="$($VersionSuffix)"
-& $dotnet publish "$serverRoot\src\LanguageServer\LanguageServer.csproj" -f net5.0 -o "$publishRoot\language-server" /p:VersionPrefix="$VersionPrefix" /p:VersionSuffix="$($VersionSuffix)"
-& $dotnet publish "$serverRoot\src\LanguageServer.TaskReflection\LanguageServer.TaskReflection.csproj" -f net5.0 -o "$publishRoot\task-reflection" /p:VersionPrefix="$VersionPrefix" /p:VersionSuffix="$($VersionSuffix)"
+& $dotnet publish "$serverRoot\src\LanguageServer\LanguageServer.csproj" -f net6.0 -o "$publishRoot\language-server" /p:VersionPrefix="$VersionPrefix" /p:VersionSuffix="$($VersionSuffix)"
+& $dotnet publish "$serverRoot\src\LanguageServer.TaskReflection\LanguageServer.TaskReflection.csproj" -f net6.0 -o "$publishRoot\task-reflection" /p:VersionPrefix="$VersionPrefix" /p:VersionSuffix="$($VersionSuffix)"
diff --git a/build-language-server.sh b/build-language-server.sh
index 133ad15..9f8a834 100644
--- a/build-language-server.sh
+++ b/build-language-server.sh
@@ -15,5 +15,5 @@ ServerRoot="$PWD/lib/server"
 PublishRoot="$PWD/out"
 
 dotnet restore "$ServerRoot/MSBuildProjectTools.sln" /p:VersionPrefix="$VersionPrefix" /p:VersionSuffix="$VersionSuffix"
-dotnet publish "$ServerRoot/src/LanguageServer/LanguageServer.csproj" -f net5.0 -o "$PublishRoot/language-server" /p:VersionPrefix="$VersionPrefix" /p:VersionSuffix="$VersionSuffix"
-dotnet publish "$ServerRoot/src/LanguageServer.TaskReflection/LanguageServer.TaskReflection.csproj" -f net5.0 -o "$PublishRoot/task-reflection" /p:VersionPrefix="$VersionPrefix" /p:VersionSuffix="$VersionSuffix"
+dotnet publish "$ServerRoot/src/LanguageServer/LanguageServer.csproj" -f net6.0 -o "$PublishRoot/language-server" /p:VersionPrefix="$VersionPrefix" /p:VersionSuffix="$VersionSuffix"
+dotnet publish "$ServerRoot/src/LanguageServer.TaskReflection/LanguageServer.TaskReflection.csproj" -f net6.0 -o "$PublishRoot/task-reflection" /p:VersionPrefix="$VersionPrefix" /p:VersionSuffix="$VersionSuffix"
diff --git a/global.json b/global.json
index 12cb7ff..22cea11 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "5.0.102"
+    "version": "6.0.100-preview"
   }
 }
\ No newline at end of file
diff --git a/lib/server b/lib/server
index 9ad6152..d64ab91 160000
--- a/lib/server
+++ b/lib/server
@@ -1 +1 @@
-Subproject commit 9ad61523af4594c81dedcb6e1286b405c35539ca
+Subproject commit d64ab9156009562ed62b712520e0f864bc3972f8
diff --git a/package-lock.json b/package-lock.json
index 96e17e5..543429a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "msbuild-project-tools",
-    "version": "0.3.15",
+    "version": "0.4.0-preview1",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/package.json b/package.json
index 91f2f15..93c543e 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "msbuild-project-tools",
     "displayName": "MSBuild project tools",
     "description": "Tools for working with MSBuild project files (such as auto-complete for package Ids / versions).",
-    "version": "0.3.15",
+    "version": "0.4.0-preview1",
     "settingsSchemaVersion": 1,
     "publisher": "tintoy",
     "license": "MIT",