From bc6c8dd25e15567ca74bd5bafa1fa0f84e883f81 Mon Sep 17 00:00:00 2001 From: "Spencer G. Jones" Date: Mon, 12 Sep 2022 06:52:35 -0600 Subject: [PATCH 1/5] Update to latest Omnisharp. Use .NET 6 version of Omnisharp. --- build.py | 63 ++++++++++++++++--------------- update_omnisharp.py | 10 ++--- ycmd/tests/cs/subcommands_test.py | 13 +++++-- 3 files changed, 47 insertions(+), 39 deletions(-) diff --git a/build.py b/build.py index 4f586f2864..464b0d8384 100755 --- a/build.py +++ b/build.py @@ -876,44 +876,47 @@ def GetCsCompleterDataForPlatform(): #################################### DATA = { 'win32': { - 'version': 'v1.37.11', - 'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release' - 's/download/v1.37.11/omnisharp.http-win-x86.zip' ), - 'file_name': 'omnisharp.http-win-x86.zip', - 'check_sum': ( '461544056b144c97e8413de8c1aa1ddd9e2902f5a9f2223af8046d65' - '4d95f2a0' ), + 'version': '1.39.2-beta.26', + 'download_url': ( 'https://roslynomnisharp.blob.core.windows.net/release' + 's/1.39.2-beta.26/omnisharp.http-win-x86-net6.0.zip' ), + 'file_name': 'omnisharp.http-win-x86-net6.0.zip', + 'check_sum': ( '1bae972aa9b898a2ddb3af423991ac448e58e48ac78362ed51d685cc' + '3bc7686a' ), }, 'win64': { - 'version': 'v1.37.11', - 'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release' - 's/download/v1.37.11/omnisharp.http-win-x64.zip' ), - 'file_name': 'omnisharp.http-win-x64.zip', - 'check_sum': ( '7f6f0abfac00d028b90aaf1f56813e4fbb73d84bdf2c4704862aa976' - '1b61a59c' ), + 'version': '1.39.2-beta.26', + 'download_url': ( 'https://roslynomnisharp.blob.core.windows.net/release' + 's/1.39.2-beta.26/omnisharp.http-win-x64-net6.0.zip' ), + 'file_name': 'omnisharp.http-win-x64-net6.0.zip', + 'check_sum': ( 'c48736b87542a759e6a8ffce008176f19da93782d0d20112e4e8d60a' + 'e6f3d20b' ), }, 'macos': { - 'version': 'v1.37.11', - 'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release' - 's/download/v1.37.11/omnisharp.http-osx.tar.gz' ), - 'file_name': 'omnisharp.http-osx.tar.gz', - 'check_sum': ( '84b84a8a3cb8fd3986ea795d9230457c43bf130b482fcb77fef57c67' - 'e151828a' ), + 'version': '1.39.2-beta.26', + 'download_url': ( 'https://roslynomnisharp.blob.core.windows.net/release' + 's/1.39.2-beta.26/omnisharp.http-osx-x64-net6.0.tar.gz' + '' ), + 'file_name': 'omnisharp.http-osx-x64-net6.0.tar.gz', + 'check_sum': ( '56210863b39f9bbab4b80ae9303da06327b71694d1ec70e90e97dcc2' + 'dd3e6f3d' ), }, 'linux32': { - 'version': 'v1.37.11', - 'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release' - 's/download/v1.37.11/omnisharp.http-linux-x86.tar.gz' ), - 'file_name': 'omnisharp.http-linux-x86.tar.gz', - 'check_sum': ( 'a5ab39380a5d230c75f08bf552980cdc5bd8c31a43348acbfa66f1f4' - '6f12851f' ), + 'version': '1.39.2-beta.26', + 'download_url': ( 'https://roslynomnisharp.blob.core.windows.net/release' + 's/1.39.2-beta.26/omnisharp.http-linux-x64-net6.0.tar.' + 'gz' ), + 'file_name': 'omnisharp.http-linux-x64-net6.0.tar.gz', + 'check_sum': ( 'f45bad209be81ac0fcbe15c27eb44bb35382445d7fb5defbeec07e00' + 'c0843081' ), }, 'linux64': { - 'version': 'v1.37.11', - 'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release' - 's/download/v1.37.11/omnisharp.http-linux-x64.tar.gz' ), - 'file_name': 'omnisharp.http-linux-x64.tar.gz', - 'check_sum': ( '9a6e9a246babd777229eebb57f0bee86e7ef5da271c67275eae5ed9d' - '7b0ad563' ), + 'version': '1.39.2-beta.26', + 'download_url': ( 'https://roslynomnisharp.blob.core.windows.net/release' + 's/1.39.2-beta.26/omnisharp.http-linux-x64-net6.0.tar.' + 'gz' ), + 'file_name': 'omnisharp.http-linux-x64-net6.0.tar.gz', + 'check_sum': ( 'f45bad209be81ac0fcbe15c27eb44bb35382445d7fb5defbeec07e00' + 'c0843081' ), }, } if OnWindows(): diff --git a/update_omnisharp.py b/update_omnisharp.py index 566f186ce4..a21d9754a5 100755 --- a/update_omnisharp.py +++ b/update_omnisharp.py @@ -23,11 +23,11 @@ "releases/{version}/{file_name}" ), } FILE_NAME = { - 'win32': 'omnisharp.http-win-x86.zip', - 'win64': 'omnisharp.http-win-x64.zip', - 'macos': 'omnisharp.http-osx.tar.gz', - 'linux32': 'omnisharp.http-linux-x86.tar.gz', - 'linux64': 'omnisharp.http-linux-x64.tar.gz', + 'win32': 'omnisharp.http-win-x86-net6.0.zip', + 'win64': 'omnisharp.http-win-x64-net6.0.zip', + 'macos': 'omnisharp.http-osx-x64-net6.0.tar.gz', + 'linux32': 'omnisharp.http-linux-x64-net6.0.tar.gz', + 'linux64': 'omnisharp.http-linux-x64-net6.0.tar.gz', } diff --git a/ycmd/tests/cs/subcommands_test.py b/ycmd/tests/cs/subcommands_test.py index 3205714f52..f62bfc1360 100644 --- a/ycmd/tests/cs/subcommands_test.py +++ b/ycmd/tests/cs/subcommands_test.py @@ -109,23 +109,28 @@ def test_Subcommands_FixIt_Multi( self, app ): filetype = 'cs', filepath = fixit_test ) response = app.post_json( '/run_completer_command', request ).json + assert_that( response, has_entries( { 'fixits': contains_exactly( has_entries( { - 'text': 'Introduce constant', + 'text': 'Introduce parameter for \'5\'', 'command': has_entries( { 'index': 0 } ), 'resolve': True } ), has_entries( { - 'text': 'Convert to binary', + 'text': 'Introduce parameter for all occurrences of \'5\'', 'command': has_entries( { 'index': 1 } ), 'resolve': True } ), has_entries( { - 'text': 'Convert to hex', + 'text': 'Convert to binary', 'command': has_entries( { 'index': 2 } ), 'resolve': True } ), + has_entries( { + 'text': 'Convert to hex', + 'command': has_entries( { 'index': 3 } ), + 'resolve': True } ), ) } ) ) request.pop( 'command_arguments' ) - request.update( { 'fixit': response[ 'fixits' ][ 1 ] } ) + request.update( { 'fixit': response[ 'fixits' ][ 2 ] } ) response = app.post_json( '/resolve_fixit', request ).json assert_that( response, has_entries( { 'fixits': contains_exactly( has_entries( { From ad251c5339c18a0910ec4d1b5fefca7b052c3efd Mon Sep 17 00:00:00 2001 From: "Spencer G. Jones" Date: Mon, 12 Sep 2022 07:47:24 -0600 Subject: [PATCH 2/5] .NET 6 does not use Mono --- ycmd/completers/cs/cs_completer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ycmd/completers/cs/cs_completer.py b/ycmd/completers/cs/cs_completer.py index bb7544987e..b21eb89ff0 100644 --- a/ycmd/completers/cs/cs_completer.py +++ b/ycmd/completers/cs/cs_completer.py @@ -50,9 +50,9 @@ PATH_TO_ROSLYN_OMNISHARP, 'Omnisharp.exe' ) if ( not os.path.isfile( PATH_TO_OMNISHARP_ROSLYN_BINARY ) and os.path.isfile( os.path.join( - PATH_TO_ROSLYN_OMNISHARP, 'omnisharp', 'OmniSharp.exe' ) ) ): + PATH_TO_ROSLYN_OMNISHARP, 'OmniSharp' ) ) ): PATH_TO_OMNISHARP_ROSLYN_BINARY = ( - os.path.join( PATH_TO_ROSLYN_OMNISHARP, 'omnisharp', 'OmniSharp.exe' ) ) + os.path.join( PATH_TO_ROSLYN_OMNISHARP, 'OmniSharp' ) ) LOGFILE_FORMAT = 'omnisharp_{port}_{sln}_{std}_' From 2dedd8221e7a849a954b12b6f809ba63d0afc1ad Mon Sep 17 00:00:00 2001 From: "Spencer G. Jones" Date: Mon, 12 Sep 2022 07:51:20 -0600 Subject: [PATCH 3/5] Install .NET 6 SDK in CI --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e85e239859..90c49a25f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,6 +83,10 @@ jobs: with: java-version: 17 distribution: 'adopt' + - name: Install .NET 6 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: '6.x.x' - name: Install Python uses: actions/setup-python@v2 with: @@ -233,6 +237,10 @@ jobs: with: java-version: 17 distribution: 'adopt' + - name: Install .NET 6 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: '6.x.x' - name: Install Python uses: actions/setup-python@v2 with: From 16a029f97f6053daba949fb0e0412247f76bf513 Mon Sep 17 00:00:00 2001 From: "Spencer G. Jones" Date: Fri, 28 Oct 2022 12:06:27 -0600 Subject: [PATCH 4/5] Update to latest Omnisharp. --- build.py | 58 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/build.py b/build.py index 464b0d8384..7e94a3b4b1 100755 --- a/build.py +++ b/build.py @@ -876,47 +876,49 @@ def GetCsCompleterDataForPlatform(): #################################### DATA = { 'win32': { - 'version': '1.39.2-beta.26', - 'download_url': ( 'https://roslynomnisharp.blob.core.windows.net/release' - 's/1.39.2-beta.26/omnisharp.http-win-x86-net6.0.zip' ), + 'version': 'v1.39.2', + 'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release' + 's/download/v1.39.2/omnisharp.http-win-x86-net6.0.zip' + ), 'file_name': 'omnisharp.http-win-x86-net6.0.zip', - 'check_sum': ( '1bae972aa9b898a2ddb3af423991ac448e58e48ac78362ed51d685cc' - '3bc7686a' ), + 'check_sum': ( 'd6814b0a1e501e9b3c72eadf13b06f31e8bbd8e2e04568754f2dd4e5' + '07310633' ), }, 'win64': { - 'version': '1.39.2-beta.26', - 'download_url': ( 'https://roslynomnisharp.blob.core.windows.net/release' - 's/1.39.2-beta.26/omnisharp.http-win-x64-net6.0.zip' ), + 'version': 'v1.39.2', + 'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release' + 's/download/v1.39.2/omnisharp.http-win-x64-net6.0.zip' + ), 'file_name': 'omnisharp.http-win-x64-net6.0.zip', - 'check_sum': ( 'c48736b87542a759e6a8ffce008176f19da93782d0d20112e4e8d60a' - 'e6f3d20b' ), + 'check_sum': ( 'a1f31b0efb535e38beb76a8daaeeab2fac7488452197ac588335be43' + 'f3bd46bb' ), }, 'macos': { - 'version': '1.39.2-beta.26', - 'download_url': ( 'https://roslynomnisharp.blob.core.windows.net/release' - 's/1.39.2-beta.26/omnisharp.http-osx-x64-net6.0.tar.gz' - '' ), + 'version': 'v1.39.2', + 'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release' + 's/download/v1.39.2/omnisharp.http-osx-x64-net6.0.tar.' + 'gz' ), 'file_name': 'omnisharp.http-osx-x64-net6.0.tar.gz', - 'check_sum': ( '56210863b39f9bbab4b80ae9303da06327b71694d1ec70e90e97dcc2' - 'dd3e6f3d' ), + 'check_sum': ( '33163bdd54428b8a2a10ca987a577e7f9776d85bf2e892c756d45789' + '351c3782' ), }, 'linux32': { - 'version': '1.39.2-beta.26', - 'download_url': ( 'https://roslynomnisharp.blob.core.windows.net/release' - 's/1.39.2-beta.26/omnisharp.http-linux-x64-net6.0.tar.' - 'gz' ), + 'version': 'v1.39.2', + 'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release' + 's/download/v1.39.2/omnisharp.http-linux-x64-net6.0.ta' + 'r.gz' ), 'file_name': 'omnisharp.http-linux-x64-net6.0.tar.gz', - 'check_sum': ( 'f45bad209be81ac0fcbe15c27eb44bb35382445d7fb5defbeec07e00' - 'c0843081' ), + 'check_sum': ( '7c37055febe0fbcc1f0cddc62143665665baeb163f96beda5fade0e3' + 'd0048680' ), }, 'linux64': { - 'version': '1.39.2-beta.26', - 'download_url': ( 'https://roslynomnisharp.blob.core.windows.net/release' - 's/1.39.2-beta.26/omnisharp.http-linux-x64-net6.0.tar.' - 'gz' ), + 'version': 'v1.39.2', + 'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release' + 's/download/v1.39.2/omnisharp.http-linux-x64-net6.0.ta' + 'r.gz' ), 'file_name': 'omnisharp.http-linux-x64-net6.0.tar.gz', - 'check_sum': ( 'f45bad209be81ac0fcbe15c27eb44bb35382445d7fb5defbeec07e00' - 'c0843081' ), + 'check_sum': ( '7c37055febe0fbcc1f0cddc62143665665baeb163f96beda5fade0e3' + 'd0048680' ), }, } if OnWindows(): From 08a8f5821aee01dfaf54aed4ef8cce8be60fc441 Mon Sep 17 00:00:00 2001 From: "Spencer G. Jones" Date: Thu, 3 Nov 2022 12:03:52 -0600 Subject: [PATCH 5/5] fixup! Update to latest Omnisharp. --- build.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.py b/build.py index 7e94a3b4b1..24a92d50a4 100755 --- a/build.py +++ b/build.py @@ -878,8 +878,8 @@ def GetCsCompleterDataForPlatform(): 'win32': { 'version': 'v1.39.2', 'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release' - 's/download/v1.39.2/omnisharp.http-win-x86-net6.0.zip' - ), + 's/download/v1.39.2/omnisharp.http-win-x86-net6.0.' + 'zip' ), 'file_name': 'omnisharp.http-win-x86-net6.0.zip', 'check_sum': ( 'd6814b0a1e501e9b3c72eadf13b06f31e8bbd8e2e04568754f2dd4e5' '07310633' ), @@ -887,8 +887,8 @@ def GetCsCompleterDataForPlatform(): 'win64': { 'version': 'v1.39.2', 'download_url': ( 'https://github.com/OmniSharp/omnisharp-roslyn/release' - 's/download/v1.39.2/omnisharp.http-win-x64-net6.0.zip' - ), + 's/download/v1.39.2/omnisharp.http-win-x64-net6.0.' + 'zip' ), 'file_name': 'omnisharp.http-win-x64-net6.0.zip', 'check_sum': ( 'a1f31b0efb535e38beb76a8daaeeab2fac7488452197ac588335be43' 'f3bd46bb' ),