Upgrade language server to .NET 5.0

tintoy/msbuild-project-tools-server#22
tintoy · Jan 29, 2021 · e942cbb · e942cbb
1 parent bab4dfe
commit e942cbb
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git 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 netcoreapp3.1 -o "$publishRoot\language-server" /p:VersionPrefix="$VersionPrefix" /p:VersionSuffix="$($VersionSuffix)"
-& $dotnet publish "$serverRoot\src\LanguageServer.TaskReflection\LanguageServer.TaskReflection.csproj" -f netcoreapp3.1 -o "$publishRoot\task-reflection" /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)"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * Remove legacy ("classic") completion provider.
 * Fix MSBuild-dependent tests that break in CI when the 5.0 SDK is also installed (tintoy/msbuild-project-tools-server#20).
+* Upgrade language server to target .NET 5.0 (tintoy/msbuild-project-tools-server#22).
 
 ## 0.3.11
 

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ An extension for VS Code that provides intellisense for MSBuild project files, i
 
 The language service used by this extension can be found here: [tintoy/msbuild-project-tools-server](https://github.com/tintoy/msbuild-project-tools-server/)
 
-**Note**: You will need the .NET Core **runtime v3.1.3 (or SDK v3.1.1xx) or newer** installed to use the language service (but your projects can target any version you have installed).
+**Note**: You will need the .NET Core **runtime v5.0.2 (or SDK v5.0.102) or newer** installed to use the language service (but your projects can target any version you have installed).
 
 ## Usage
 

diff --git 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 netcoreapp3.1 -o "$PublishRoot/language-server" /p:VersionPrefix="$VersionPrefix" /p:VersionSuffix="$VersionSuffix"
-dotnet publish "$ServerRoot/src/LanguageServer.TaskReflection/LanguageServer.TaskReflection.csproj" -f netcoreapp3.1 -o "$PublishRoot/task-reflection" /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"
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
@@ -11,8 +11,8 @@ To build:
 
 1. `npm install`
 2. `dotnet restore`
-3. `dotnet publish lib/server/src/LanguageServer/LanguageServer.csproj -f netcoreapp3.1 -o $PWD/out/language-server`
-3. `dotnet publish lib/server/src/LanguageServer.TaskReflection/LanguageServer.TaskReflection.csproj -f netcoreapp3.1 -o $PWD/out/task-reflection`
+3. `dotnet publish lib/server/src/LanguageServer/LanguageServer.csproj -f net5.0 -o $PWD/out/language-server`
+3. `dotnet publish lib/server/src/LanguageServer.TaskReflection/LanguageServer.TaskReflection.csproj -f net5.0 -o $PWD/out/task-reflection`
 
 To debug:
 

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.1.201"
+    "version": "5.0.102"
   }
 }
diff --git a/lib/server b/lib/server
diff --git a/package-lock.json b/package-lock.json
diff --git 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.11",
+    "version": "0.3.12",
     "settingsSchemaVersion": 1,
     "publisher": "tintoy",
     "license": "MIT",
+3 −3		.appveyor.yml
+2 −2		.vscode/launch.json
+1 −0		CHANGELOG.md
+1 −1		README.md
+2 −2		build.ps1
+2 −2		build.sh
+2 −2		docs/BUILDING.md
+1 −1		global.json
+1 −1		src/LanguageServer.Common/LanguageServer.Common.csproj
+0 −79		src/LanguageServer.Common/Position.cs
+0 −64		src/LanguageServer.Common/Range.cs
+0 −12		src/LanguageServer.Common/Utilities/TextPositions.cs
+0 −3		src/LanguageServer.Engine/CompletionProviders/CommentCompletion.cs
+0 −3		src/LanguageServer.Engine/CompletionProviders/ItemElementCompletion.cs
+0 −3		src/LanguageServer.Engine/CompletionProviders/ItemGroupExpressionCompletion.cs
+0 −3		src/LanguageServer.Engine/CompletionProviders/ItemMetadataExpressionCompletion.cs
+1 −4		src/LanguageServer.Engine/CompletionProviders/PropertyElementCompletion.cs
+0 −3		src/LanguageServer.Engine/CompletionProviders/PropertyExpressionCompletion.cs
+0 −3		src/LanguageServer.Engine/CompletionProviders/TargetNameCompletion.cs
+0 −3		src/LanguageServer.Engine/CompletionProviders/TaskElementCompletion.cs
+0 −3		src/LanguageServer.Engine/CompletionProviders/TaskParameterCompletion.cs
+0 −3		src/LanguageServer.Engine/CompletionProviders/TopLevelElementCompletion.cs
+0 −9		src/LanguageServer.Engine/Documents/ProjectDocument.cs
+1 −1		src/LanguageServer.Engine/LanguageServer.Engine.csproj
+0 −12		src/LanguageServer.Engine/Utilities/ModelConversions.cs
+1 −1		src/LanguageServer.SemanticModel.MSBuild/LanguageServer.SemanticModel.MSBuild.csproj
+0 −3		src/LanguageServer.SemanticModel.MSBuild/MSBuildObject.cs
+0 −3		src/LanguageServer.SemanticModel.MSBuild/MSBuildObjectLocator.cs
+1 −1		src/LanguageServer.SemanticModel.Xml/LanguageServer.SemanticModel.Xml.csproj
+0 −6		src/LanguageServer.SemanticModel.Xml/XSAttribute.cs
+0 −6		src/LanguageServer.SemanticModel.Xml/XSElement.cs
+0 −9		src/LanguageServer.SemanticModel.Xml/XSElementWithContent.cs
+0 −6		src/LanguageServer.SemanticModel.Xml/XSNode.cs
+0 −3		src/LanguageServer.SemanticModel.Xml/XmlLocation.cs
+0 −6		src/LanguageServer.SemanticModel.Xml/XmlLocator.cs
+0 −9		src/LanguageServer.SemanticModel.Xml/XmlSyntaxHelper.cs
+1 −1		src/LanguageServer.TaskReflection/LanguageServer.TaskReflection.csproj
+0 −16		src/LanguageServer/App.config
+1 −1		src/LanguageServer/LanguageServer.csproj
+0 −16		test/LanguageServer.Engine.Tests/App.config
+1 −1		test/LanguageServer.Engine.Tests/ExpressionTests/LocatorExpressionTests.cs
+1 −1		test/LanguageServer.Engine.Tests/LanguageServer.Engine.Tests.csproj
+2 −2		test/LanguageServer.Engine.Tests/MSBuildEngineFixture.cs
+1 −1		test/LanguageServer.Engine.Tests/MSBuildTests.cs
+2 −2		test/LanguageServer.Engine.Tests/TaskScannerTests.cs
+1 −1		test/LanguageServer.Engine.Tests/XSParserTests.cs
+1 −1		test/LanguageServer.Engine.Tests/XmlLocatorTests.cs