Merge pull request #19 from OmniSharp/ready-nuget

Ready nuget, setup travis and a few other things...

Author: david-driscoll

.appveyor.yml

@@ -1,4 +1,9 @@
 image: Visual Studio 2017
+environment:
+  nuget_org_apikey:
+    secure: lFaEHVRMsSWTveDH/DuLl4+hv+O0i4qLkbhW3aCgzq0oCrOuV+0TSEkqe6aiHuNX
+  myget_apikey:
+    secure: eoBrSWDtOXSxyUOoCSTyQCeDkvU18W67pE3w26viEUBRi1K4Tru0cTjUtDUB7l9V
 build_script:
   - ps: .\build.ps1
 test: off
@@ -8,5 +13,31 @@ after_build:
   - codecov -f "./artifacts/coverage/coverage.xml"
 artifacts:
   - path: ./artifacts/nuget/*.nupkg
+cache:
+  - tools -> tools/packages.config
 nuget:
   project_feed: true
+deploy:
+  - provider: NuGet
+    server: https://www.myget.org/F/omnisharp/api/v3/index.json
+    api_key:
+      secure: eoBrSWDtOXSxyUOoCSTyQCeDkvU18W67pE3w26viEUBRi1K4Tru0cTjUtDUB7l9V
+    skip_symbols: true
+    artifact: /.*\.nupkg/
+    on:
+      branch: master
+  - provider: NuGet
+    api_key:
+      secure: lFaEHVRMsSWTveDH/DuLl4+hv+O0i4qLkbhW3aCgzq0oCrOuV+0TSEkqe6aiHuNX
+    skip_symbols: false
+    artifact: /.*\.nupkg/
+    on:
+      appveyor_repo_tag: true
+  - provider: NuGet
+    server: https://www.myget.org/F/omnisharp/api/v3/index.json
+    api_key:
+      secure: eoBrSWDtOXSxyUOoCSTyQCeDkvU18W67pE3w26viEUBRi1K4Tru0cTjUtDUB7l9V
+    skip_symbols: true
+    artifact: /.*\.nupkg/
+    on:
+      appveyor_repo_tag: true

.editorconfig

@@ -1,5 +1,4 @@
 [*]
-end_of_line = crlf
 charset = utf-8
 indent_style = space
 indent_size = 4

.gitignore

@@ -34,4 +34,4 @@ buildlog
 
 # Build folder
 tools/*/
-tools/packages.config.md5sum
+/tools/packages.config.md5sum

.travis.yml

@@ -0,0 +1,15 @@
+language: csharp
+sudo: required
+dist: trusty
+mono: latest
+dotnet: 2.0.0
+os:
+  - linux
+cache:
+  directories:
+    - tools
+git:
+  depth: 1000
+script:
+  - chmod 755 ./build.sh
+  - ./build.sh

build.cake

@@ -14,91 +14,87 @@ Task("Clean")
     CleanDirectory(artifacts);
 });
 
-Task("Restore")
+Task("Restore (Unix)")
+    .WithCriteria(IsRunningOnUnix)
     .Does(() =>
 {
-    DotNetCoreRestore();
+    MSBuild("./LSP.sln", settings => settings.SetConfiguration(configuration).WithTarget("Restore"));
 });
 
-Task("Build")
-    .IsDependentOn("Restore")
+Task("Restore (Windows)")
+    .WithCriteria(IsRunningOnWindows)
     .Does(() =>
 {
-    foreach (var project in GetFiles("src/*/*.csproj").Concat(GetFiles("test/*/*.csproj")))
-        DotNetCoreBuild(project.FullPath, new DotNetCoreBuildSettings
-        {
-            Configuration = configuration,
-            EnvironmentVariables = GitVersionEnvironmentVariables,
-        });
+    DotNetCoreRestore();
 });
 
-Task("Test")
+Task("Restore")
+.IsDependentOn("Restore (Unix)")
+.IsDependentOn("Restore (Windows)");
+
+Task("Build")
+    .IsDependentOn("Restore")
+    .DoesForEach(GetFiles("src/**/*.csproj").Concat(GetFiles("test/**/*.csproj")), (project) =>
+    {
+        MSBuild(project, settings =>
+            settings
+                .SetConfiguration(configuration)
+                .WithTarget("Build"));
+    });
+
+Task("TestSetup")
+    .Does(() => {
+        CleanDirectory(artifacts + "/tests");
+        CleanDirectory(artifacts + "/coverage");
+        EnsureDirectoryExists(artifacts + "/tests");
+        EnsureDirectoryExists(artifacts + "/coverage");
+    });
+
+Task("Test (No Coverage)")
+    .WithCriteria(IsRunningOnUnix)
+    .WithCriteria(false) // TODO: Make work on travis
+    .IsDependentOn("TestSetup")
     .IsDependentOn("Build")
