Misc

At least for now, SK2 guys have enough to do.

.travis.yml

@@ -36,7 +36,7 @@ script:
 
     publish() {
         if [ "$1" = 'generic' ]; then
-            dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -o "out/${1}" --no-restore /nologo /p:LinkDuringPublish=false
+            dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -o "out/${1}" --no-restore /nologo
         else
             dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -o "out/${1}" -r "$1" --no-restore /nologo
         fi

ArchiSteamFarm/ArchiSteamFarm.csproj

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <AssemblyVersion>3.0.2.1</AssemblyVersion>
-    <FileVersion>3.0.2.1</FileVersion>
+    <AssemblyVersion>3.0.2.2</AssemblyVersion>
+    <FileVersion>3.0.2.2</FileVersion>
     <LangVersion>latest</LangVersion>
     <ErrorReport>none</ErrorReport>
     <ApplicationIcon>ASF.ico</ApplicationIcon>
@@ -33,7 +33,6 @@
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.5.2-beta6" />
     <PackageReference Include="Humanizer" Version="2.2.0" />
-    <PackageReference Include="ILLink.Tasks" Version="0.1.4-preview-906439" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="NLog" Version="5.0.0-beta09" />
     <PackageReference Include="SteamKit2" Version="2.0.0-Alpha7" />

ArchiSteamFarm/GlobalConfig.cs

@@ -105,7 +105,7 @@ namespace ArchiSteamFarm {
 		internal readonly bool Statistics = true;
 
 		[JsonProperty(Required = Required.DisallowNull)]
-		internal readonly ProtocolTypes SteamProtocols = ProtocolTypes.WebSocket;
+		internal readonly ProtocolTypes SteamProtocols = ProtocolTypes.Tcp;
 
 		[JsonProperty(Required = Required.DisallowNull)]
 		internal readonly EUpdateChannel UpdateChannel = EUpdateChannel.Stable;

ArchiSteamFarm/config/ASF.json

@@ -19,6 +19,6 @@
 	"OptimizationMode": 0,
 	"Statistics": true,
 	"SteamOwnerID": 0,
-	"SteamProtocols": 4,
+	"SteamProtocols": 1,
 	"UpdateChannel": 1
 }

appveyor.yml

@@ -62,7 +62,7 @@ after_test:
         Set-Location -Path "$env:APPVEYOR_BUILD_FOLDER"
 
         if ($RUNTIME -eq 'generic') {
-            dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -o "out\$RUNTIME" --no-restore /nologo /p:LinkDuringPublish=false
+            dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -o "out\$RUNTIME" --no-restore /nologo
         } else {
             dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -o "out\$RUNTIME" -r "$RUNTIME" --no-restore /nologo
         }

cc.sh

@@ -2,10 +2,11 @@
 set -eu
 
 PROJECT="ArchiSteamFarm"
-OUT="out"
-MSBUILD_ARGS=("/nologo")
+OUT="out/source"
+
+SOLUTION="${PROJECT}.sln"
+CONFIGURATION="Release"
 
-BUILD="Release"
 CLEAN=0
 
 PRINT_USAGE() {
@@ -15,8 +16,8 @@ PRINT_USAGE() {
 
 for ARG in "$@"; do
 	case "$ARG" in
-		release|Release) BUILD="Release" ;;
-		debug|Debug) BUILD="Debug" ;;
+		release|Release) CONFIGURATION="Release" ;;
+		debug|Debug) CONFIGURATION="Debug" ;;
 		--clean) CLEAN=1 ;;
 		*) PRINT_USAGE
 	esac
@@ -27,24 +28,28 @@ if ! hash dotnet &>/dev/null; then
 	exit 1
 fi
 
+dotnet --info
+
 cd "$(dirname "$(readlink -f "$0")")"
 
 if [[ -d ".git" ]] && hash git &>/dev/null; then
 	git pull || true
 fi
 
-if [[ ! -f "${PROJECT}.sln" ]]; then
-	echo "ERROR: ${PROJECT}.sln could not be found!"
+if [[ ! -f "$SOLUTION" ]]; then
+	echo "ERROR: $SOLUTION could not be found!"
 	exit 1
 fi
 
 if [[ "$CLEAN" -eq 1 ]]; then
-	dotnet clean -c "$BUILD" -o "$OUT"
-	rm -rf "$OUT"
+	dotnet clean -c "$CONFIGURATION" -o "$OUT"
+	rm -rf "ArchiSteamFarm/${OUT}" "ArchiSteamFarm.Tests/${OUT}"
 fi
 
 dotnet restore
-dotnet build -c "$BUILD" -o "$OUT" --no-restore "${MSBUILD_ARGS[@]}"
+
+dotnet build -c "$CONFIGURATION" -o "$OUT" --no-restore /nologo
+dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -o "$OUT" --no-build --no-restore
 
 echo
 echo "Compilation finished successfully! :)"

nuget.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <packageSources>
-    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
- </packageSources>
-</configuration>

run.sh

@@ -2,7 +2,8 @@
 set -eu
 
 PROJECT="ArchiSteamFarm"
-OUT="out"
+OUT="out/source"
+
 BINARY="${PROJECT}/${OUT}/${PROJECT}.dll"
 
 ASF_ARGS=("")
@@ -28,6 +29,8 @@ if ! hash dotnet &>/dev/null; then
 	exit 1
 fi
 
+dotnet --info
+
 cd "$(dirname "$(readlink -f "$0")")"
 
 if [[ ! -f "$BINARY" ]]; then
@@ -37,7 +40,7 @@ fi
 
 if [[ "$UNTIL_CLEAN_EXIT" -eq 0 ]]; then
 	dotnet exec "$BINARY" "${ASF_ARGS[@]}"
-	exit $?
+	exit $? # In this case $? can only be 0 because otherwise set -e terminates the script
 fi
 
 while [[ -f "$BINARY" ]]; do