Skip to content

Commit 0902f18

Browse files
AnakaelAnakael
committed
Merge branch 'master' of github.com:OmniSharp/omnisharp-roslyn into pr/anakael/add-lsp-progress
2 parents ffa03c9 + 4bcb0d6 commit 0902f18

File tree

161 files changed

+3731
-2104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+3731
-2104
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "3.0.0",
6+
"version": "4.2.0",
77
"commands": [
88
"dotnet-cake"
99
]

‎.editorconfig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,8 @@ indent_size = 4
2323

2424
[*.{yml,yaml}]
2525
indent_size = 2
26+
27+
[tests/**/*.cs]
28+
dotnet_diagnostic.RS1038.severity = none
29+
dotnet_diagnostic.RS1041.severity = none
30+
dotnet_diagnostic.RS1042.severity = none

‎.github/workflows/build.yml‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
2-
name: 'Build'
1+
name: "Build"
32
env:
4-
DotNetVersion: "8.0.100-preview.4.23260.5"
5-
DotNetVersion2: "7.0.302"
6-
DotNetVersion3: "6.0.203"
3+
DotNetVersion: "9.0.101"
4+
DotNetVersion2: "8.0.303"
5+
DotNetVersion3: "7.0.410"
6+
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
77
NuGetVersion: "6.5.0"
88
MonoVersion: "6.12.0"
99
Artifacts: ${{ github.workspace }}/artifacts/
@@ -18,30 +18,22 @@ on:
1818
- master
1919
- feature/*
2020
tags:
21-
- '*'
21+
- "*"
2222
workflow_dispatch:
2323
jobs:
2424
build:
2525
runs-on: ${{ matrix.os }}
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
os: [ubuntu-20.04, windows-2022, macos-11]
30-
name: 'Build'
29+
os: [ubuntu-20.04, windows-2022, macos-13]
30+
name: "Build"
3131
steps:
3232
- name: Checkout
3333
uses: actions/checkout@v2
3434
with:
35-
clean: 'false'
36-
fetch-depth: '0'
37-
38-
# TODO: Need to figure out the correct way to install mono on linux / mac
39-
# Currently the latest image has mono 6.12
40-
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
41-
# - name: 🔨 Use Mono ${{ env.MonoVersion }} SDK
42-
# uses: maxim-lobanov/setup-xamarin@v1
43-
# with:
44-
# mono-version: ${{ env.MonoVersion }}
35+
clean: "false"
36+
fetch-depth: "0"
4537

4638
- name: Setup NuGet.exe
4739
uses: nuget/setup-nuget@v1
@@ -52,6 +44,7 @@ jobs:
5244
uses: actions/setup-dotnet@v3
5345
with:
5446
dotnet-version: |
47+
${{ env.DotNetVersion4 }}
5548
${{ env.DotNetVersion3 }}
5649
${{ env.DotNetVersion2 }}
5750
${{ env.DotNetVersion }}
@@ -69,41 +62,41 @@ jobs:
6962
dotnet cake --configuration=Release --verbosity=Verbose --target=CI --publish-all --archive
7063
7164
- name: ⬆ Publish Logs
72-
uses: actions/upload-artifact@v2
65+
uses: actions/upload-artifact@v4
7366
continue-on-error: true
7467
if: ${{ always() }}
7568
with:
76-
name: 'logs - ${{ github.workflow }} ${{ matrix.os }}'
77-
path: '${{ env.Artifacts }}/logs/'
69+
name: "logs - ${{ github.workflow }} ${{ matrix.os }}"
70+
path: "${{ env.Artifacts }}/logs/"
7871

7972
- name: ⬆ Publish Packages
80-
uses: actions/upload-artifact@v2
73+
uses: actions/upload-artifact@v4
8174
continue-on-error: true
8275
if: ${{ always() }}
8376
with:
84-
name: 'packages'
85-
path: '${{ env.Artifacts }}/package/'
77+
name: "packages"
78+
path: "${{ env.Artifacts }}/package/"
8679

8780
- name: ⬆ Publish Deployment
88-
uses: actions/upload-artifact@v2
81+
uses: actions/upload-artifact@v4
8982
continue-on-error: true
9083
if: ${{ always() }}
9184
with:
92-
name: 'deployment'
93-
path: '${{ env.Artifacts }}/deployment/'
85+
name: "deployment"
86+
path: "${{ env.Artifacts }}/deployment/"
9487

9588
- name: ⬆ Publish NuGet
96-
uses: actions/upload-artifact@v2
89+
uses: actions/upload-artifact@v4
9790
continue-on-error: true
9891
if: ${{ always() }}
9992
with:
100-
name: 'nuget'
101-
path: '${{ env.Artifacts }}/nuget/'
93+
name: "nuget"
94+
path: "${{ env.Artifacts }}/nuget/"
10295

10396
- name: ⬆ Publish Scripts
104-
uses: actions/upload-artifact@v2
97+
uses: actions/upload-artifact@v4
10598
continue-on-error: true
10699
if: ${{ always() }}
107100
with:
108-
name: 'scripts - ${{ matrix.os }}'
109-
path: '${{ env.Artifacts }}/scripts/'
101+
name: "scripts - ${{ matrix.os }}"
102+
path: "${{ env.Artifacts }}/scripts/"

‎.github/workflows/tests-net6.yml‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
2-
name: 'Tests net6.0'
1+
name: "Tests net6.0"
32
env:
4-
DotNetVersion: "8.0.100-preview.4.23260.5"
5-
DotNetVersion2: "7.0.302"
6-
DotNetVersion3: "6.0.203"
3+
DotNetVersion: "9.0.101"
4+
DotNetVersion2: "8.0.303"
5+
DotNetVersion3: "7.0.410"
6+
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
77
NuGetVersion: "6.5.0"
88
MonoVersion: "6.12.0"
99
Artifacts: ${{ github.workspace }}/artifacts/
@@ -18,33 +18,25 @@ on:
1818
- master
1919
- feature/*
2020
tags:
21-
- '*'
21+
- "*"
2222
workflow_dispatch:
2323
jobs:
2424
build:
2525
runs-on: ${{ matrix.os }}
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
os: [ubuntu-20.04, windows-2022, macos-11]
29+
os: [ubuntu-20.04, windows-2022, macos-13]
3030
testProjects:
31-
- OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
32-
- OmniSharp.DotNetTest.Tests
33-
name: 'Test'
31+
- OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.DotNetTest.Tests,OmniSharp.Cake.Tests
32+
- OmniSharp.Lsp.Tests,OmniSharp.Script.Tests,OmniSharp.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests
33+
name: "Test"
3434
steps:
3535
- name: Checkout
3636
uses: actions/checkout@v2
3737
with:
38-
clean: 'false'
39-
fetch-depth: '0'
40-
41-
# TODO: Need to figure out the correct way to install mono on linux / mac
42-
# Currently the latest image has mono 6.12
43-
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
44-
# - name: 🔨 Use Mono ${{ env.MonoVersion }} SDK
45-
# uses: maxim-lobanov/setup-xamarin@v1
46-
# with:
47-
# mono-version: ${{ env.MonoVersion }}
38+
clean: "false"
39+
fetch-depth: "0"
4840

4941
- name: Setup NuGet.exe
5042
uses: nuget/setup-nuget@v1
@@ -55,6 +47,7 @@ jobs:
5547
uses: actions/setup-dotnet@v3
5648
with:
5749
dotnet-version: |
50+
${{ env.DotNetVersion4 }}
5851
${{ env.DotNetVersion3 }}
5952
${{ env.DotNetVersion2 }}
6053
${{ env.DotNetVersion }}
@@ -80,9 +73,9 @@ jobs:
8073
TEST_PROJECT: ${{ matrix.testProjects }}
8174

8275
- name: ⬆ Publish Logs
83-
uses: actions/upload-artifact@v2
76+
uses: actions/upload-artifact@v4
8477
continue-on-error: true
8578
if: ${{ always() }}
8679
with:
87-
name: 'logs - ${{ github.workflow }} ${{ matrix.os }}'
88-
path: '${{ env.Artifacts }}/logs/'
80+
name: "logs - ${{ github.workflow }} ${{ matrix.os }}"
81+
path: "${{ env.Artifacts }}/logs/"

‎.github/workflows/tests.yml‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
2-
name: 'Tests'
1+
name: "Tests"
32
env:
4-
DotNetVersion: "8.0.100-preview.4.23260.5"
5-
DotNetVersion2: "7.0.302"
6-
DotNetVersion3: "6.0.203"
3+
DotNetVersion: "9.0.101"
4+
DotNetVersion2: "8.0.303"
5+
DotNetVersion3: "7.0.410"
6+
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
77
NuGetVersion: "6.5.0"
88
MonoVersion: "6.12.0"
99
Artifacts: ${{ github.workspace }}/artifacts/
@@ -18,33 +18,25 @@ on:
1818
- master
1919
- feature/*
2020
tags:
21-
- '*'
21+
- "*"
2222
workflow_dispatch:
2323
jobs:
2424
build:
2525
runs-on: ${{ matrix.os }}
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
os: [ubuntu-20.04, windows-2022, macos-11]
29+
os: [ubuntu-20.04, windows-2022, macos-13]
3030
testProjects:
31-
- OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
32-
- OmniSharp.DotNetTest.Tests
33-
name: 'Test'
31+
- OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.DotNetTest.Tests,OmniSharp.Cake.Tests
32+
- OmniSharp.Lsp.Tests,OmniSharp.Script.Tests,OmniSharp.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests
33+
name: "Test"
3434
steps:
3535
- name: Checkout
3636
uses: actions/checkout@v2
3737
with:
38-
clean: 'false'
39-
fetch-depth: '0'
40-
41-
# TODO: Need to figure out the correct way to install mono on linux / mac
42-
# Currently the latest image has mono 6.12
43-
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
44-
# - name: 🔨 Use Mono ${{ env.MonoVersion }} SDK
45-
# uses: maxim-lobanov/setup-xamarin@v1
46-
# with:
47-
# mono-version: ${{ env.MonoVersion }}
38+
clean: "false"
39+
fetch-depth: "0"
4840

4941
- name: Setup NuGet.exe
5042
uses: nuget/setup-nuget@v1
@@ -55,6 +47,7 @@ jobs:
5547
uses: actions/setup-dotnet@v3
5648
with:
5749
dotnet-version: |
50+
${{ env.DotNetVersion4 }}
5851
${{ env.DotNetVersion3 }}
5952
${{ env.DotNetVersion2 }}
6053
${{ env.DotNetVersion }}
@@ -80,9 +73,9 @@ jobs:
8073
TEST_PROJECT: ${{ matrix.testProjects }}
8174

8275
- name: ⬆ Publish Logs
83-
uses: actions/upload-artifact@v2
76+
uses: actions/upload-artifact@v4
8477
continue-on-error: true
8578
if: ${{ always() }}
8679
with:
87-
name: 'logs - ${{ github.workflow }} ${{ matrix.os }}'
88-
path: '${{ env.Artifacts }}/logs/'
80+
name: "logs - ${{ github.workflow }} ${{ matrix.os }}"
81+
path: "${{ env.Artifacts }}/logs/"

‎.pipelines/init.yml‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
parameters:
22
# Configuration: Release
33
Verbosity: Normal
4-
DotNetVersion: "8.0.100-preview.4.23260.5"
5-
DotNetVersion2: "7.0.302"
6-
DotNetVersion3: "6.0.203"
4+
DotNetVersion: "8.0.303"
75
CakeVersion: "1.1.0"
86
NuGetVersion: "5.7.0"
9-
MonoVersion: ''
7+
MonoVersion: ""
108
steps:
119
- task: DownloadBuildArtifacts@0
1210
displayName: "Download GitVersion Variables"
@@ -17,53 +15,43 @@ steps:
1715
pipelineId: GitVersion
1816
targetPath: "$(Build.ArtifactStagingDirectory)/gitversion/"
1917
- task: RocketSurgeonsGuild.variable-tools.DeserializeVariables.DeserializeVariables@1
20-
displayName: 'Deserialize GitVersion'
18+
displayName: "Deserialize GitVersion"
2119
inputs:
2220
jsonfiles: $(Build.ArtifactStagingDirectory)/gitversion/**/gitversion.json
2321
- task: UseDotNet@2
2422
displayName: Install dotnet $(DotNetVersion)
2523
inputs:
26-
packageType: 'sdk'
24+
packageType: "sdk"
2725
version: ${{ parameters.DotNetVersion }}
28-
- task: UseDotNet@2
29-
displayName: Install dotnet $(DotNetVersion2)
30-
inputs:
31-
packageType: 'sdk'
32-
version: ${{ parameters.DotNetVersion2 }}
33-
- task: UseDotNet@2
34-
displayName: Install dotnet $(DotNetVersion3)
35-
inputs:
36-
packageType: 'sdk'
37-
version: ${{ parameters.DotNetVersion3 }}
3826
- task: DotNetCoreCLI@2
39-
displayName: 'dotnet install cake'
27+
displayName: "dotnet install cake"
4028
inputs:
4129
command: custom
4230
custom: tool
43-
arguments: 'install -g Cake.Tool --version $(CakeVersion)'
44-
workingDirectory: '$(Build.ArtifactStagingDirectory)'
31+
arguments: "install -g Cake.Tool --version $(CakeVersion)"
32+
workingDirectory: "$(Build.ArtifactStagingDirectory)"
4533
env:
4634
CakeVersion: ${{ parameters.CakeVersion }}
4735
- task: NuGetToolInstaller@0
4836
displayName: "Get NuGet"
4937
inputs:
5038
versionSpec: ${{ parameters.NuGetVersion }}
5139
- task: NuGetCommand@2
52-
displayName: 'Cake restore packages.config'
40+
displayName: "Cake restore packages.config"
5341
inputs:
5442
command: custom
5543
feedsToUse: config
5644
arguments: install tools/packages.config -ExcludeVersion -OutputDirectory tools
5745
- ${{ if ne(parameters.MonoVersion, '') }}:
58-
- script: |
59-
curl -o mono.pkg https://download.mono-project.com/archive/$MONO_VERSION/macos-10-universal/MonoFramework-MDK-$MONO_VERSION.182.macos10.xamarin.universal.pkg
60-
sudo installer -pkg mono.pkg -target /
61-
sudo cp -rf /Library/Frameworks/Mono.framework/Versions/$MONO_VERSION/ /Library/Frameworks/Mono.framework/Versions/Current/
62-
MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$MONO_VERSION
63-
echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;]$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH"
64-
echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
65-
echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
66-
env:
67-
MONO_VERSION: ${{ parameters.MonoVersion }}
68-
displayName: Use Mono ${{ parameters.MonoVersion }}
69-
failOnStderr: false
46+
- script: |
47+
curl -o mono.pkg https://download.mono-project.com/archive/$MONO_VERSION/macos-10-universal/MonoFramework-MDK-$MONO_VERSION.182.macos10.xamarin.universal.pkg
48+
sudo installer -pkg mono.pkg -target /
49+
sudo cp -rf /Library/Frameworks/Mono.framework/Versions/$MONO_VERSION/ /Library/Frameworks/Mono.framework/Versions/Current/
50+
MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$MONO_VERSION
51+
echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;]$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH"
52+
echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
53+
echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
54+
env:
55+
MONO_VERSION: ${{ parameters.MonoVersion }}
56+
displayName: Use Mono ${{ parameters.MonoVersion }}
57+
failOnStderr: false

0 commit comments

Comments
 (0)