-    .Does(() =>
+    .DoesForEach(GetFiles("test/*/*.csproj"), (testProject) =>
 {
-    EnsureDirectoryExists(artifacts + "/tests");
-    EnsureDirectoryExists(artifacts + "/coverage");
-
-    foreach (var testProject in GetFiles("test/*/*.csproj")) {
-        StartProcess("dotnet", new ProcessSettings() {
-            WorkingDirectory = testProject.GetDirectory(),
+    DotNetCoreTest(
+        testProject.GetDirectory().FullPath,
+        new DotNetCoreTestSettings() {
+            NoBuild = true,
+            Framework = "netcoreapp2.0",
             EnvironmentVariables = GitVersionEnvironmentVariables,
-            Arguments = new ProcessArgumentBuilder()
-                .Append("xunit")
-                .Append("-noshadow")
-                .AppendSwitch("-configuration", configuration)
-                .AppendSwitchQuotedSecret("-xml", string.Format("{0}/tests/{1}.xml", artifacts, testProject.GetFilenameWithoutExtension()))
-                .AppendSwitchQuotedSecret("-html", string.Format("{0}/tests/{1}.html", artifacts, testProject.GetFilenameWithoutExtension()))
-        });
-    }
+    });
 });
 
-Task("Coverage")
-    //.IsDependentOn("Build")
-    .Does(() =>
+Task("Test (Coverage)")
+    .WithCriteria(IsRunningOnWindows)
+    .IsDependentOn("TestSetup")
+    .IsDependentOn("Build")
+    .DoesForEach(GetFiles("test/*/*.csproj"), (testProject) =>
 {
-    CleanDirectory(artifacts + "/coverage");
-    EnsureDirectoryExists(artifacts + "/coverage");
-
-    foreach (var testProject in GetFiles("test/*/*.csproj")) {
-        DotCoverCover(tool => {
-            // tool.XUnit2()
-                // tool.StartProcess(Context.Tools.Resolve("dotnet.exe"), new ProcessSettings() {
-                //     WorkingDirectory = testProject.GetDirectory(),
-                //     Arguments = new ProcessArgumentBuilder()
-                //         .Append("test")
-                //         .AppendSwitch("-c", configuration)
-                //         .Append("--no-build")
-                //         .Append("-f net46")
-                // });
-                tool.StartProcess(Context.Tools.Resolve("dotnet.exe"), new ProcessSettings() {
-                    WorkingDirectory = testProject.GetDirectory(),
-                    EnvironmentVariables = GitVersionEnvironmentVariables,
-                    Arguments = new ProcessArgumentBuilder()
-                        .Append("xunit")
-                        .Append("-noshadow")
-                        .Append("-noautoreporters")
-                        // .AppendSwitch("-maxthreads", "1")
-                        .AppendSwitch("-configuration", configuration)
-                        .AppendSwitch("-framework", "net46")
-                        .AppendSwitchQuotedSecret("-xml", string.Format("{0}/tests/{1}.xml", artifacts, testProject.GetFilenameWithoutExtension()))
-                        .AppendSwitchQuotedSecret("-html", string.Format("{0}/tests/{1}.html", artifacts, testProject.GetFilenameWithoutExtension()))
-                });
-            },
-            artifacts + "/coverage/coverage-"+ testProject.GetFilenameWithoutExtension() + ".dcvr",
-            new DotCoverCoverSettings() {
-                    // Register = "user",
-                    // MergeOutput = true,
-                    // OldStyle = true,
-                    TargetWorkingDir = testProject.GetDirectory(),
-                    WorkingDirectory = testProject.GetDirectory(),
-                    // ReportType = DotCoverReportType.XML
-                }
-                .WithFilter("+:JsonRpc")
-                .WithFilter("+:Lsp")
-        );
-    }
-
+    DotCoverCover(tool => {
+        tool.DotNetCoreTool(
+            testProject.GetDirectory().FullPath,
+            "xunit",
+            new ProcessArgumentBuilder()
+                .AppendSwitchQuoted("-xml", string.Format("{0}/tests/{1}.xml", artifacts, testProject.GetFilenameWithoutExtension()))
+                .AppendSwitch("-configuration", configuration)
+                .Append("-noshadow"),
+            new DotNetCoreToolSettings() {
+                EnvironmentVariables = GitVersionEnvironmentVariables,
+            });
+        },
+        artifacts + "/coverage/coverage-"+ testProject.GetFilenameWithoutExtension() + ".dcvr",
+        new DotCoverCoverSettings() {
+                TargetWorkingDir = testProject.GetDirectory(),
+                WorkingDirectory = testProject.GetDirectory(),
+                EnvironmentVariables = GitVersionEnvironmentVariables,
+            }
+            .WithFilter("+:JsonRpc")
+            .WithFilter("+:Lsp")
+    );
+})
+.Finally(() => {
     DotCoverMerge(
         GetFiles(artifacts + "/coverage/*.dcvr"),
         artifacts + "/coverage/coverage.dcvr"
@@ -124,18 +120,22 @@ Task("Coverage")
     System.IO.File.WriteAllText(artifacts + "/coverage/coverage.xml", withBom.Replace(_byteOrderMarkUtf8, ""));
 });
 
+Task("Test")
+    .IsDependentOn("Test (Coverage)")
+    .IsDependentOn("Test (No Coverage)");
+
 Task("Pack")
+    .WithCriteria(IsRunningOnWindows) // TODO: Make work on travis
     .IsDependentOn("Build")
-    .Does(() => {
-        EnsureDirectoryExists(artifacts + "/nuget");
-        foreach (var project in GetFiles("src/*/*.csproj"))
-            DotNetCorePack(project.FullPath, new DotNetCorePackSettings
-            {
-                NoBuild = true,
-                Configuration = configuration,
-                EnvironmentVariables = GitVersionEnvironmentVariables,
-                OutputDirectory = artifacts + "/nuget"
-            });
+    .Does(() => EnsureDirectoryExists(artifacts + "/nuget"))
+    .DoesForEach(GetFiles("src/*/*.csproj"), (project) => {
+        DotNetCorePack(project.FullPath, new DotNetCorePackSettings
+        {
+            NoBuild = true,
+            Configuration = configuration,
+            EnvironmentVariables = GitVersionEnvironmentVariables,
+            OutputDirectory = artifacts + "/nuget"
+        });
     });
 
 Task("GitVersion")
@@ -150,7 +150,6 @@ Task("Default")
     .IsDependentOn("Clean")
     .IsDependentOn("Build")
     .IsDependentOn("Test")
-    .IsDependentOn("Coverage")
     .IsDependentOn("Pack");
 
 RunTarget(target);

build.ps1

@@ -21,13 +21,9 @@ The build script target to run.
 The build configuration to use.
 .PARAMETER Verbosity
 Specifies the amount of information to be displayed.
-.PARAMETER Experimental
-Tells Cake to use the latest Roslyn release.
 .PARAMETER WhatIf
 Performs a dry run of the build script.
 No tasks will be executed.
-.PARAMETER Mono
-Tells Cake to use the Mono scripting engine.
 .PARAMETER SkipToolPackageRestore
 Skips restoring of packages.
 .PARAMETER ScriptArgs
@@ -47,10 +43,8 @@ Param(
     [string]$Configuration = "Release",
     [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
     [string]$Verbosity = "Verbose",
-    [switch]$Experimental = $true,
     [Alias("DryRun","Noop")]
     [switch]$WhatIf,
-    [switch]$Mono,
     [switch]$SkipToolPackageRestore,
     [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
     [string[]]$ScriptArgs
@@ -94,20 +88,6 @@ $NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
 $PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
 $PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
 
-# Should we use mono?
-$UseMono = "";
-if($Mono.IsPresent) {
-    Write-Verbose -Message "Using the Mono based scripting engine."
-    $UseMono = "-mono"
-}
-
-# Should we use the new Roslyn?
-$UseExperimental = "";
-if($Experimental.IsPresent -and !($Mono.IsPresent)) {
-    Write-Verbose -Message "Using experimental version of Roslyn."
-    $UseExperimental = "-experimental"
-}
-
 # Is this a dry run?
 $UseDryRun = "";
 if($WhatIf.IsPresent) {
@@ -186,5 +166,5 @@ if (!(Test-Path $CAKE_EXE)) {
 
 # Start Cake
 Write-Host "Running build script..."
-Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
+Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseDryRun $ScriptArgs"
 exit $LASTEXITCODE

build.sh

@@ -54,7 +54,7 @@ fi
 # Make sure that packages.config exist.
 if [ ! -f "$TOOLS_DIR/packages.config" ]; then
     echo "Downloading packages.config..."
-    curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/download/bootstrapper/packages
+    curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages
     if [ $? -ne 0 ]; then
         echo "An error occured while downloading packages.config."
         exit 1

cake.config

@@ -0,0 +1,6 @@
+[Paths]
+Tools=./tools
+Addins=./tools
+[Nuget]
+UseInprocessClient=true
+LoadDependencies=true

sample/SampleServer/Program.cs

@@ -1,12 +1,13 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using JsonRpc;
-using Lsp;
-using Lsp.Capabilities.Client;
-using Lsp.Capabilities.Server;
-using Lsp.Models;
-using Lsp.Protocol;
+using OmniSharp.Extensions.LanguageServer;
+using OmniSharp.Extensions.LanguageServer.Abstractions;
+using OmniSharp.Extensions.LanguageServer.Capabilities.Client;
+using OmniSharp.Extensions.LanguageServer.Capabilities.Server;
+using OmniSharp.Extensions.LanguageServer.Models;
+using OmniSharp.Extensions.LanguageServer.Protocol;
+using OmniSharp.Extensions.LanguageServer.Protocol.Document;
 
 namespace SampleServer
 {
@@ -120,4 +121,4 @@ public TextDocumentAttributes GetTextDocumentAttributes(Uri uri)
             return new TextDocumentAttributes(uri, "csharp");
         }
     }
-}
+}

sample/SampleServer/SampleServer.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp1.1</TargetFramework>
+        <TargetFramework>netcoreapp2.0</TargetFramework>
         <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
     </PropertyGroup>