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

Remove MSBuild and Mono from release packages #2360

Merged
merged 26 commits into from
Mar 25, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cd4de6d
Remove MSBuild and Mono from release packages
JoeRobich Feb 19, 2022
bfa5b55
Fix publishing errors.
JoeRobich Mar 17, 2022
4689758
Update vm images used in CI
JoeRobich Mar 18, 2022
6e017f8
Remove reference to `omnisharp.useGlobalMono` from messages
JoeRobich Mar 18, 2022
1be42f3
Remove `UseBundledOnly` MSBuild Option.
JoeRobich Mar 18, 2022
b1fe1e6
Adjust project capabilities test
JoeRobich Mar 18, 2022
556b29f
Include SQLitePCLRaw in .NET Framework test output
JoeRobich Mar 18, 2022
bd23d5a
Fix test
JoeRobich Mar 18, 2022
c0cdf55
Simplify getting MSBuildLocator in tests
JoeRobich Mar 20, 2022
784f2a7
Merge branch 'master' into remove-tooling
JoeRobich Mar 20, 2022
d34a431
Restore Mono test behavior
JoeRobich Mar 20, 2022
6071873
Merge branch 'remove-tooling' of github.com:JoeRobich/omnisharp-rosly…
JoeRobich Mar 20, 2022
ca1a590
Copy only the necessary MSBuild libraries
JoeRobich Mar 20, 2022
b0eb7d6
Copy Mono MSBuild files when testing but do not overwrite
JoeRobich Mar 20, 2022
78bdcc4
Copy SQLite libraries during Mono tests
JoeRobich Mar 20, 2022
3ccc284
Run OmniSharpMSBuild.Tests on Mono in CI
JoeRobich Mar 20, 2022
9855687
Remove unused code
JoeRobich Mar 20, 2022
1bb8c93
Skip NET5+ MSBuild tests against Mono
JoeRobich Mar 20, 2022
097a354
Restore run script in Mono O# packages
JoeRobich Mar 21, 2022
c24a1e0
Add warning when using deprecated 'UseBundledOnly' option
JoeRobich Mar 24, 2022
f176822
Create logger before using it.
JoeRobich Mar 24, 2022
c38a67f
Use nullable type for option value.
JoeRobich Mar 24, 2022
c662bba
Parse option as a string
JoeRobich Mar 24, 2022
8201fef
Pass default value when getting option
JoeRobich Mar 24, 2022
18bc3ba
Handle null configuration
JoeRobich Mar 24, 2022
24c0c0f
Update changelog
JoeRobich Mar 24, 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
Prev Previous commit
Next Next commit
Update vm images used in CI
  • Loading branch information
JoeRobich committed Mar 18, 2022
commit 468975824727b7688e660e170417c826342410ec
74 changes: 64 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-18.04, windows-2019, macos-10.15]
# TODO: mono 6.12 is installed on ubuntu and macos images, but ships with MSBuild 16.6.
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
os: [ubuntu-20.04, windows-2022, macos-11]
testProjects:
- OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
- OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
- OmniSharp.DotNetTest.Tests
name: 'Test'
steps:
Expand All @@ -37,14 +39,6 @@ jobs:
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:
Expand Down Expand Up @@ -108,3 +102,63 @@ jobs:
with:
name: 'logs - ${{ github.workflow }} ${{ matrix.os }}'
path: '${{ env.Artifacts }}/logs/'

test-msbuild:
# Limit the .NET Framework OmniSharp.MSBuild.Tests to the Windows Platform,
# since we have access to a MSBuild newer than version 16.6.
runs-on: windows-2022
strategy:
fail-fast: false
matrix:
testProjects:
- OmniSharp.MSBuild.Tests
name: 'Test'
steps:
- name: Checkout
uses: actions/checkout@v2
with:
clean: 'false'
fetch-depth: '0'

- 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
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"
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/'
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- job: macOS
pool:
vmImage: "macOS-10.15"
vmImage: "macOS-11"
dependsOn: GitVersion
steps:
- template: ./.pipelines/init.yml
Expand All @@ -74,7 +74,7 @@ jobs:

- job: Linux
pool:
vmImage: "ubuntu-18.04"
vmImage: "ubuntu-20.04"
dependsOn: GitVersion
steps:
- template: ./.pipelines/init.yml
Expand All @@ -94,7 +94,7 @@ jobs:

- job: Windows
pool:
vmImage: "windows-2019"
vmImage: "windows-2022"
dependsOn: GitVersion
steps:
- template: ./.pipelines/init.yml
Expand Down