diff --git a/.gitignore b/.gitignore index 361e1e1f..7856d7df 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,7 @@ postbuild.bat ################## *.dotCover _ReSharper.* + +# GTFO NuGet stuff # +#################### +packages/* diff --git a/.travis.yml b/.travis.yml index afa70824..f1d766dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: csharp solution: ./TShockAPI/TShockAPI.csproj +install: + - nuget restore notifications: slack: secure: O4Nibe2fdaUa2ZxuETUg6WEoQKvNM2CotnfaIVgm3fjfe61dfE1P+EgTpbwDG8646jSmpTqMDw8Z6I/WJwGTlXV/ZQsbwu63Cps4MgOTvPHZ0Lsye5azySlJZs1iI4ItYSj2czXfcnJ+qAl1SOOkXJrjB5uyTMWtDpCrSCFB3MA= diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj index 5fd57361..08ec21ef 100644 --- a/TShockAPI/TShockAPI.csproj +++ b/TShockAPI/TShockAPI.csproj @@ -54,24 +54,27 @@ false + + ..\packages\BCrypt.Net.0.1.0\lib\net35\BCrypt.Net.dll + True + ..\prebuilts\HttpServer.dll ..\prebuilts\Mono.Data.Sqlite.dll - - ..\prebuilts\BCrypt.Net.dll + + ..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll + True + + + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + True - - ..\prebuilts\MySql.Data.dll - - - ..\prebuilts\Newtonsoft.Json.dll - @@ -142,6 +145,8 @@ + + @@ -190,7 +195,7 @@ - +