diff --git a/.travis.yml b/.travis.yml index e557449..0a7016c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,38 +1,12 @@ -language: csharp -sudo: required +language: csharp dist: trusty -env: - - CLI_VERSION=latest -addons: - apt: - sources: - - sourceline: 'deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main' - key_url: 'https://apt-mo.trafficmanager.net/keys/microsoft.asc' - packages: - - gettext - - libcurl4-openssl-dev - - libicu-dev - - libssl-dev - - libunwind8 - - zlib1g - - dotnet-dev-1.0.1 -mono: - - latest +mono: latest +dotnet: 1.0.1 os: - linux - - osx -osx_image: xcode7.1 + - osx branches: only: - master -before_install: - - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; 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/; fi script: - ./build.sh - -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ diff --git a/build.cake b/build.cake index fd2720f..60b002f 100644 --- a/build.cake +++ b/build.cake @@ -153,7 +153,7 @@ Task("Pack") // The default task to run if none is explicitly specified. In this case, we want // to run everything starting from Clean, all the way up to Pack. Task("Default") - .IsDependentOn("Pack"); + .IsDependentOn("Build"); // Executes the task specified in the target argument. RunTarget(target); \ No newline at end of file diff --git a/src/FRC.NetworkTables.Core/FRC.NetworkTables.Core.csproj b/src/FRC.NetworkTables.Core/FRC.NetworkTables.Core.csproj index daaa059..df5c681 100644 --- a/src/FRC.NetworkTables.Core/FRC.NetworkTables.Core.csproj +++ b/src/FRC.NetworkTables.Core/FRC.NetworkTables.Core.csproj @@ -1,4 +1,9 @@ - + + + junk-value-to-avoid-conflicts + + + NetworkTables using the ntcore library. @@ -49,4 +54,10 @@ $(DefineConstants);NETSTANDARD - + + + + + + + \ No newline at end of file