diff --git a/.travis.yml b/.travis.yml
index 832369f4b..e4be6fb89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,7 @@ branches:
 mono: none
 
 # ASF requires .NET Core 2.0+
-# TODO: We should target stable 2.0.0 once it's released
-dotnet: 2.0.0-preview2-006497
+dotnet: 2.0.0
 
 env:
   global:
@@ -32,14 +31,14 @@ script:
 
     RUNTIMES="generic win-x64 linux-x64 linux-arm osx-x64"
 
-    dotnet build -c Release
-    dotnet test -c Release --no-build --no-restore ArchiSteamFarm.Tests
+    dotnet build -c Release --no-restore
+    dotnet test ArchiSteamFarm.Tests -c Release --no-build --no-restore
 
     for RUNTIME in $RUNTIMES; do
         if [ "$RUNTIME" = "generic" ]; then
-            dotnet publish -c Release -o "out/${RUNTIME}"
+            dotnet publish ArchiSteamFarm -c Release -o "out/${RUNTIME}" --no-restore
         else
-            dotnet publish -c Release -r "$RUNTIME" -o "out/${RUNTIME}"
+            dotnet publish ArchiSteamFarm -c Release -o "out/${RUNTIME}" -r "$RUNTIME" --no-restore
         fi
 
         echo "$RUNTIME" > "ArchiSteamFarm/out/${RUNTIME}/ArchiSteamFarm.version"
diff --git a/appveyor.yml b/appveyor.yml
index cd238828a..a9d38b11f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,9 +28,9 @@ after_test:
 
     foreach ($RUNTIME in $RUNTIMES) {
     	if ($RUNTIME -eq 'generic') {
-    		dotnet publish -c "$env:CONFIGURATION" -o "out\$RUNTIME"
+    		dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -o "out\$RUNTIME" --no-restore
     	} else {
-    		dotnet publish -c "$env:CONFIGURATION" -r "$RUNTIME" -o "out\$RUNTIME"
+    		dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -o "out\$RUNTIME" -r "$RUNTIME" --no-restore
     	}
 
     	Set-Content -Path "ArchiSteamFarm\out\$RUNTIME\ArchiSteamFarm.version" -Value "$RUNTIME"