Merge pull request #915 from DustinCampbell/net46-only

Move OmniSharp to target net46 only

.gitignore

@@ -31,6 +31,7 @@ buildlog
 /omnisharp*.tar.gz
 scripts/Omnisharp*
 .msbuild-*/
+.msbuild/
 
 # NuGet
 *.nuget.targets
@@ -39,6 +40,7 @@ scripts/Omnisharp*
 .dotnet/
 .dotnet-legacy/
 .dotnet-future/
+.mono/
 tools/*
 !tools/packages.config
 

.travis.yml

@@ -12,7 +12,7 @@ os:
 osx_image: xcode7.3
 
 script:
-  - ./build.sh --target All --archive
+  - ./build.sh --target All --publish-all --archive
 
 addons:
   apt:
@@ -33,6 +33,18 @@ notifications:
     on_failure: always
     on_pull_requests: false
 
+before_deploy:
+  - |
+    # Only deploy OSX-specific OmniSharp from the OSX.
+    # All other builds should be deployed by Linux CI.
+    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      rm artifacts/package/omnisharp-osx.tar.gz
+    elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      rm artifacts/package/mono.tar.gz
+      rm artifacts/package/omnisharp-linux-x86.tar.gz
+      rm artifacts/package/omnisharp-linux-x64.tar.gz
+    fi
+
 deploy:
   provider: releases
   api_key:

BUILD.md

@@ -28,6 +28,8 @@ All build related activites should be encapsulated in this file for cross-platfo
 
 # Arguments
 
+Note: The arguments below should prefixed with a single hyphen on Windows (PowerShell-style) and a double-hyphen on OSX/Linux.
+
   `-target TargetName`: The name of the build task/target to execute (see below for listing and details).
     Defaults to `Default`.
 
@@ -38,21 +40,19 @@ All build related activites should be encapsulated in this file for cross-platfo
     Defaults to `Debug`.
 
   `-install-path Path`: Path used for the **Install** target.
-    Defaults to `(%USERPROFILE%|$HOME)/.omnisharp/local`
+    Defaults to `(%USERPROFILE%|$HOME)/.omnisharp`
+
+  `-all-publish`: Publishes all platforms for the current OS. On Windows, specifying this argument would produce win7-x86 and win7-x64 builds. On OSX/Linux, this argument causes osx, linux-x86, and linux-x64 builds to be published.
 
   `-archive`: Enable the generation of publishable archives after a build.
 
 Note: On macOS/Linux, be sure to pass the arguments above with double slashes! (e.g. `--target TargetName`).
 
 # Targets
 
-**Default**: Alias for Local.
-
-**Local**: Full build including testing for the machine-local runtime.
+**Default**: Alias for All.
 
-**All**: Same as local, but targeting all runtimes selected by `PopulateRuntimes` in `build.cake`.
-  Currently configured to also build for a 32-bit Windows runtime on Windows machines.
-  No additional runtimes are currently selected on non-Windows machines.
+**All**: Full build including testing.
 
 **Quick**: Local build which skips all testing.
 
@@ -76,10 +76,9 @@ A number of build-related options, including folder names for different entities
 
 # Artifacts generated
 
-* Binaries of OmniSharp and its libraries built for the local machine in `artifacts/publish/OmniSharp/default/{framework}/`
+* OmniSharp binaries for specified runtimes `artifacts/publish/OmniSharp/{platform}/`
 * Scripts to run OmniSharp at `scripts/OmniSharp(.Core)(.cmd)`
   * These scripts are updated for every build and every install.
   * The scripts point to the installed binary after and install, otherwise just the build folder (reset if a new build occurs without an install).
-* Binaries of OmniSharp and its libraries cross-compiled for other runtimes (if selected in **PopulateRuntimes**) `artifacts/publish/OmniSharp/{runtime}/{framework}/`
 * Test logs in `artifacts/logs`
 * Archived binaries in `artifacts/package` (only if `-archive` used on command line)

appveyor.yml

@@ -3,7 +3,7 @@ init:
   - git config --global core.autocrlf true
 test: off # this turns of AppVeyor automatic searching for test-assemblies, not the actual testing
 build_script:
-  - ps: .\build.ps1 All -archive
+  - ps: .\build.ps1 All -publish-all -archive
 artifacts:
   - path: artifacts/package/*.zip
 deploy: