From 961fe70cb8fa7ab4781f1382efc0487c7d1e6c39 Mon Sep 17 00:00:00 2001
From: Leonardo Galli <leonardo.galli@bluewin.ch>
Date: Tue, 19 Mar 2019 11:34:03 +0100
Subject: [PATCH] @cosmetic Hopefully fixed nunit randomly failing. (updated
 nunit and mono)

---
 .circleci/Dockerfile | 6 +++---
 .circleci/config.yml | 2 +-
 build.sh             | 4 ++--
 test.sh              | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
index 185dd4513..d4dd9a30a 100644
--- a/.circleci/Dockerfile
+++ b/.circleci/Dockerfile
@@ -1,10 +1,10 @@
-FROM mono:5.8
+FROM mono:5.18
 
 RUN dpkg --add-architecture i386 && apt-get update && apt-get install -y git ssh tar gzip ca-certificates wget zip wine wine32 wine64 libwine libwine:i386
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -E -
 RUN apt-get install -y nodejs
-RUN wget https://mediaarea.net/repo/deb/repo-mediaarea_1.0-5_all.deb && dpkg -i repo-mediaarea_1.0-5_all.deb && apt-get update
-RUN apt-get install -y libmediainfo-dev libmediainfo0 mediainfo
+RUN wget https://mediaarea.net/repo/deb/repo-mediaarea_1.0-7_all.deb && dpkg -i repo-mediaarea_1.0-7_all.deb && apt-get update
+RUN apt-get install -y libmediainfo-dev libmediainfo0v5 mediainfo
 RUN npm i -g npm
 RUN apt-get install -y python3-pip && pip3 install gitchangelog pystache
 RUN curl -O https://dl.google.com/go/go1.10.2.linux-amd64.tar.gz && tar xvf go*.tar.gz && chown -R root:root ./go && mv go /usr/local
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ce6ea2804..784ffe329 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 
 defaults: &defaults
   docker:
-    - image: gallileo/radarr-cci-primary:5.8.8
+    - image: gallileo/radarr-cci-primary:5.8.9
   environment:
       BUILD_VERSION: 0.2.0
 
diff --git a/build.sh b/build.sh
index 6444ce08b..89d32e3be 100755
--- a/build.sh
+++ b/build.sh
@@ -221,9 +221,9 @@ PackageTests()
     find $sourceFolder -path $testSearchPattern -exec cp -r -u -T "{}" $testPackageFolder \;
 
     if [ $runtime = "dotnet" ] ; then
-        $nuget install NUnit.Runners -Version 3.2.1 -Output $testPackageFolder
+        $nuget install NUnit.Runners -Version 3.9.0 -Output $testPackageFolder
     else
-        mono $nuget install NUnit.Runners -Version 3.2.1 -Output $testPackageFolder
+        mono $nuget install NUnit.Runners -Version 3.9.0 -Output $testPackageFolder
     fi
 
     cp $outputFolder/*.dll $testPackageFolder
diff --git a/test.sh b/test.sh
index 17c2366f4..3835ee1fc 100755
--- a/test.sh
+++ b/test.sh
@@ -9,7 +9,7 @@ if [ -d "$TEST_DIR/_tests" ]; then
   TEST_DIR="$TEST_DIR/_tests"
 fi
 
-NUNIT="$TEST_DIR/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe"
+NUNIT="$TEST_DIR/NUnit.ConsoleRunner.3.9.0/tools/nunit3-console.exe"
 NUNIT_COMMAND="$NUNIT"
 NUNIT_PARAMS="--result=$TEST_DIR/reports/junit/results-$TYPE.xml;transform=.circleci/nunit3-junit.xslt --agents=12 --config=Debug"
 
@@ -17,7 +17,7 @@ if [ "$PLATFORM" = "Windows" ]; then
   WHERE="$WHERE && cat != LINUX"
 elif [ "$PLATFORM" = "Linux" ]; then
   WHERE="$WHERE && cat != WINDOWS"
-  NUNIT_COMMAND="mono --debug --runtime=v4.0 $NUNIT"
+  NUNIT_COMMAND="mono --debug $NUNIT"
 elif [ "$PLATFORM" = "Mac" ]; then
   WHERE="$WHERE && cat != WINDOWS"
   NUNIT_COMMAND="mono --debug --runtime=v4.0 $NUNIT"