diff --git a/.paket/paket.bootstrapper.exe b/.paket/paket.bootstrapper.exe new file mode 100755 index 0000000..c46d0bf Binary files /dev/null and b/.paket/paket.bootstrapper.exe differ diff --git a/.paket/paket.bootstrapper.exe.config b/.paket/paket.bootstrapper.exe.config new file mode 100644 index 0000000..16eb69e --- /dev/null +++ b/.paket/paket.bootstrapper.exe.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/e2e/run.sh b/e2e/run.sh index ce4efc2..c03f350 100755 --- a/e2e/run.sh +++ b/e2e/run.sh @@ -12,6 +12,8 @@ cat << EOF > /home/ide/.nuget/NuGet/NuGet.Config EOF +mono /ide/work/.paket/paket.bootstrapper.exe + echo "Sleeping 4s to wait for server to be ready" sleep 4 diff --git a/e2e/stress/run.sh b/e2e/stress/run.sh index 7a35746..358dcd5 100755 --- a/e2e/stress/run.sh +++ b/e2e/stress/run.sh @@ -4,12 +4,14 @@ set -e echo "Sleeping 4s to wait for server to be ready" sleep 4 +mono /ide/work/.paket/paket.bootstrapper.exe + STRESS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $STRESS_DIR echo "paket update to download a bunch of packages" cd paket -paket update +mono /ide/work/.paket/paket.exe update echo "nuget push a bunch of packages" ./push_all.sh cd .. @@ -28,7 +30,7 @@ do EOF - bash -c "cd paket-$i && HOME=/home/ide/$i paket install -f" & + bash -c "cd paket-$i && HOME=/home/ide/$i mono /ide/work/.paket/paket.exe install -f" & done time wait diff --git a/e2e/test_one-exact-package/01_one_exact_package.bats b/e2e/test_one-exact-package/01_one_exact_package.bats index cc97f24..6f3c988 100644 --- a/e2e/test_one-exact-package/01_one_exact_package.bats +++ b/e2e/test_one-exact-package/01_one_exact_package.bats @@ -14,14 +14,14 @@ load '/opt/bats-assert/load.bash' } @test "paket install pinned package version" { - run /bin/bash -c "cd paket-pinned && paket install" + run /bin/bash -c "cd paket-pinned && mono /ide/work/.paket/paket.exe install" refute_output --partial 'Could not download' refute_output --partial 'went wrong' assert_equal "$status" 0 } @test "paket restore pinned package version" { - run /bin/bash -c "cd paket-locked && paket restore" + run /bin/bash -c "cd paket-locked && mono /ide/work/.paket/paket.exe restore" refute_output --partial 'Could not download' refute_output --partial 'went wrong' assert_equal "$status" 0 diff --git a/e2e/test_proxy/01_proxy.bats b/e2e/test_proxy/01_proxy.bats index 299d434..a74e9ca 100644 --- a/e2e/test_proxy/01_proxy.bats +++ b/e2e/test_proxy/01_proxy.bats @@ -8,7 +8,7 @@ load '/opt/bats-assert/load.bash' } @test "paket install latest log4net version" { - run /bin/bash -c "cd paket && paket install" + run /bin/bash -c "cd paket && mono /ide/work/.paket/paket.exe install" refute_output --partial 'Could not download' refute_output --partial 'went wrong' assert_equal "$status" 0 @@ -16,17 +16,9 @@ load '/opt/bats-assert/load.bash' } @test "paket install with constraint (<= 2.0.8)" { - run /bin/bash -c "cd paket-constraint && paket install" + run /bin/bash -c "cd paket-constraint && mono /ide/work/.paket/paket.exe install" refute_output --partial 'Could not download' refute_output --partial 'went wrong' assert_equal "$status" 0 assert [ -e 'paket-constraint/packages/log4net/log4net.2.0.8.nupkg' ] } - -@test "paket update with bug01" { - run /bin/bash -c "cd paket-bug01 && paket update" - refute_output --partial 'Could not download' - refute_output --partial 'went wrong' - refute_output --partial "Couldn't get package details" - assert_equal "$status" 0 -} diff --git a/e2e/test_proxy/paket-bug01/paket.dependencies b/e2e/test_proxy/paket-bug01/paket.dependencies deleted file mode 100644 index 337b570..0000000 --- a/e2e/test_proxy/paket-bug01/paket.dependencies +++ /dev/null @@ -1,34 +0,0 @@ -source http://liget:9011/api/cache/v3/index.json - -nuget log4net -nuget Autofac -nuget CommandLineParser -nuget Gelf4Net.UdpAppender -nuget FluentValidation -nuget Newtonsoft.Json -nuget Nancy = 2.0.0-clinteastwood -nuget Nancy.Bootstrappers.Autofac = 2.0.0-clinteastwood -nuget Nancy.Serialization.JsonNet = 2.0.0-clinteastwood -nuget Microsoft.AspNetCore.Hosting = 2.0.0 -nuget Microsoft.AspNetCore.Server.Kestrel = 2.0.0 -nuget Microsoft.AspNetCore.Owin = 2.0.0 -nuget Microsoft.Extensions.Configuration.EnvironmentVariables -nuget Microsoft.Extensions.Configuration - -group Test - source http://liget:9011/api/cache/v3/index.json - - nuget xunit >= 2.3.0 - nuget FluentAssertions >= 4.19.2 - nuget log4net - nuget Moq - nuget Autofac - nuget Autofac.Extras.Moq - nuget FluentValidation - nuget Newtonsoft.Json - nuget ReportUnit - nuget Nancy - nuget Nancy.Bootstrappers.Autofac - nuget Nancy.Testing - nuget microsoft.net.test.sdk = 15.3.0 - nuget xunit.runner.visualstudio >= 2.3.0 diff --git a/e2e/test_update-package/01_update_package.bats b/e2e/test_update-package/01_update_package.bats index fa14e75..425c314 100644 --- a/e2e/test_update-package/01_update_package.bats +++ b/e2e/test_update-package/01_update_package.bats @@ -15,7 +15,7 @@ load '/opt/bats-assert/load.bash' } @test "paket update latest package version (1.0.0)" { - run /bin/bash -c "cd paket && paket update" + run /bin/bash -c "cd paket && mono /ide/work/.paket/paket.exe update" refute_output --partial 'Could not download' refute_output --partial 'went wrong' assert_equal "$status" 0 @@ -39,7 +39,7 @@ load '/opt/bats-assert/load.bash' } @test "paket update latest package version (2.1.0)" { - run /bin/bash -c "cd paket && paket update" + run /bin/bash -c "cd paket && mono /ide/work/.paket/paket.exe update" refute_output --partial 'Could not download' refute_output --partial 'went wrong' assert_equal "$status" 0 @@ -47,7 +47,7 @@ load '/opt/bats-assert/load.bash' } @test "paket install with constraint (< 2.0.0)" { - run /bin/bash -c "cd paket-constraint && paket install" + run /bin/bash -c "cd paket-constraint && mono /ide/work/.paket/paket.exe install" refute_output --partial 'Could not download' refute_output --partial 'went wrong' assert_equal "$status" 0 diff --git a/tasks.sh b/tasks.sh index fb48d22..bd36a0a 100755 --- a/tasks.sh +++ b/tasks.sh @@ -61,6 +61,7 @@ case "${command}" in ;; build_inputs) build_inputs + mono /ide/work/.paket/paket.bootstrapper.exe ;; itest) ide "./tasks.sh build_inputs"