Merge branch 'master' into update-versions-net5p8

OmniSharp · Jul 31, 2020 · 0b293ae · 0b293ae
2 parents b8c0e77 + 02dba81
commit 0b293ae
Show file tree

Hide file tree

Showing 102 changed files with 3,064 additions and 691 deletions.
diff --git a/.pipelines/artifacts.yml b/.pipelines/artifacts.yml
@@ -1,14 +1,8 @@
 parameters:
   Artifacts: $(Build.ArtifactStagingDirectory)
 steps:
-  - task: PublishBuildArtifacts@1
-    displayName: Publish Logs
-    condition: always()
-    inputs:
-      PathtoPublish: "$(Artifacts)/logs/"
-      ArtifactName: "logs - $(system.phaseName)"
-      ArtifactType: "Container"
-    env:
+  - template: ./logs.yml
+    parameters:
       Artifacts: ${{ parameters.Artifacts }}
   - task: PublishBuildArtifacts@1
     displayName: Publish Packages

diff --git a/.pipelines/init.yml b/.pipelines/init.yml
@@ -4,6 +4,7 @@ parameters:
   DotNetVersion: "3.1.302"
   CakeVersion: "0.32.1"
   NuGetVersion: "4.9.2"
+  MonoVersion: ''
 steps:
   - task: DownloadBuildArtifacts@0
     displayName: "Download GitVersion Variables"
@@ -41,3 +42,16 @@ steps:
       command: custom
       feedsToUse: config
       arguments: install tools/packages.config -ExcludeVersion -OutputDirectory tools
