From f1d8444ee596d46ed6e5b042749ff4c157c19865 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 8 Dec 2018 15:48:55 -0600 Subject: [PATCH] Revert "update sdk, core, and nugets" This reverts commit 5d2f2536ec869fdc51c7a5662cfa79cd261519c6. --- .travis.yml | 2 +- scripts/deploy.sh | 6 +++--- src/FilterLists.Agent/FilterLists.Agent.csproj | 10 +++++----- src/FilterLists.Api/FilterLists.Api.csproj | 6 +++--- src/FilterLists.Data/FilterLists.Data.csproj | 4 ++-- src/FilterLists.Services/FilterLists.Services.csproj | 2 +- src/FilterLists.Web/FilterLists.Web.csproj | 4 ++-- .../FilterLists.Data.Tests.csproj | 6 +++--- .../FilterLists.Services.Tests.csproj | 4 ++-- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1e73ab5b..e6beca8d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ dist: trusty language: csharp mono: none -dotnet: 2.2.100 +dotnet: 2.1.403 solution: FilterLists.sln addons: mariadb: '10.3' diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 4db1f2cf5..6544259d6 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -4,16 +4,16 @@ sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/data/ $FTP_USER@$FTP_HOST:$FTP_DIR #deploy Agent -sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Agent/bin/Release/netcoreapp2.2/ubuntu.18.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR +sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Agent/bin/Release/netcoreapp2.1/ubuntu.18.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR #deploy API sshpass -p $FTP_PASSWORD ssh -o StrictHostKeyChecking=no $FTP_USER@$FTP_HOST 'sudo systemctl stop filterlists.api.service' -sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Api/bin/Release/netcoreapp2.2/ubuntu.18.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR +sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Api/bin/Release/netcoreapp2.1/ubuntu.18.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR sshpass -p $FTP_PASSWORD ssh -o StrictHostKeyChecking=no $FTP_USER@$FTP_HOST 'sudo systemctl start filterlists.api.service' #deploy Web sshpass -p $FTP_PASSWORD ssh -o StrictHostKeyChecking=no $FTP_USER@$FTP_HOST 'sudo systemctl stop filterlists.web.service' -sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Web/bin/Release/netcoreapp2.2/ubuntu.18.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR +sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Web/bin/Release/netcoreapp2.1/ubuntu.18.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR sshpass -p $FTP_PASSWORD ssh -o StrictHostKeyChecking=no $FTP_USER@$FTP_HOST 'sudo systemctl start filterlists.web.service' #purge CDN diff --git a/src/FilterLists.Agent/FilterLists.Agent.csproj b/src/FilterLists.Agent/FilterLists.Agent.csproj index ff82ab1b9..b1c5d2c77 100644 --- a/src/FilterLists.Agent/FilterLists.Agent.csproj +++ b/src/FilterLists.Agent/FilterLists.Agent.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp2.1 true latest ubuntu.18.04-x64 @@ -22,10 +22,10 @@ - - - - + + + + diff --git a/src/FilterLists.Api/FilterLists.Api.csproj b/src/FilterLists.Api/FilterLists.Api.csproj index eabdbee80..265c0130a 100644 --- a/src/FilterLists.Api/FilterLists.Api.csproj +++ b/src/FilterLists.Api/FilterLists.Api.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp2.1 true latest ubuntu.18.04-x64 @@ -36,10 +36,10 @@ - + - + diff --git a/src/FilterLists.Data/FilterLists.Data.csproj b/src/FilterLists.Data/FilterLists.Data.csproj index 9720df115..c06ac7439 100644 --- a/src/FilterLists.Data/FilterLists.Data.csproj +++ b/src/FilterLists.Data/FilterLists.Data.csproj @@ -21,11 +21,11 @@ - + all runtime; build; native; contentfiles; analyzers - + \ No newline at end of file diff --git a/src/FilterLists.Services/FilterLists.Services.csproj b/src/FilterLists.Services/FilterLists.Services.csproj index dec6e0be6..c8c084280 100644 --- a/src/FilterLists.Services/FilterLists.Services.csproj +++ b/src/FilterLists.Services/FilterLists.Services.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/FilterLists.Web/FilterLists.Web.csproj b/src/FilterLists.Web/FilterLists.Web.csproj index d9868880a..309f26f94 100644 --- a/src/FilterLists.Web/FilterLists.Web.csproj +++ b/src/FilterLists.Web/FilterLists.Web.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp2.1 true latest ubuntu.18.04-x64 @@ -24,7 +24,7 @@ - + diff --git a/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj b/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj index e2eb49590..49fb30a4d 100644 --- a/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj +++ b/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp2.1 true latest Collin M. Barrett @@ -17,7 +17,7 @@ - + all runtime; build; native; contentfiles; analyzers @@ -25,7 +25,7 @@ all runtime; build; native; contentfiles; analyzers - + all runtime; build; native; contentfiles; analyzers diff --git a/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj b/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj index 0899eba12..717267eb4 100644 --- a/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj +++ b/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp2.1 true latest Collin M. Barrett @@ -17,7 +17,7 @@ - + all runtime; build; native; contentfiles; analyzers