Skip to content
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.

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

Merge vNext into master #2291

Merged
merged 52 commits into from
Dec 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
2ad551f
Prototype of omnisharp running as a .NET 5.0 process. Several hacks a…
333fred Nov 24, 2020
719d7c7
small build script tweaks
filipw Dec 25, 2020
992394c
updated testplatform
filipw Dec 25, 2020
e30fac4
updated build script to publish 5.0 builds
filipw Dec 25, 2020
c570d7b
some passing tests on .net 5.0
filipw Feb 26, 2021
2ee822b
Merge branch 'master' of https://github.com/OmniSharp/omnisharp-rosly…
filipw Mar 4, 2021
c184a87
some further fixes
filipw Mar 4, 2021
884beb0
Merge remote-tracking branch 'origin/master' into merge-master-to-dem…
JoeRobich May 14, 2021
0788402
Run CI on demo branches
JoeRobich May 14, 2021
61298ff
Fix filename capitalization
JoeRobich May 14, 2021
f2f4725
Fix NuGet package downgrade
JoeRobich May 14, 2021
d9c4115
Remove test for .NET Core 2.1 SDK compatibility
JoeRobich May 14, 2021
4c9693e
Fix project capabilities test
JoeRobich May 14, 2021
6dad014
Downgrade some packages
JoeRobich May 14, 2021
f28fc1c
Remove Cake Tests from the CI test matrix
JoeRobich May 14, 2021
231cd8c
Remove rollForward from global.json
JoeRobich May 14, 2021
88cea1e
Add binding redirect for System.CodeDom to tests
JoeRobich May 14, 2021
84c3a47
Load MSBuild from SDK. Run NET5.0 tests on CI.
JoeRobich May 16, 2021
9248173
Fix build warning about Cake reference and msbuild redirect
JoeRobich May 16, 2021
fb28ab1
Disable Regex Completion tests except on Windows Desktop
JoeRobich May 16, 2021
2e063a3
Fix test failures
JoeRobich May 16, 2021
d093189
Merge pull request #2153 from OmniSharp/merge-master-to-demo-net50
filipw May 17, 2021
26d4127
Run GitHub Action on feature branches
JoeRobich May 17, 2021
cdbd5b5
build.cake fixups
JoeRobich May 17, 2021
959f55e
Merge remote-tracking branch 'origin/master' into merge-master-to-omn…
JoeRobich Jun 18, 2021
343ca47
Merge remote-tracking branch 'origin/master' into merge-master-to-omn…
JoeRobich Jun 19, 2021
dbdf85a
Update .NET SDK versions in NET 5 Test CI
JoeRobich Jun 19, 2021
3e630f3
Merge pull request #2179 from JoeRobich/merge-master-to-omnisharp-vnext
JoeRobich Jun 19, 2021
a76986f
Merge remote-tracking branch 'origin/feature/omnisharp-vnext' into me…
JoeRobich Aug 31, 2021
55680e8
Add OmniSharp redirects to OmniSharp.dll.config
JoeRobich Aug 31, 2021
487290d
Update SDK version in Net5 Test CI
JoeRobich Aug 31, 2021
d7c3ebb
Use directory-scoped ALCs to load analyzers in .NET Core
JoeRobich Sep 11, 2021
6b633cd
Merge pull request #2223 from JoeRobich/merge-master-to-vnext
filipw Sep 11, 2021
13408b6
updated to 5.0.401
filipw Sep 16, 2021
8dfedd5
Merge remote-tracking branch 'origin/feature/omnisharp-vnext' into up…
JoeRobich Nov 24, 2021
cd99d8e
Update tests-net5.yml
JoeRobich Nov 24, 2021
df72e65
Update tests-net5.yml
JoeRobich Nov 24, 2021
57c697b
Merge pull request #2278 from JoeRobich/update-vnext
JoeRobich Nov 24, 2021
9aa9408
Move OmniSharp to run on .NET 6
JoeRobich Nov 25, 2021
845529c
Avoid the NET6 breaking change in HostWriter
JoeRobich Nov 25, 2021
9a999d2
Disable Cake tests in net6
JoeRobich Nov 25, 2021
a258cd9
Merge pull request #2279 from JoeRobich/vnext-to-net6
filipw Nov 25, 2021
a636a91
added build targets for ARM 64 macOS
filipw Nov 29, 2021
a39c094
Merge pull request #2281 from OmniSharp/feature/omnisharp-vnext-arm64mac
filipw Nov 30, 2021
d848a6a
do not hard crash at startup when no MSBuild found
filipw Nov 30, 2021
690d5f7
Merge pull request #2283 from OmniSharp/feature/omnisharp-vnext-crash
filipw Nov 30, 2021
1282489
Restore the http driver publish
333fred Dec 3, 2021
f217ce4
Merge pull request #2287 from 333fred/restore-http-driver
filipw Dec 3, 2021
9a9e186
restored missing tasks
filipw Dec 3, 2021
7418d84
Merge branch 'feature/omnisharp-vnext' of https://github.com/OmniShar…
filipw Dec 3, 2021
c052881
Merge pull request #2289 from OmniSharp/omnisharp-vnext/missing-tasks
filipw Dec 3, 2021
906bfee
Merge pull request #2284 from OmniSharp/master
filipw Dec 3, 2021
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
2 changes: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ insert_final_newline = true
indent_style = space
indent_size = 4

