Skip to content

[WIP] Use latest Omnisharp-rosyln for .NET 6 support #1659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

[WIP] Use latest Omnisharp-rosyln for .NET 6 support #1659

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc6c8dd
Update to latest Omnisharp. Use .NET 6 version of Omnisharp.
mispencer Sep 12, 2022
ad251c5
.NET 6 does not use Mono
mispencer Sep 12, 2022
2dedd82
Install .NET 6 SDK in CI
mispencer Sep 12, 2022
16a029f
Update to latest Omnisharp.
mispencer Oct 28, 2022
08a8f58
fixup! Update to latest Omnisharp.
mispencer Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
63 changes: 33 additions & 30 deletions build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
10 changes: 5 additions & 5 deletions update_omnisharp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}


Expand Down
4 changes: 2 additions & 2 deletions ycmd/completers/cs/cs_completer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}_'


Expand Down
13 changes: 9 additions & 4 deletions ycmd/tests/cs/subcommands_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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( {
Expand Down