Merge pull request #978 from DustinCampbell/fix-build

Pin .NET Core SDK and fix Travis OSX build

.travis.yml

@@ -5,7 +5,6 @@ env:
   global:
     secure: m2PtYwYOhaK0uFMZ19ZxApZwWZeAIq1dS//jx/5I3txpIWD+TfycQMAWYxycFJ/GJkeVF29P4Zz1uyS2XKKjPJpp2Pds98FNQyDv3OftpLAVa0drsjfhurVlBmSdrV7GH6ncKfvhd+h7KVK5vbZc+NeR4dH7eNvN/jraS//AMJg=
 mono: latest
-dotnet: 2.0.0
 os:
   - linux
   - osx
@@ -39,9 +38,20 @@ install:
       sudo rm -rf /usr/local/src/libuv-1.14.0
       sudo ldconfig
     elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      brew update
+
+      # Need to install openssl for .NET Core SDK 1.0 (legacy tests)
+      brew install openssl
+      mkdir -p /usr/local/lib
+      ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/
+      ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/
+
       brew install libuv
     fi
 
+  - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+  - export PATH="$PWD/.dotnet:$PATH"
+
 notifications:
   slack:
     rooms:

build.cake

@@ -97,7 +97,7 @@ Task("Setup")
     .IsDependentOn("InstallMonoAssets")
     .IsDependentOn("CreateMSBuildFolder");
 
-void InstallDotNetSdk(BuildEnvironment env, BuildPlan plan, string version, string installFolder, bool sharedRuntime = false)
+void InstallDotNetSdk(BuildEnvironment env, BuildPlan plan, string version, string installFolder, bool sharedRuntime = false, bool noPath = false)
 {
     if (!DirectoryHelper.Exists(installFolder))
     {
@@ -137,6 +137,11 @@ void InstallDotNetSdk(BuildEnvironment env, BuildPlan plan, string version, stri
         argList.Add("-SharedRuntime");
     }
 
+    if (noPath)
+    {
+        argList.Add("-NoPath");
+    }
+
     Run(env.ShellCommand, $"{env.ShellArgument} {scriptFilePath} {string.Join(" ", argList)}").ExceptionOnError($"Failed to Install .NET Core SDK {version}");
 }
 
@@ -163,7 +168,8 @@ Task("InstallDotNetCoreSdk")
         // Install legacy .NET Core SDK (used to 'dotnet restore' project.json test projects)
         InstallDotNetSdk(env, buildPlan,
             version: buildPlan.LegacyDotNetVersion,
-            installFolder: env.Folders.LegacyDotNetSdk);
+            installFolder: env.Folders.LegacyDotNetSdk,
+            noPath: true);
     }
 
     Run(env.DotNetCommand, "--info");

global.json

@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "2.0.0"
+    }
+}