# CA2254: The logging message template should not vary between calls to 'LoggerExtensions.LogDebug(ILogger, string?, params object?[])'
dotnet_diagnostic.CA2254.severity = none
dotnet_diagnostic.VSTHRD002.severity = none
dotnet_diagnostic.VSTHRD003.severity = none
dotnet_diagnostic.VSTHRD105.severity = none
Expand Down
111 changes: 111 additions & 0 deletions .github/workflows/tests-net6.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@

name: 'Tests net6.0'
env:
DotNetVersion: "6.0.100"
DotNetVersion2: "3.1.415"
NuGetVersion: "5.7.0"
MonoVersion: "6.12.0"
Artifacts: ${{ github.workspace }}/artifacts/
Coverage: ${{ github.workspace }}/coverage/
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
defaults:
run:
shell: pwsh
on:
pull_request:
branches:
- master
- demo/*
- feature/*
tags:
- '*'
workflow_dispatch:
jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-18.04, windows-2019, macos-10.15]
testProjects:
- OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
- OmniSharp.DotNetTest.Tests
name: 'Test'
steps:
- name: Checkout
uses: actions/checkout@v2
with:
clean: 'false'
fetch-depth: '0'

# TODO: Need to figure out the correct way to install mono on linux / mac
# Currently the latest image has mono 6.12
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
# - name: 🔨 Use Mono ${{ env.MonoVersion }} SDK
# uses: maxim-lobanov/setup-xamarin@v1
# with:
# mono-version: ${{ env.MonoVersion }}

- name: Setup NuGet.exe
uses: nuget/setup-nuget@v1
with:
nuget-version: ${{ env.NuGetVersion }}

- name: 🔨 Use .NET Core ${{ env.DotNetVersion2 }} SDK
uses: actions/setup-dotnet@v1.7.2
with:
dotnet-version: ${{ env.DotNetVersion2 }}

- name: 🔨 Use .NET Core ${{ env.DotNetVersion }} SDK
uses: actions/setup-dotnet@v1.7.2
with:
dotnet-version: ${{ env.DotNetVersion }}

- name: 🎁 dotnet tool restore
run: |
dotnet tool restore

- name: 🎁 nuget install
run: |
nuget install tools/packages.config -ExcludeVersion -OutputDirectory tools

# - name: 🍰 Run Cake
# run: |
# dotnet cake --bootstrap
# dotnet cake --configuration=Debug --verbosity=Diagnostic --target=Test --test-project="${{ matrix.testProjects }}"

- name: 🍰 Run Cake
if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }}
uses: nick-invision/retry@v2
with:
shell: bash
timeout_minutes: 40
max_attempts: 3
retry_on: error
command: |
echo $PATH
chmod 755 ./build.sh
./build.sh --configuration Release --verbosity Verbose --target Test --test-project="$TEST_PROJECT" --use-dotnet-test
env:
TEST_PROJECT: ${{ matrix.testProjects }}

- name: 🍰 Run Cake
if: ${{ runner.os == 'Windows' }}
uses: nick-invision/retry@v2
with:
shell: powershell
timeout_minutes: 40
max_attempts: 3
retry_on: error
command: |
.\build.ps1 -configuration Release -verbosity Verbose -target Test --test-project="$ENV:TEST_PROJECT" --use-dotnet-test
env:
TEST_PROJECT: ${{ matrix.testProjects }}

- name: ⬆ Publish Logs
uses: actions/upload-artifact@v2
continue-on-error: true
if: ${{ always() }}
with:
name: 'logs - ${{ github.workflow }} ${{ matrix.os }}'
path: '${{ env.Artifacts }}/logs/'
Loading