Update the dependencies to rc2 packages

Update both the DNX and CoreCLR dependencies to rc2 packages. 1) Update all projects' project.json files 2) Update Travis settings: a) Install libunwind8 b) Request mono 4.2.1 c) Install jq on osx through homebrew 3) Fix and skip some tests after upgrade: a) NRefactory dependency is removed therefore some tests are skipped b) 4) Make some code changes: a) Support new end point behavior b) Add System.Runtim to bootstrap c) Enabled assembly loading for coreclr, this enables metadata and more code actions when running on the coreclr 5) Update build scripts: a) Fixed possible null reference error in nuget packaging b) Run tests for both clr/mono and coreclr c) More error handling d) Ensure we use the coreclr for the first set of tests e) Install dnx from aspnetcidev feed f) Update build to track versions
OmniSharp · Jan 5, 2016 · e123780 · e123780
1 parent a92f0f5
commit e123780
Show file tree

Hide file tree

Showing 110 changed files with 1,271 additions and 939 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,17 @@
 language: csharp
-sudo: false
+sudo: required
+dist: trusty
 env:
   global:
     secure: m2PtYwYOhaK0uFMZ19ZxApZwWZeAIq1dS//jx/5I3txpIWD+TfycQMAWYxycFJ/GJkeVF29P4Zz1uyS2XKKjPJpp2Pds98FNQyDv3OftpLAVa0drsjfhurVlBmSdrV7GH6ncKfvhd+h7KVK5vbZc+NeR4dH7eNvN/jraS//AMJg=
+mono:
+  - 4.2.1
+os:
+  - linux
+  - osx
+before_install:
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install jq; fi
 install: curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh
   | sh && source ~/.dnx/dnvm/dnvm.sh && dnvm upgrade
 before_script:
@@ -12,6 +21,12 @@ script:
 addons:
   apt:
     packages:
+      - gettext
+      - libcurl4-openssl-dev
+      - libicu-dev
+      - libssl-dev
+      - libunwind8
+      - zlib1g
       - curl
       - tree
 before_deploy:

diff --git a/NuGet.Config b/NuGet.Config
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <clear />
-    <add key="OmniSharp" value="https://www.myget.org/F/omnisharp/api/v2" />
     <add key="AspNetMaster" value="https://www.myget.org/F/aspnetmaster/api/v2" />
     <add key="AspNetRelease" value="https://www.myget.org/F/aspnetrelease/api/v2" />
+    <clear />
+    <add key="AspNetDev" value="https://www.myget.org/F/aspnetcidev/api/v2" />
+    <add key="OmniSharp" value="https://www.myget.org/F/omnisharp/api/v2" />
     <add key="XunitMyGet" value="https://www.myget.org/F/xunit/api/v2" />
     <add key="NuGet.org2" value="https://nuget.org/api/v2/" />
     <add key="NuGetBuild" value="https://www.myget.org/F/nugetbuild/api/v2" />

diff --git a/OmniSharp.sln b/OmniSharp.sln
@@ -1,12 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2C348365-A9D8-459E-9276-56FC46AAEE31}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OmniSharp", "src\OmniSharp\OmniSharp.xproj", "{127F86A9-DAE8-4510-BDEE-6F3DE8C9545A}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{07464F68-2D8E-45E5-B30A-768FCF4CC903}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -42,16 +40,28 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OmniSharp.MSBuild", "src\Om
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OmniSharp.ScriptCs", "src\OmniSharp.ScriptCs\OmniSharp.ScriptCs.xproj", "{F52F6F60-AB29-414D-A24B-DE8EFFBA34C0}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OmniSharp", "src\OmniSharp.Host\OmniSharp.xproj", "{127F86A9-DAE8-4510-BDEE-6F3DE8C9545A}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OmniSharp.Bootstrap", "src\OmniSharp.Bootstrap\OmniSharp.Bootstrap.xproj", "{664A740A-D0E1-4E1E-B4C9-CAD5236FA3CA}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OmniSharp.Bootstrap.Tests", "tests\OmniSharp.Bootstrap.Tests\OmniSharp.Bootstrap.Tests.xproj", "{690F50E5-49AC-4F3B-9D0C-52FA68C77F52}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OmniSharp.Dnx.Tests", "tests\OmniSharp.Dnx.Tests\OmniSharp.Dnx.Tests.xproj", "{C3AB0A0C-D850-40AF-874D-805C5948FE25}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OmniSharp.MSBuild.Tests", "tests\OmniSharp.MSBuild.Tests\OmniSharp.MSBuild.Tests.xproj", "{194A88AE-1429-416B-86C1-BF6F7FF47404}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OmniSharp.Plugins.Tests", "tests\OmniSharp.Plugins.Tests\OmniSharp.Plugins.Tests.xproj", "{6F106525-6FB0-4D42-9508-89E49AF82670}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OmniSharp.ScriptCs.Tests", "tests\OmniSharp.ScriptCs.Tests\OmniSharp.ScriptCs.Tests.xproj", "{D8A703BC-F968-4533-9943-2786B64BEC26}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OmniSharp.Roslyn.CSharp.Tests", "tests\OmniSharp.Roslyn.CSharp.Tests\OmniSharp.Roslyn.CSharp.Tests.xproj", "{2F4B72DA-FC27-4676-8E89-7BAC2EFDF750}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{127F86A9-DAE8-4510-BDEE-6F3DE8C9545A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{127F86A9-DAE8-4510-BDEE-6F3DE8C9545A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{127F86A9-DAE8-4510-BDEE-6F3DE8C9545A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{127F86A9-DAE8-4510-BDEE-6F3DE8C9545A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9485FB0D-D105-4E11-8689-97613144D165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9485FB0D-D105-4E11-8689-97613144D165}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9485FB0D-D105-4E11-8689-97613144D165}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -96,12 +106,43 @@ Global
 		{F52F6F60-AB29-414D-A24B-DE8EFFBA34C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F52F6F60-AB29-414D-A24B-DE8EFFBA34C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F52F6F60-AB29-414D-A24B-DE8EFFBA34C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{127F86A9-DAE8-4510-BDEE-6F3DE8C9545A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{127F86A9-DAE8-4510-BDEE-6F3DE8C9545A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{127F86A9-DAE8-4510-BDEE-6F3DE8C9545A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{127F86A9-DAE8-4510-BDEE-6F3DE8C9545A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{664A740A-D0E1-4E1E-B4C9-CAD5236FA3CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{664A740A-D0E1-4E1E-B4C9-CAD5236FA3CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{664A740A-D0E1-4E1E-B4C9-CAD5236FA3CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{664A740A-D0E1-4E1E-B4C9-CAD5236FA3CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{690F50E5-49AC-4F3B-9D0C-52FA68C77F52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{690F50E5-49AC-4F3B-9D0C-52FA68C77F52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{690F50E5-49AC-4F3B-9D0C-52FA68C77F52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{690F50E5-49AC-4F3B-9D0C-52FA68C77F52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3AB0A0C-D850-40AF-874D-805C5948FE25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3AB0A0C-D850-40AF-874D-805C5948FE25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3AB0A0C-D850-40AF-874D-805C5948FE25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3AB0A0C-D850-40AF-874D-805C5948FE25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{194A88AE-1429-416B-86C1-BF6F7FF47404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{194A88AE-1429-416B-86C1-BF6F7FF47404}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{194A88AE-1429-416B-86C1-BF6F7FF47404}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{194A88AE-1429-416B-86C1-BF6F7FF47404}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F106525-6FB0-4D42-9508-89E49AF82670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F106525-6FB0-4D42-9508-89E49AF82670}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F106525-6FB0-4D42-9508-89E49AF82670}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F106525-6FB0-4D42-9508-89E49AF82670}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8A703BC-F968-4533-9943-2786B64BEC26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8A703BC-F968-4533-9943-2786B64BEC26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8A703BC-F968-4533-9943-2786B64BEC26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8A703BC-F968-4533-9943-2786B64BEC26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F4B72DA-FC27-4676-8E89-7BAC2EFDF750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F4B72DA-FC27-4676-8E89-7BAC2EFDF750}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F4B72DA-FC27-4676-8E89-7BAC2EFDF750}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F4B72DA-FC27-4676-8E89-7BAC2EFDF750}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{127F86A9-DAE8-4510-BDEE-6F3DE8C9545A} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 		{9485FB0D-D105-4E11-8689-97613144D165} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
 		{A4F5FE6B-D3B4-4B63-A949-44E12AB8D535} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 		{AB5A975C-378B-45DC-AD69-50D808338AC2} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
@@ -113,5 +154,13 @@ Global
 		{4F5FC4AF-3977-4ECB-9B58-D16E8024BC97} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 		{9AF025CA-3706-401F-8D50-59FAD5AFE725} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 		{F52F6F60-AB29-414D-A24B-DE8EFFBA34C0} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
+		{127F86A9-DAE8-4510-BDEE-6F3DE8C9545A} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
+		{664A740A-D0E1-4E1E-B4C9-CAD5236FA3CA} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
+		{690F50E5-49AC-4F3B-9D0C-52FA68C77F52} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
+		{C3AB0A0C-D850-40AF-874D-805C5948FE25} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
+		{194A88AE-1429-416B-86C1-BF6F7FF47404} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
+		{6F106525-6FB0-4D42-9508-89E49AF82670} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
+		{D8A703BC-F968-4533-9943-2786B64BEC26} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
+		{2F4B72DA-FC27-4676-8E89-7BAC2EFDF750} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
 	EndGlobalSection
 EndGlobal
diff --git a/build.cmd b/build.cmd
@@ -2,7 +2,7 @@
 
 pushd %~dp0
 
-set "DNX_FEED=https://www.nuget.org/api/v2"
+set "DNX_UNSTABLE_FEED=https://www.myget.org/F/aspnetcidev/api/v2"
 setlocal EnableDelayedExpansion
 where dnvm
 if %ERRORLEVEL% neq 0 (
@@ -15,77 +15,116 @@ if %ERRORLEVEL% neq 0 (
 :install
 rmdir /s /q artifacts
 set
-call dnvm install 1.0.0-beta4
-call dnvm use 1.0.0-beta4
-rem set the runtime path because the above commands set \.dnx<space>\runtimes
-set PATH=!USERPROFILE!\.dnx\runtimes\dnx-clr-win-x86.1.0.0-beta4\bin;!PATH!
+call dnvm update-self
+call dnvm upgrade -u
+call dnvm upgrade -u -r coreclr
 
 call dnu restore
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 pushd tests\OmniSharp.Bootstrap.Tests
-call dnx . test
+call dnx test
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd
 
 pushd tests\OmniSharp.Dnx.Tests
-call dnx . test
+call dnx test
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd
 
-pushd tests\OmniSharp.MSBuild.Tests
-call dnx . test
+pushd tests\OmniSharp.Plugins.Tests
+call dnx test
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd
 
-pushd tests\OmniSharp.Plugins.Tests
-call dnx . test
+pushd tests\OmniSharp.Roslyn.CSharp.Tests
+call dnx test -parallel none
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd
 
-pushd tests\OmniSharp.Roslyn.CSharp.Tests
-call dnx . test
+pushd tests\OmniSharp.Stdio.Tests
+call dnx test
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd
 
-pushd tests\OmniSharp.ScriptCs.Tests
-call dnx . test
+pushd tests\OmniSharp.Tests
+call dnx test
+if %errorlevel% neq 0 exit /b %errorlevel%
+popd
+
+call dnvm upgrade -u -r clr
+
+pushd tests\OmniSharp.Bootstrap.Tests
+call dnx test
+if %errorlevel% neq 0 exit /b %errorlevel%
+popd
+
+pushd tests\OmniSharp.Dnx.Tests
+call dnx test
+if %errorlevel% neq 0 exit /b %errorlevel%
+popd
+
+pushd tests\OmniSharp.Plugins.Tests
+call dnx test
+if %errorlevel% neq 0 exit /b %errorlevel%
+popd
+
+pushd tests\OmniSharp.Roslyn.CSharp.Tests
+call dnx test -parallel none
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd
 
 pushd tests\OmniSharp.Stdio.Tests
-call dnx . test
+call dnx test
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd
 
 pushd tests\OmniSharp.Tests
-call dnx . test
+call dnx test
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd
 
-pushd tests\OmniSharp.Tests
-call dnx . test
+pushd tests\OmniSharp.MSBuild.Tests
+call dnx test
+if %errorlevel% neq 0 exit /b %errorlevel%
+popd
+
+pushd tests\OmniSharp.ScriptCs.Tests
+call dnx test
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd
 
+call dnvm upgrade -u -r coreclr
+
 rem call dnu pack src\OmniSharp.Host --configuration Release --out artifacts\build\nuget
+rem if %errorlevel% neq 0 exit /b %errorlevel%
 rem call dnu pack src\OmniSharp.Abstractions --configuration Release --out artifacts\build\nuget
+rem if %errorlevel% neq 0 exit /b %errorlevel%
 rem call dnu pack src\OmniSharp.Bootstrap --configuration Release --out artifacts\build\nuget
+rem if %errorlevel% neq 0 exit /b %errorlevel%
 rem call dnu pack src\OmniSharp.Dnx --configuration Release --out artifacts\build\nuget
+rem if %errorlevel% neq 0 exit /b %errorlevel%
 rem call dnu pack src\OmniSharp.MSBuild --configuration Release --out artifacts\build\nuget
+rem if %errorlevel% neq 0 exit /b %errorlevel%
 rem call dnu pack src\OmniSharp.Nuget --configuration Release --out artifacts\build\nuget
+rem if %errorlevel% neq 0 exit /b %errorlevel%
 rem call dnu pack src\OmniSharp.Roslyn --configuration Release --out artifacts\build\nuget
+rem if %errorlevel% neq 0 exit /b %errorlevel%
 rem call dnu pack src\OmniSharp.Roslyn.CSharp --configuration Release --out artifacts\build\nuget
+rem if %errorlevel% neq 0 exit /b %errorlevel%
 rem call dnu pack src\OmniSharp.ScriptCs --configuration Release --out artifacts\build\nuget
+rem if %errorlevel% neq 0 exit /b %errorlevel%
 rem call dnu pack src\OmniSharp.Stdio --configuration Release --out artifacts\build\nuget
+rem if %errorlevel% neq 0 exit /b %errorlevel%
 
-rem call dnu publish artifacts\OmniSharp --configuration Release --no-source --out artifacts\build\omnisharp --runtime dnx-clr-win-x86.1.0.0-beta4
+rem call dnu publish artifacts\OmniSharp --configuration Release --no-source --out artifacts\build\omnisharp --runtime active
+rem if %errorlevel% neq 0 exit /b %errorlevel%
 
 rem pushd artifacts\build\omnisharp
 rem call tar -zcf ..\..\..\omnisharp.tar.gz .
 rem popd
 
-rem call dnu publish src\OmniSharp.Bootstrap --configuration Release --no-source --out artifacts\build\omnisharp.bootstrap --runtime dnx-clr-win-x86.1.0.0-beta4
+rem call dnu publish src\OmniSharp.Bootstrap --configuration Release --no-source --out artifacts\build\omnisharp.bootstrap --runtime active
 
 rem pushd artifacts\build\omnisharp.bootstrap
 rem call tar -zcf ..\..\..\omnisharp.bootstrap.tar.gz .