+  - ${{ if ne(parameters.MonoVersion, '') }}:
+    - script: |
+        curl -o mono.pkg https://download.mono-project.com/archive/$MONO_VERSION/macos-10-universal/MonoFramework-MDK-$MONO_VERSION.105.macos10.xamarin.universal.pkg
+        sudo installer -pkg mono.pkg -target /
+        sudo cp -rf /Library/Frameworks/Mono.framework/Versions/$MONO_VERSION/ /Library/Frameworks/Mono.framework/Versions/Current/
+        MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$MONO_VERSION
+        echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;]$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH"
+        echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
+        echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
+      env:
+        MONO_VERSION: ${{ parameters.MonoVersion }}
+      displayName: Use Mono ${{ parameters.MonoVersion }}
+      failOnStderr: false
diff --git a/.pipelines/logs.yml b/.pipelines/logs.yml
@@ -0,0 +1,13 @@
+parameters:
+  Artifacts: $(Build.ArtifactStagingDirectory)
+steps:
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Logs
+    condition: always()
+    continueOnError: true # allow logs to fail...
+    inputs:
+      PathtoPublish: "$(Artifacts)/logs/"
+      ArtifactName: "logs - $(system.phaseName)"
+      ArtifactType: "Container"
+    env:
+      Artifacts: ${{ parameters.Artifacts }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,12 @@
 # Changelog
 All changes to the project will be documented in this file.
 
-## [1.35.5] - Not yet released
+## [1.36.0] - Not yet released
+* Fixed debugging in .NET 5 preview SDKs ([omnisharp-vscode#3459](https://github.com/OmniSharp/omnisharp-vscode/issues/3459), PR: [#1862](https://github.com/OmniSharp/omnisharp-roslyn/pull/1862))
+* Introduced a new `/quickinfo` endpoint to provide a richer set of information compared to `/typeinfo`. Consumers are encouraged to use it as their hover provider ([#1808](https://github.com/OmniSharp/omnisharp-roslyn/issues/1808), PR: [#1860](https://github.com/OmniSharp/omnisharp-roslyn/pull/1860))
+* Fixed return type in LSP completion handler ([#1864](https://github.com/OmniSharp/omnisharp-roslyn/issues/1864), PR: [#1869](https://github.com/OmniSharp/omnisharp-roslyn/pull/1869))
+* Upgraded to the latest version of the csharp-language-server-protocol [#1815](https://github.com/OmniSharp/omnisharp-roslyn/pull/1815)
+* Added support for Roslyn `EmbeddedLanguageCompletionProvider` which enables completions for string literals for `DateTime` and `Regex` ([#1871](https://github.com/OmniSharp/omnisharp-roslyn/pull/1871))
 
 ## [1.35.4] - 2020-07-22
 * Update to Roslyn `3.8.0-1.20357.3` (PR: [#1849](https://github.com/OmniSharp/omnisharp-roslyn/pull/1849))

diff --git a/OmniSharp.sln b/OmniSharp.sln
@@ -69,6 +69,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OmniSharp.Script.Tests", "t
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniSharp.Shared", "src\OmniSharp.Shared\OmniSharp.Shared.csproj", "{9571E3FE-E742-44AC-9E1F-64156815B8E1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniSharp.Lsp.Tests", "tests\OmniSharp.Lsp.Tests\OmniSharp.Lsp.Tests.csproj", "{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -355,6 +357,18 @@ Global
 		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Release|x64.Build.0 = Release|Any CPU
 		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Release|x86.ActiveCfg = Release|Any CPU
 		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Release|x86.Build.0 = Release|Any CPU
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Debug|x64.Build.0 = Debug|Any CPU
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Debug|x86.Build.0 = Debug|Any CPU
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Release|x64.ActiveCfg = Release|Any CPU
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Release|x64.Build.0 = Release|Any CPU
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Release|x86.ActiveCfg = Release|Any CPU
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -383,6 +397,7 @@ Global
 		{D2A78CEE-B278-476F-AF34-A7D6F792F973} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 		{9E4BA68C-7F4B-429A-A0C7-8CE7D41D610F} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
 		{9571E3FE-E742-44AC-9E1F-64156815B8E1} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
+		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4DD725CE-B49A-4151-8B77-BB33FE88E46E}

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,13 +1,19 @@
+parameters:
+  - name: testProjects
+    type: object
+    default:
+      - OmniSharp.DotNetTest.Tests
+      - OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
 
 trigger:
-  batch: true
+  batch: 'true'
   branches:
     include:
       - master
       - refs/tags/*
 
 pr:
-  autoCancel: true
+  autoCancel: 'true'
   branches:
     include:
       - master
@@ -26,6 +32,7 @@ variables:
   CakeVersion: "0.32.1"
   NuGetVersion: "4.9.2"
   GitVersionVersion: "5.0.1"
+  MonoVersion: "6.10.0"
   Coverage: "$(Agent.BuildDirectory)/c"
   VstsCoverage: "$(Coverage)"
   Artifacts: $(Build.SourcesDirectory)/artifacts/
@@ -35,7 +42,7 @@ variables:
 jobs:
   - job: GitVersion
     pool:
-      vmImage: "VS2017-Win2016"
+      vmImage: "windows-2019"
     steps:
       - template: gitversion/store.yml@rsg
         parameters:
@@ -46,66 +53,97 @@ jobs:
     pool:
       vmImage: "macOS-10.15"
     dependsOn: GitVersion
-    variables:
-      MONO_VERSION: 6.10.0
     steps:
       - template: ./.pipelines/init.yml
         parameters:
           Verbosity: $(Verbosity)
           CakeVersion: $(CakeVersion)
           DotNetVersion: $(DotNetVersion)
           NuGetVersion: $(NuGetVersion)
-      - script: |
-          curl -o mono.pkg https://download.mono-project.com/archive/$MONO_VERSION/macos-10-universal/MonoFramework-MDK-$MONO_VERSION.105.macos10.xamarin.universal.pkg
-          sudo installer -pkg mono.pkg -target /
-          sudo cp -rf /Library/Frameworks/Mono.framework/Versions/$MONO_VERSION/ /Library/Frameworks/Mono.framework/Versions/Current/
-          MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$MONO_VERSION
-          echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;]$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH"
-          echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
-          echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
-        displayName: Use Mono $(MONO_VERSION)
-        failOnStderr: false
+          MonoVersion: $(MonoVersion)
       - script: |
           echo $PATH
           chmod 755 ./build.sh
-          ./build.sh --configuration Release --verbosity Verbose --target All --publish-all --archive
+          ./build.sh --configuration Release --verbosity Verbose --target CI --publish-all --archive
         displayName: 'Build'
       - template: ./.pipelines/artifacts.yml
         parameters:
           Artifacts: $(Artifacts)
 
-  - job: Linux
+  - job: macOS_tests
     pool:
-      vmImage: "Ubuntu-18.04"
+      vmImage: "macOS-10.15"
     dependsOn: GitVersion
-    variables:
-      MONO_VERSION: 6.10.0
+    strategy:
+      matrix:
+        ${{ each project in parameters.testProjects }}:
+          ${{ project }}:
+            TEST_PROJECT: ${{ project }}
     steps:
       - template: ./.pipelines/init.yml
         parameters:
           Verbosity: $(Verbosity)
           CakeVersion: $(CakeVersion)
           DotNetVersion: $(DotNetVersion)
           NuGetVersion: $(NuGetVersion)
+          MonoVersion: $(MonoVersion)
       - script: |
-          sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-          sudo apt install apt-transport-https ca-certificates
-          echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic/snapshots/$MONO_VERSION.105 main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
-          sudo apt update
-          sudo apt install mono-devel
-          sudo apt install msbuild
-        displayName: Use Mono $(MONO_VERSION)
+          echo $PATH
+          chmod 755 ./build.sh
+          ./build.sh --configuration Debug --verbosity Verbose --target Test --test-project="$TEST_PROJECT"
+        displayName: 'Build'
+      - template: ./.pipelines/logs.yml
+        parameters:
+          Artifacts: $(Artifacts)
+
+  - job: Linux
+    pool:
+      vmImage: "ubuntu-18.04"
+    dependsOn: GitVersion
+    steps:
+      - template: ./.pipelines/init.yml
+        parameters:
+          Verbosity: $(Verbosity)
+          CakeVersion: $(CakeVersion)
+          DotNetVersion: $(DotNetVersion)
+          NuGetVersion: $(NuGetVersion)
+          MonoVersion: $(MonoVersion)
       - script: |
           chmod 755 ./build.sh
-          ./build.sh --configuration Release --verbosity Verbose --target All --publish-all --archive
+          ./build.sh --configuration Release --verbosity Verbose --target CI --publish-all --archive
         displayName: 'Build'
       - template: ./.pipelines/artifacts.yml
         parameters:
           Artifacts: $(Artifacts)
 
+  - job: Linux_tests
+    pool:
+      vmImage: "ubuntu-18.04"
+    dependsOn: GitVersion
+    strategy:
+      matrix:
+        ${{ each project in parameters.testProjects }}:
+          ${{ project }}:
+            TEST_PROJECT: ${{ project }}
+    steps:
+      - template: ./.pipelines/init.yml
+        parameters:
+          Verbosity: $(Verbosity)
+          CakeVersion: $(CakeVersion)
+          DotNetVersion: $(DotNetVersion)
+          NuGetVersion: $(NuGetVersion)
+          MonoVersion: $(MonoVersion)
+      - script: |
+          chmod 755 ./build.sh
+          ./build.sh --configuration Debug --verbosity Verbose --target Test --test-project="$TEST_PROJECT"
+        displayName: 'Build'
+      - template: ./.pipelines/logs.yml
+        parameters:
+          Artifacts: $(Artifacts)
+
   - job: Windows
     pool:
-      vmImage: "windows-latest"
+      vmImage: "windows-2019"
     dependsOn: GitVersion
     steps:
       - template: ./.pipelines/init.yml
@@ -114,18 +152,44 @@ jobs:
           CakeVersion: $(CakeVersion)
           DotNetVersion: $(DotNetVersion)
           NuGetVersion: $(NuGetVersion)
-      - powershell: .\build.ps1 -configuration Release -verbosity Verbose -target All -publish-all -archive
+      - powershell: .\build.ps1 -configuration Release -verbosity Verbose -target CI -publish-all -archive
         displayName: 'Build'
       - template: ./.pipelines/artifacts.yml
         parameters:
           Artifacts: $(Artifacts)
+
+  - job: Windows_tests
+    pool:
+      vmImage: "windows-2019"
+    dependsOn: GitVersion
+    strategy:
+      matrix:
+        ${{ each project in parameters.testProjects }}:
+          ${{ project }}:
+            TEST_PROJECT: ${{ project }}
+    steps:
+      - template: ./.pipelines/init.yml
+        parameters:
+          Verbosity: $(Verbosity)
+          CakeVersion: $(CakeVersion)
+          DotNetVersion: $(DotNetVersion)
+          NuGetVersion: $(NuGetVersion)
+      - powershell: .\build.ps1 -configuration Debug -verbosity Verbose --test-project="$ENV:TEST_PROJECT" -target Test
+        displayName: 'Build'
+      - template: ./.pipelines/logs.yml
+        parameters:
+          Artifacts: $(Artifacts)
+
   - job: Release
     pool:
       vmImage: "Ubuntu-16.04"
     dependsOn:
       - macOS
+      - macOS_tests
       - Linux
+      - Linux_tests
       - Windows
+      - Windows_tests
     steps:
       - task: NuGetToolInstaller@1
         displayName: 'Install NuGet'

diff --git a/build.cake b/build.cake
@@ -15,6 +15,7 @@ var installFolder = Argument("install-path",
     CombinePaths(Environment.GetEnvironmentVariable(Platform.Current.IsWindows ? "USERPROFILE" : "HOME"), ".omnisharp"));
 var publishAll = HasArgument("publish-all");
 var useGlobalDotNetSdk = HasArgument("use-global-dotnet-sdk");
+var testProjectArgument = Argument("test-project", "");
 
 Log.Context = Context;
 
@@ -114,7 +115,7 @@ Task("InstallDotNetCoreSdk")
 {
     if (!useGlobalDotNetSdk)
     {
-        foreach (var dotnetVersion in buildPlan.DotNetVersions) 
+        foreach (var dotnetVersion in buildPlan.DotNetVersions)
         {
             InstallDotNetSdk(env, buildPlan,
                 version: dotnetVersion,
@@ -586,7 +587,8 @@ Task("Test")
     .IsDependentOn("PrepareTestAssets")
     .Does(() =>
 {
-        foreach (var testProject in buildPlan.TestProjects)
+        var testProjects = string.IsNullOrEmpty(testProjectArgument) ? buildPlan.TestProjects : testProjectArgument.Split(',');
+        foreach (var testProject in testProjects)
         {
             PrintBlankLine();
             var instanceFolder = CombinePaths(env.Folders.Bin, configuration, testProject, "net472");
@@ -924,6 +926,15 @@ Task("All")
 Task("Default")
     .IsDependentOn("All");
 
+/// <summary>
+///  Task aliases for CI (excluding tests) as they are parallelized
+/// </summary>
+Task("CI")
+    .IsDependentOn("Cleanup")
+    .IsDependentOn("Build")
+    .IsDependentOn("Publish")
+    .IsDependentOn("ExecuteRunScript");
+
 Teardown(context =>
 {
     // Ensure that we shutdown all build servers used by the CLI during build.

diff --git a/build.json b/build.json
@@ -22,13 +22,15 @@
         "OmniSharp.DotNetTest.Tests",
         "OmniSharp.Tests",
         "OmniSharp.Cake.Tests",
-        "OmniSharp.Script.Tests"
+        "OmniSharp.Script.Tests",
+        "OmniSharp.Lsp.Tests"
     ],
     "TestAssets": [
         "NUnitTestProject",
         "XunitTestProject",
         "MSTestProject",
         "ProjectAndSolution",
+        "ProjectAndSolutionWithGlobs",
         "ProjectAndSolutionWithProjectSection",
         "TwoProjectsWithSolution",
         "ProjectWithGeneratedFile",