From a5a63cc68c8de1855f9673eb8cd34049823482da Mon Sep 17 00:00:00 2001 From: George Date: Wed, 25 May 2016 21:57:14 +0100 Subject: [PATCH] Updated project to use NuGet where possible --- .gitignore | 4 + .travis.yml | 2 + TShockAPI/TShockAPI.csproj | 23 ++-- TShockAPI/app.config | 9 ++ TShockAPI/packages.config | 6 + TerrariaServerAPI | 2 +- prebuilts/BCrypt.Net.XML | 201 ---------------------------------- prebuilts/BCrypt.Net.dll | Bin 14336 -> 0 bytes prebuilts/BCrypt.Net.pdb | Bin 24064 -> 0 bytes prebuilts/MySql.Data.dll | Bin 457216 -> 0 bytes prebuilts/Newtonsoft.Json.dll | Bin 520192 -> 0 bytes 11 files changed, 36 insertions(+), 211 deletions(-) create mode 100644 TShockAPI/app.config create mode 100644 TShockAPI/packages.config delete mode 100644 prebuilts/BCrypt.Net.XML delete mode 100644 prebuilts/BCrypt.Net.dll delete mode 100644 prebuilts/BCrypt.Net.pdb delete mode 100644 prebuilts/MySql.Data.dll delete mode 100644 prebuilts/Newtonsoft.Json.dll 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 @@ - +