Add warning for invalid protocols

ArchiSteamFarm/ArchiHandler.cs

@@ -265,6 +265,36 @@ namespace ArchiSteamFarm {
 			}
 		}
 
+		// TODO: Please remove me immediately after https://github.com/SteamRE/SteamKit/issues/254 gets fixed
+		internal void HackedLogOn(SteamUser.LogOnDetails details) {
+			if (!Client.IsConnected) {
+				return;
+			}
+
+			SteamID steamID = new SteamID(details.AccountID, details.AccountInstance, Client.ConnectedUniverse, EAccountType.Individual);
+
+			var logon = new ClientMsgProtobuf<CMsgClientLogon>(EMsg.ClientLogon);
+			logon.Body.obfustucated_private_ip = details.LoginID.Value;
+			logon.ProtoHeader.client_sessionid = 0;
+			logon.ProtoHeader.steamid = steamID.ConvertToUInt64();
+			logon.Body.account_name = details.Username;
+			logon.Body.password = details.Password;
+			logon.Body.should_remember_password = details.ShouldRememberPassword;
+			logon.Body.protocol_version = MsgClientLogon.CurrentProtocol;
+			logon.Body.client_os_type = (uint) details.ClientOSType;
+			logon.Body.client_language = details.ClientLanguage;
+			logon.Body.cell_id = details.CellID;
+			logon.Body.steam2_ticket_request = details.RequestSteam2Ticket;
+			logon.Body.client_package_version = 1771;
+			logon.Body.auth_code = details.AuthCode;
+			logon.Body.two_factor_code = details.TwoFactorCode;
+			logon.Body.login_key = details.LoginKey;
+			logon.Body.sha_sentryfile = details.SentryFileHash;
+			logon.Body.eresult_sentryfile = (int) (details.SentryFileHash != null ? EResult.OK : EResult.FileNotFound);
+
+			Client.Send(logon);
+		}
+
 		/*
 		 _   _                    _  _
 		| | | |  __ _  _ __    __| || |  ___  _ __  ___

ArchiSteamFarm/ArchiSteamFarm.csproj

@@ -76,7 +76,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">

ArchiSteamFarm/ArchiWebHandler.cs

@@ -31,9 +31,14 @@ using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using System.Xml;
 
 namespace ArchiSteamFarm {
 	internal sealed class ArchiWebHandler {
+		private const string SteamCommunity = "steamcommunity.com";
+
+		private static string SteamCommunityURL = "https://" + SteamCommunity;
+
 		private static int Timeout = 30 * 1000;
 
 		private readonly Bot Bot;
@@ -43,6 +48,7 @@ namespace ArchiSteamFarm {
 
 		internal static void Init() {
 			Timeout = Program.GlobalConfig.HttpTimeout * 1000;
+			SteamCommunityURL = (Program.GlobalConfig.ForceHttp ? "http://" : "https://") + SteamCommunity;
 		}
 
 		internal ArchiWebHandler(Bot bot) {
@@ -91,7 +97,7 @@ namespace ArchiSteamFarm {
 						sessionkey: Encoding.ASCII.GetString(WebUtility.UrlEncodeToBytes(cryptedSessionKey, 0, cryptedSessionKey.Length)),
 						encrypted_loginkey: Encoding.ASCII.GetString(WebUtility.UrlEncodeToBytes(cryptedLoginKey, 0, cryptedLoginKey.Length)),
 						method: WebRequestMethods.Http.Post,
-						secure: true
+						secure: !Program.GlobalConfig.ForceHttp
 					);
 				} catch (Exception e) {
 					Logging.LogGenericException(e, Bot.BotName);
@@ -126,7 +132,7 @@ namespace ArchiSteamFarm {
 
 			HtmlDocument htmlDocument = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) {
-				htmlDocument = await WebBrowser.UrlGetToHtmlDocument("https://steamcommunity.com/my/profile", Cookie).ConfigureAwait(false);
+				htmlDocument = await WebBrowser.UrlGetToHtmlDocument(SteamCommunityURL + "/my/profile", Cookie).ConfigureAwait(false);
 			}
 
 			if (htmlDocument == null) {
@@ -149,6 +155,51 @@ namespace ArchiSteamFarm {
 			return false;
 		}
 
+		internal async Task<Dictionary<uint, string>> GetOwnedGames() {
+			if (SteamID == 0) {
+				return null;
+			}
+
+			string request = SteamCommunityURL + "/profiles/" + SteamID + "/games/?xml=1";
+
+			XmlDocument response = null;
+			for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
+				response = await WebBrowser.UrlGetToXML(request, Cookie).ConfigureAwait(false);
+			}
+
+			if (response == null) {
+				Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName);
+				return null;
+			}
+
+			XmlNodeList xmlNodeList = response.SelectNodes("gamesList/games/game");
+			if (xmlNodeList == null || xmlNodeList.Count == 0) {
+				return null;
+			}
+
+			Dictionary<uint, string> result = new Dictionary<uint, string>(xmlNodeList.Count);
+			foreach (XmlNode xmlNode in xmlNodeList) {
+				XmlNode appNode = xmlNode.SelectSingleNode("appID");
+				if (appNode == null) {
+					continue;
+				}
+
+				uint appID;
+				if (!uint.TryParse(appNode.InnerText, out appID)) {
+					continue;
+				}
+
+				XmlNode nameNode = xmlNode.SelectSingleNode("name");
+				if (nameNode == null) {
+					continue;
+				}
+
+				result[appID] = nameNode.InnerText;
+			}
+
+			return result;
+		}
+
 		internal List<Steam.TradeOffer> GetTradeOffers() {
 			if (string.IsNullOrEmpty(Bot.BotConfig.SteamApiKey)) {
 				return null;
@@ -163,7 +214,7 @@ namespace ArchiSteamFarm {
 						response = iEconService.GetTradeOffers(
 							get_received_offers: 1,
 							active_only: 1,
-							secure: true
+							secure: !Program.GlobalConfig.ForceHttp
 						);
 					} catch (Exception e) {
 						Logging.LogGenericException(e, Bot.BotName);
@@ -180,7 +231,7 @@ namespace ArchiSteamFarm {
 			foreach (KeyValue trade in response["trade_offers_received"].Children) {
 				Steam.TradeOffer tradeOffer = new Steam.TradeOffer {
 					tradeofferid = trade["tradeofferid"].AsString(),
-					accountid_other = trade["accountid_other"].AsInteger(),
+					accountid_other = (uint) trade["accountid_other"].AsUnsignedLong(), // TODO: Correct this when SK2 with https://github.com/SteamRE/SteamKit/pull/255 gets released
 					trade_offer_state = trade["trade_offer_state"].AsEnum<Steam.TradeOffer.ETradeOfferState>()
 				};
 				foreach (KeyValue item in trade["items_to_give"].Children) {
@@ -219,7 +270,7 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
-			string request = "https://steamcommunity.com/gid/" + clanID;
+			string request = SteamCommunityURL + "/gid/" + clanID;
 
 			Dictionary<string, string> data = new Dictionary<string, string>(2) {
 				{"sessionID", sessionID},
@@ -249,7 +300,7 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
-			string referer = "https://steamcommunity.com/tradeoffer/" + tradeID;
+			string referer = SteamCommunityURL + "/tradeoffer/" + tradeID;
 			string request = referer + "/accept";
 
 			Dictionary<string, string> data = new Dictionary<string, string>(3) {
@@ -285,7 +336,7 @@ namespace ArchiSteamFarm {
 						response = iEconService.DeclineTradeOffer(
 							tradeofferid: tradeID.ToString(),
 							method: WebRequestMethods.Http.Post,
-							secure: true
+							secure: !Program.GlobalConfig.ForceHttp
 						);
 					} catch (Exception e) {
 						Logging.LogGenericException(e, Bot.BotName);
@@ -304,7 +355,7 @@ namespace ArchiSteamFarm {
 		internal async Task<List<Steam.Item>> GetMyTradableInventory() {
 			JObject jObject = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && jObject == null; i++) {
-				jObject = await WebBrowser.UrlGetToJObject("https://steamcommunity.com/my/inventory/json/753/6?trading=1", Cookie).ConfigureAwait(false);
+				jObject = await WebBrowser.UrlGetToJObject(SteamCommunityURL + "/my/inventory/json/753/6?trading=1", Cookie).ConfigureAwait(false);
 			}
 
 			if (jObject == null) {
@@ -362,7 +413,7 @@ namespace ArchiSteamFarm {
 				});
 			}
 
-			string referer = "https://steamcommunity.com/tradeoffer/new";
+			string referer = SteamCommunityURL + "/tradeoffer/new";
 			string request = referer + "/send";
 
 			foreach (Steam.TradeOfferRequest trade in trades) {
@@ -396,7 +447,7 @@ namespace ArchiSteamFarm {
 
 			HtmlDocument htmlDocument = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) {
-				htmlDocument = await WebBrowser.UrlGetToHtmlDocument("https://steamcommunity.com/profiles/" + SteamID + "/badges?l=english&p=" + page, Cookie).ConfigureAwait(false);
+				htmlDocument = await WebBrowser.UrlGetToHtmlDocument(SteamCommunityURL + "/profiles/" + SteamID + "/badges?l=english&p=" + page, Cookie).ConfigureAwait(false);
 			}
 
 			if (htmlDocument == null) {
@@ -414,7 +465,7 @@ namespace ArchiSteamFarm {
 
 			HtmlDocument htmlDocument = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) {
-				htmlDocument = await WebBrowser.UrlGetToHtmlDocument("https://steamcommunity.com/profiles/" + SteamID + "/gamecards/" + appID + "?l=english", Cookie).ConfigureAwait(false);
+				htmlDocument = await WebBrowser.UrlGetToHtmlDocument(SteamCommunityURL + "/profiles/" + SteamID + "/gamecards/" + appID + "?l=english", Cookie).ConfigureAwait(false);
 			}
 
 			if (htmlDocument == null) {
@@ -432,7 +483,7 @@ namespace ArchiSteamFarm {
 
 			HttpResponseMessage response = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
-				response = await WebBrowser.UrlGet("https://steamcommunity.com/profiles/" + SteamID + "/inventory", Cookie).ConfigureAwait(false);
+				response = await WebBrowser.UrlGet(SteamCommunityURL + "/profiles/" + SteamID + "/inventory", Cookie).ConfigureAwait(false);
 			}
 
 			if (response == null) {
@@ -453,9 +504,12 @@ namespace ArchiSteamFarm {
 				{ "pin", parentalPin }
 			};
 
+			string referer = SteamCommunityURL;
+			string request = referer + "/parental/ajaxunlock";
+
 			HttpResponseMessage response = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
-				response = await WebBrowser.UrlPost("https://steamcommunity.com/parental/ajaxunlock", data, Cookie, "https://steamcommunity.com/").ConfigureAwait(false);
+				response = await WebBrowser.UrlPost(request, data, Cookie, referer).ConfigureAwait(false);
 			}
 
 			if (response == null) {

ArchiSteamFarm/BotDatabase.cs

@@ -57,10 +57,10 @@ namespace ArchiSteamFarm {
 			}
 		}
 
-		[JsonProperty(Required = Required.AllowNull)]
+		[JsonProperty]
 		private string _LoginKey;
 
-		[JsonProperty(Required = Required.AllowNull)]
+		[JsonProperty]
 		private SteamGuardAccount _SteamGuardAccount;
 
 		private string FilePath;
@@ -91,7 +91,7 @@ namespace ArchiSteamFarm {
 		// This constructor is used only by deserializer
 		private BotDatabase() { }
 
-		private void Save() {
+		internal void Save() {
 			lock (FilePath) {
 				try {
 					File.WriteAllText(FilePath, JsonConvert.SerializeObject(this));

ArchiSteamFarm/CardsFarmer.cs

@@ -399,7 +399,7 @@ namespace ArchiSteamFarm {
 			await StartFarming().ConfigureAwait(false);
 		}
 
-		private async Task<bool?> ShouldFarm(ulong appID) {
+		private async Task<bool?> ShouldFarm(uint appID) {
 			if (appID == 0) {
 				return false;
 			}
@@ -425,12 +425,12 @@ namespace ArchiSteamFarm {
 
 			bool? keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
 			for (ushort farmingTime = 0; farmingTime <= 60 * Program.GlobalConfig.MaxFarmingTime && keepFarming.GetValueOrDefault(true); farmingTime += Program.GlobalConfig.FarmingDelay) {
-				Logging.LogGenericInfo("Still farming: " + appID, Bot.BotName);
 				if (FarmResetEvent.WaitOne(60 * 1000 * Program.GlobalConfig.FarmingDelay)) {
 					success = false;
 					break;
 				}
 				keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
+				Logging.LogGenericInfo("Still farming: " + appID, Bot.BotName);
 			}
 
 			Bot.ResetGamesPlayed();

ArchiSteamFarm/Debugging.cs

@@ -22,6 +22,10 @@
 
 */
 
+using SteamKit2;
+using System;
+using System.IO;
+
 namespace ArchiSteamFarm {
 	internal static class Debugging {
 #if DEBUG
@@ -33,5 +37,27 @@ namespace ArchiSteamFarm {
 		internal static bool IsReleaseBuild => !IsDebugBuild;
 
 		internal static bool NetHookAlreadyInitialized { get; set; } = false;
+
+		internal sealed class DebugListener : IDebugListener {
+			private readonly string FilePath;
+
+			internal DebugListener(string filePath) {
+				if (string.IsNullOrEmpty(filePath)) {
+					return;
+				}
+
+				FilePath = filePath;
+			}
+
+			public void WriteLine(string category, string msg) {
+				lock (FilePath) {
+					try {
+						File.AppendAllText(FilePath, category + " | " + msg + Environment.NewLine);
+					} catch (Exception e) {
+						Logging.LogGenericException(e);
+					}
+				}
+			}
+		}
 	}
 }

ArchiSteamFarm/GlobalConfig.cs

@@ -26,6 +26,7 @@ using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net.Sockets;
 
 namespace ArchiSteamFarm {
 	internal sealed class GlobalConfig {
@@ -47,6 +48,12 @@ namespace ArchiSteamFarm {
 		[JsonProperty(Required = Required.DisallowNull)]
 		internal EUpdateChannel UpdateChannel { get; private set; } = EUpdateChannel.Stable;
 
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal ProtocolType SteamProtocol { get; private set; } = ProtocolType.Tcp;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal ulong SteamOwnerID { get; private set; } = 0;
+
 		[JsonProperty(Required = Required.DisallowNull)]
 		internal byte MaxFarmingTime { get; private set; } = 10;
 
@@ -66,7 +73,10 @@ namespace ArchiSteamFarm {
 		internal byte InventoryLimiterDelay { get; private set; } = 3;
 
 		[JsonProperty(Required = Required.DisallowNull)]
-		internal byte HttpTimeout { get; private set; } = 30;
+		internal bool ForceHttp { get; private set; } = false;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal byte HttpTimeout { get; private set; } = 60;
 
 		[JsonProperty(Required = Required.DisallowNull)]
 		internal string WCFHostname { get; private set; } = "localhost";
@@ -74,9 +84,16 @@ namespace ArchiSteamFarm {
 		[JsonProperty(Required = Required.DisallowNull)]
 		internal ushort WCFPort { get; private set; } = 1242;
 
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool LogToFile { get; private set; } = true;
+
 		[JsonProperty(Required = Required.DisallowNull)]
 		internal bool Statistics { get; private set; } = true;
 
+		// TODO: Please remove me immediately after https://github.com/SteamRE/SteamKit/issues/254 gets fixed
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool HackIgnoreMachineID { get; private set; } = false;
+
 		[JsonProperty(Required = Required.DisallowNull)]
 		internal HashSet<uint> Blacklist { get; private set; } = new HashSet<uint>(GlobalBlacklist);
 
@@ -94,6 +111,18 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
+			// SK2 supports only TCP and UDP steam protocols
+			// Make sure that user can't screw this up
+			switch (globalConfig.SteamProtocol) {
+				case ProtocolType.Tcp:
+				case ProtocolType.Udp:
+					break;
+				default:
+					Logging.LogGenericWarning("Configured SteamProtocol is invalid: " + globalConfig.SteamProtocol + ", default TCP protocol will be used instead");
+					globalConfig.SteamProtocol = ProtocolType.Tcp;
+					break;
+			}
+
 			return globalConfig;
 		}
 

ArchiSteamFarm/JSON/Steam.cs

@@ -81,7 +81,7 @@ namespace ArchiSteamFarm {
 			internal string tradeofferid { get; set; }
 
 			[JsonProperty(Required = Required.Always)]
-			internal int accountid_other { get; set; }
+			internal uint accountid_other { get; set; }
 
 			[JsonProperty(Required = Required.Always)]
 			internal ETradeOfferState trade_offer_state { get; set; }
@@ -97,7 +97,7 @@ namespace ArchiSteamFarm {
 			internal ulong OtherSteamID64 {
 				get {
 					if (_OtherSteamID64 == 0 && accountid_other != 0) {
-						_OtherSteamID64 = new SteamID((uint) accountid_other, EUniverse.Public, EAccountType.Individual).ConvertToUInt64();
+						_OtherSteamID64 = new SteamID(accountid_other, EUniverse.Public, EAccountType.Individual).ConvertToUInt64();
 					}
 
 					return _OtherSteamID64;

ArchiSteamFarm/Logging.cs

@@ -31,18 +31,18 @@ namespace ArchiSteamFarm {
 	internal static class Logging {
 		private static readonly object FileLock = new object();
 
-		internal static bool? LogToFile { get; set; } = null;
+		private static bool LogToFile = false;
 
 		internal static void Init() {
-			if (!LogToFile.HasValue) {
+			LogToFile = Program.GlobalConfig.LogToFile;
-				LogToFile = true;
-			}
 
-			lock (FileLock) {
+			if (LogToFile) {
-				try {
+				lock (FileLock) {
-					File.Delete(Program.LogFile);
+					try {
-				} catch (Exception e) {
+						File.Delete(Program.LogFile);
-					LogGenericException(e);
+					} catch (Exception e) {
+						LogGenericException(e);
+					}
 				}
 			}
 		}
@@ -69,11 +69,10 @@ namespace ArchiSteamFarm {
 			}
 
 			Log("[!] EXCEPTION: " + previousMethodName + "() <" + botName + "> " + exception.Message);
-			Log("[!] StackTrace: " + exception.StackTrace);
+			Log("[!] StackTrace:" + Environment.NewLine + exception.StackTrace);
 
-			Exception innerException = exception.InnerException;
+			if (exception.InnerException != null) {
-			if (innerException != null) {
+				LogGenericException(exception.InnerException, botName, previousMethodName);
-				LogGenericException(innerException, botName, previousMethodName);
 			}
 		}
 
@@ -119,17 +118,18 @@ namespace ArchiSteamFarm {
 
 			// Write on console only when not awaiting response from user
 			if (!Program.ConsoleIsBusy) {
-				Console.Write(loggedMessage);
+				try {
+					Console.Write(loggedMessage);
+				} catch { }
 			}
 
-			if (LogToFile.GetValueOrDefault()) {
+			if (LogToFile) {
 				lock (FileLock) {
 					try {
 						File.AppendAllText(Program.LogFile, loggedMessage);
 					} catch (Exception e) {
 						LogToFile = false;
 						LogGenericException(e);
-						LogToFile = true;
 					}
 				}
 			}

ArchiSteamFarm/Program.cs

@@ -35,6 +35,8 @@ using System.Threading.Tasks;
 namespace ArchiSteamFarm {
 	internal static class Program {
 		internal enum EUserInputType : byte {
+			Unknown,
+			DeviceID,
 			Login,
 			Password,
 			PhoneNumber,
@@ -46,13 +48,12 @@ namespace ArchiSteamFarm {
 		}
 
 		internal enum EMode : byte {
+			Unknown,
 			Normal, // Standard most common usage
 			Client, // WCF client only
 			Server // Normal + WCF server
 		}
 
-		private const string GithubReleaseURL = "https://api.github.com/repos/JustArchi/ArchiSteamFarm/releases";
-
 		internal const string ASF = "ASF";
 		internal const string ConfigDirectory = "config";
 		internal const string DebugDirectory = "debug";
@@ -60,17 +61,19 @@ namespace ArchiSteamFarm {
 		internal const string GlobalConfigFile = ASF + ".json";
 		internal const string GlobalDatabaseFile = ASF + ".db";
 
+		private const string GithubReleaseURL = "https://api.github.com/repos/JustArchi/ArchiSteamFarm/releases"; // GitHub API is HTTPS only
+
+		private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
+		internal static readonly Version Version = Assembly.GetName().Version;
+
 		private static readonly object ConsoleLock = new object();
 		private static readonly SemaphoreSlim SteamSemaphore = new SemaphoreSlim(1);
 		private static readonly ManualResetEvent ShutdownResetEvent = new ManualResetEvent(false);
-		private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
 		private static readonly string ExecutableFile = Assembly.Location;
 		private static readonly string ExecutableName = Path.GetFileName(ExecutableFile);
 		private static readonly string ExecutableDirectory = Path.GetDirectoryName(ExecutableFile);
 		private static readonly WCF WCF = new WCF();
 
-		internal static readonly string Version = Assembly.GetName().Version.ToString();
-
 		internal static GlobalConfig GlobalConfig { get; private set; }
 		internal static GlobalDatabase GlobalDatabase { get; private set; }
 		internal static bool ConsoleIsBusy { get; private set; } = false;
@@ -141,9 +144,11 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			Logging.LogGenericInfo("Local version: " + Version + " | Remote version: " + releaseResponse.Tag);
+			Version newVersion = new Version(releaseResponse.Tag);
 
-			if (string.Compare(Version, releaseResponse.Tag, StringComparison.Ordinal) >= 0) { // If local version is the same or newer than remote version
+			Logging.LogGenericInfo("Local version: " + Version + " | Remote version: " + newVersion);
+
+			if (Version.CompareTo(newVersion) >= 0) { // If local version is the same or newer than remote version
 				if (GlobalConfig.AutoUpdates && AutoUpdatesTimer == null) {
 					Logging.LogGenericInfo("ASF will automatically check for new versions every 24 hours");
 					AutoUpdatesTimer = new Timer(
@@ -277,10 +282,17 @@ namespace ArchiSteamFarm {
 		}
 
 		internal static string GetUserInput(string botLogin, EUserInputType userInputType, string extraInformation = null) {
+			if (userInputType == EUserInputType.Unknown) {
+				return null;
+			}
+
 			string result;
 			lock (ConsoleLock) {
 				ConsoleIsBusy = true;
 				switch (userInputType) {
+					case EUserInputType.DeviceID:
+						Console.Write("<" + botLogin + "> Please enter your Device ID (including \"android:\"): ");
+						break;
 					case EUserInputType.Login:
 						Console.Write("<" + botLogin + "> Please enter your login: ");
 						break;
@@ -307,6 +319,9 @@ namespace ArchiSteamFarm {
 					case EUserInputType.TwoFactorAuthentication:
 						Console.Write("<" + botLogin + "> Please enter your 2 factor auth code from your authenticator app: ");
 						break;
+					default:
+						Console.Write("<" + botLogin + "> Please enter not documented yet value of \"" + userInputType + "\": ");
+						break;
 				}
 				result = Console.ReadLine();
 				Console.Clear(); // For security purposes
@@ -328,6 +343,7 @@ namespace ArchiSteamFarm {
 			}
 
 			Logging.LogGenericInfo("No bots are running, exiting");
+			Thread.Sleep(5000);
 			ShutdownResetEvent.Set();
 		}
 
@@ -356,13 +372,6 @@ namespace ArchiSteamFarm {
 				switch (arg) {
 					case "--client":
 						Mode = EMode.Client;
-						Logging.LogToFile = false;
-						break;
-					case "--log":
-						Logging.LogToFile = true;
-						break;
-					case "--no-log":
-						Logging.LogToFile = false;
 						break;
 					case "--server":
 						Mode = EMode.Server;
@@ -379,10 +388,10 @@ namespace ArchiSteamFarm {
 							continue;
 						}
 
-						Logging.LogGenericInfo("Command sent: \"" + arg + "\"");
+						Logging.LogGenericInfo("Command sent: " + arg);
 
 						// We intentionally execute this async block synchronously
-						Logging.LogGenericInfo("Response received: \"" + WCF.SendCommand(arg) + "\"");
+						Logging.LogGenericInfo("Response received: " + WCF.SendCommand(arg));
 						/*
 						Task.Run(async () => {
 							Logging.LogGenericNotice("WCF", "Response received: " + await WCF.SendCommand(arg).ConfigureAwait(false));
@@ -401,8 +410,17 @@ namespace ArchiSteamFarm {
 			Logging.LogGenericException((Exception) args.ExceptionObject);
 		}
 
-		private static void Main(string[] args) {
+		private static void UnobservedTaskExceptionHandler(object sender, UnobservedTaskExceptionEventArgs args) {
+			if (sender == null || args == null) {
+				return;
+			}
+
+			Logging.LogGenericException(args.Exception);
+		}
+
+		private static void Init(string[] args) {
 			AppDomain.CurrentDomain.UnhandledException += UnhandledExceptionHandler;
+			TaskScheduler.UnobservedTaskException += UnobservedTaskExceptionHandler;
 
 			Logging.LogGenericInfo("Archi's Steam Farm, version " + Version);
 			Directory.SetCurrentDirectory(ExecutableDirectory);
@@ -425,6 +443,18 @@ namespace ArchiSteamFarm {
 				}
 			}
 
+			// If debugging is on, we prepare debug directory prior to running
+			if (GlobalConfig.Debug) {
+				if (Directory.Exists(DebugDirectory)) {
+					Directory.Delete(DebugDirectory, true);
+					Thread.Sleep(1000); // Dirty workaround giving Windows some time to sync
+				}
+				Directory.CreateDirectory(DebugDirectory);
+
+				SteamKit2.DebugLog.AddListener(new Debugging.DebugListener(Path.Combine(Program.DebugDirectory, "debug.txt")));
+				SteamKit2.DebugLog.Enabled = true;
+			}
+
 			// Parse args
 			ParseArgs(args);
 
@@ -447,6 +477,8 @@ namespace ArchiSteamFarm {
 			// Before attempting to connect, initialize our list of CMs
 			Bot.RefreshCMs(GlobalDatabase.CellID).Wait();
 
+			bool isRunning = false;
+
 			foreach (var configFile in Directory.EnumerateFiles(ConfigDirectory, "*.json")) {
 				string botName = Path.GetFileNameWithoutExtension(configFile);
 				if (botName.Equals(ASF)) {
@@ -454,7 +486,9 @@ namespace ArchiSteamFarm {
 				}
 
 				Bot bot = new Bot(botName);
-				if (bot.BotConfig == null || !bot.BotConfig.Enabled) {
+				if (bot.BotConfig != null && bot.BotConfig.Enabled) {
+					isRunning = true;
+				} else {
 					Logging.LogGenericInfo("Not starting this instance because it's disabled in config file", botName);
 				}
 			}
@@ -464,23 +498,28 @@ namespace ArchiSteamFarm {
 				string botName = Path.GetFileNameWithoutExtension(configFile);
 				Logging.LogGenericWarning("Found legacy " + botName + ".xml config file, it will now be converted to new ASF V2.0 format!");
 				Bot bot = new Bot(botName);
-				if (bot.BotConfig == null || !bot.BotConfig.Enabled) {
+				if (bot.BotConfig != null && bot.BotConfig.Enabled) {
+					isRunning = true;
+				} else {
 					Logging.LogGenericInfo("Not starting this instance because it's disabled in config file", botName);
 				}
 			}
 			// CONVERSION END
 
 			// Check if we got any bots running
-			OnBotShutdown();
+			if (!isRunning) {
+				OnBotShutdown();
+			}
+		}
+
+		private static void Main(string[] args) {
+			Init(args);
 
 			// Wait for signal to shutdown
 			ShutdownResetEvent.WaitOne();
 
-			// We got a signal to shutdown, consider giving user some time to read the message
+			// We got a signal to shutdown
-			Thread.Sleep(5000);
+			Environment.Exit(0);
-
-			// This is over, cleanup only now
-			WCF.StopServer();
 		}
 	}
 }

ArchiSteamFarm/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.7")]
+[assembly: AssemblyVersion("2.0.1.4")]
-[assembly: AssemblyFileVersion("2.0.0.7")]
+[assembly: AssemblyFileVersion("2.0.1.4")]

ArchiSteamFarm/Trading.cs

@@ -22,6 +22,7 @@
 
 */
 
+using SteamAuth;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -35,6 +36,7 @@ namespace ArchiSteamFarm {
 
 		private readonly Bot Bot;
 		private readonly SemaphoreSlim Semaphore = new SemaphoreSlim(1);
+
 		private volatile byte ParsingTasks = 0;
 
 		internal static async Task LimitInventoryRequestsAsync() {
@@ -81,7 +83,7 @@ namespace ArchiSteamFarm {
 			}
 
 			await Task.WhenAll(tasks).ConfigureAwait(false);
-			await Bot.AcceptAllConfirmations().ConfigureAwait(false);
+			await Bot.AcceptConfirmations(Confirmation.ConfirmationType.Trade).ConfigureAwait(false);
 		}
 
 		private async Task ParseTrade(Steam.TradeOffer tradeOffer) {

ArchiSteamFarm/WCF.cs

@@ -113,12 +113,12 @@ namespace ArchiSteamFarm {
 				return "ERROR: Couldn't find any bot named: " + botName;
 			}
 
-			Logging.LogGenericInfo("Received command: \"" + input + "\"");
+			Logging.LogGenericInfo("Received command: " + input);
 
 			string command = '!' + input;
-			string output = bot.HandleMessage(command).Result; // TODO: This should be asynchronous
+			string output = bot.Response(Program.GlobalConfig.SteamOwnerID, command).Result; // TODO: This should be asynchronous
 
-			Logging.LogGenericInfo("Answered to command: \"" + input + "\" with: \"" + output + "\"");
+			Logging.LogGenericInfo("Answered to command: " + input + " with: " + output);
 			return output;
 		}
 	}

ArchiSteamFarm/WebBrowser.cs

@@ -31,18 +31,20 @@ using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using System.Xml;
 
 namespace ArchiSteamFarm {
 	internal static class WebBrowser {
-		internal const byte MaxConnections = 10; // Defines maximum number of connections per ServicePoint. Be careful, as it also defines maximum number of sockets in CLOSE_WAIT state
-		internal const byte MaxIdleTime = 15; // In seconds, how long socket is allowed to stay in CLOSE_WAIT state after there are no connections to it
 		internal const byte MaxRetries = 5; // Defines maximum number of retries, UrlRequest() does not handle retry by itself (it's app responsibility)
 
+		private const byte MaxConnections = 10; // Defines maximum number of connections per ServicePoint. Be careful, as it also defines maximum number of sockets in CLOSE_WAIT state
+		private const byte MaxIdleTime = 15; // In seconds, how long socket is allowed to stay in CLOSE_WAIT state after there are no connections to it
+
 		private static readonly string DefaultUserAgent = "ArchiSteamFarm/" + Program.Version;
 		private static readonly HttpClient HttpClient = new HttpClient(new HttpClientHandler {
 			UseCookies = false
 		}) {
-			Timeout = TimeSpan.FromSeconds(30)
+			Timeout = TimeSpan.FromSeconds(60)
 		};
 
 		internal static void Init() {
@@ -155,6 +157,28 @@ namespace ArchiSteamFarm {
 			return jObject;
 		}
 
+		internal static async Task<XmlDocument> UrlGetToXML(string request, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			string content = await UrlGetToContent(request, cookies, referer).ConfigureAwait(false);
+			if (string.IsNullOrEmpty(content)) {
+				return null;
+			}
+
+			XmlDocument xmlDocument = new XmlDocument();
+
+			try {
+				xmlDocument.LoadXml(content);
+			} catch (XmlException e) {
+				Logging.LogGenericException(e);
+				return null;
+			}
+
+			return xmlDocument;
+		}
+
 		private static async Task<HttpResponseMessage> UrlRequest(string request, HttpMethod httpMethod, Dictionary<string, string> data = null, Dictionary<string, string> cookies = null, string referer = null) {
 			if (string.IsNullOrEmpty(request) || httpMethod == null) {
 				return null;

ArchiSteamFarm/config/ASF.json

@@ -2,16 +2,21 @@
   "Debug": false,
   "AutoUpdates": true,
   "UpdateChannel": 1,
+  "SteamProtocol": 6,
+  "SteamOwnerID": 0,
   "MaxFarmingTime": 10,
   "IdleFarmingPeriod": 3,
   "FarmingDelay": 5,
   "AccountPlayingDelay": 5,
   "LoginLimiterDelay": 7,
   "InventoryLimiterDelay": 3,
-  "HttpTimeout": 30,
+  "ForceHttp": false,
+  "HttpTimeout": 60,
   "WCFHostname": "localhost",
   "WCFPort": 1242,
+  "LogToFile": true,
   "Statistics": true,
+  "HackIgnoreMachineID": false,
   "Blacklist": [
     267420,
     303700,

ArchiSteamFarm/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
   <package id="SteamKit2" version="1.7.0" targetFramework="net452" />
 </packages>

SteamAuth/SteamAuth.csproj

@@ -33,7 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

SteamAuth/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
 </packages>

packages/Newtonsoft.Json.8.0.3/lib/net20/Newtonsoft.Json.xml

@@ -604,6 +604,12 @@
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
             </summary>
         </member>
+        <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
+            </summary>
+            <param name="camelCaseText"><c>true</c> if the written enum text will be camel case; otherwise, <c>false</c>.</param>
+        </member>
         <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
             <summary>
             Writes the JSON representation of the object.
@@ -1058,6 +1064,12 @@
             </summary>
             <value>The method used when merging JSON arrays.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonMergeSettings.MergeNullValueHandling">
+            <summary>
+            Gets or sets how how null value properties are merged.
+            </summary>
+            <value>How null value properties are merged.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.MergeArrayHandling">
             <summary>
             Specifies how JSON arrays are merged together.
@@ -1075,6 +1087,21 @@
         <member name="F:Newtonsoft.Json.Linq.MergeArrayHandling.Merge">
             <summary>Merge array items together, matched by index.</summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.MergeNullValueHandling">
+            <summary>
+            Specifies how null value properties are merged.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.MergeNullValueHandling.Ignore">
+            <summary>
+            The content's null value properties will be ignored during merging.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.MergeNullValueHandling.Merge">
+            <summary>
+            The content's null value properties will be merged.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JPropertyDescriptor">
             <summary>
             Represents a view of a <see cref="T:Newtonsoft.Json.Linq.JProperty"/>.
@@ -3511,9 +3538,9 @@
         </member>
         <member name="M:Newtonsoft.Json.Linq.JValue.CreateUndefined">
             <summary>
-            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> null value.
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> undefined value.
             </summary>
-            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> null value.</returns>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> undefined value.</returns>
         </member>
         <member name="P:Newtonsoft.Json.Linq.JValue.Type">
             <summary>
@@ -6646,7 +6673,7 @@
         </member>
         <member name="F:Newtonsoft.Json.MemberSerialization.OptIn">
             <summary>
-            Only members must be marked with <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> or <see cref="!:DataMemberAttribute"/> are serialized.
+            Only members marked with <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> or <see cref="!:DataMemberAttribute"/> are serialized.
             This member serialization mode can also be set by marking the class with <see cref="!:DataContractAttribute"/>.
             </summary>
         </member>

packages/Newtonsoft.Json.8.0.3/lib/net35/Newtonsoft.Json.xml

@@ -627,6 +627,12 @@
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
             </summary>
         </member>
+        <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
+            </summary>
+            <param name="camelCaseText"><c>true</c> if the written enum text will be camel case; otherwise, <c>false</c>.</param>
+        </member>
         <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
             <summary>
             Writes the JSON representation of the object.
@@ -1190,6 +1196,12 @@
             </summary>
             <value>The method used when merging JSON arrays.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonMergeSettings.MergeNullValueHandling">
+            <summary>
+            Gets or sets how how null value properties are merged.
+            </summary>
+            <value>How null value properties are merged.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.MergeArrayHandling">
             <summary>
             Specifies how JSON arrays are merged together.
@@ -1207,6 +1219,21 @@
         <member name="F:Newtonsoft.Json.Linq.MergeArrayHandling.Merge">
             <summary>Merge array items together, matched by index.</summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.MergeNullValueHandling">
+            <summary>
+            Specifies how null value properties are merged.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.MergeNullValueHandling.Ignore">
+            <summary>
+            The content's null value properties will be ignored during merging.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.MergeNullValueHandling.Merge">
+            <summary>
+            The content's null value properties will be merged.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JRaw">
             <summary>
             Represents a raw JSON string.
@@ -3605,9 +3632,9 @@
         </member>
         <member name="M:Newtonsoft.Json.Linq.JValue.CreateUndefined">
             <summary>
-            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> null value.
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> undefined value.
             </summary>
-            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> null value.</returns>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> undefined value.</returns>
         </member>
         <member name="P:Newtonsoft.Json.Linq.JValue.Type">
             <summary>
@@ -5688,7 +5715,7 @@
         </member>
         <member name="F:Newtonsoft.Json.MemberSerialization.OptIn">
             <summary>
-            Only members must be marked with <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> or <see cref="T:System.Runtime.Serialization.DataMemberAttribute"/> are serialized.
+            Only members marked with <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> or <see cref="T:System.Runtime.Serialization.DataMemberAttribute"/> are serialized.
             This member serialization mode can also be set by marking the class with <see cref="T:System.Runtime.Serialization.DataContractAttribute"/>.
             </summary>
         </member>

packages/Newtonsoft.Json.8.0.3/lib/net40/Newtonsoft.Json.xml

@@ -699,6 +699,12 @@
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
             </summary>
         </member>
+        <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
+            </summary>
+            <param name="camelCaseText"><c>true</c> if the written enum text will be camel case; otherwise, <c>false</c>.</param>
+        </member>
         <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
             <summary>
             Writes the JSON representation of the object.
@@ -1173,6 +1179,12 @@
             </summary>
             <value>The method used when merging JSON arrays.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonMergeSettings.MergeNullValueHandling">
+            <summary>
+            Gets or sets how how null value properties are merged.
+            </summary>
+            <value>How null value properties are merged.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.MergeArrayHandling">
             <summary>
             Specifies how JSON arrays are merged together.
@@ -1190,6 +1202,21 @@
         <member name="F:Newtonsoft.Json.Linq.MergeArrayHandling.Merge">
             <summary>Merge array items together, matched by index.</summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.MergeNullValueHandling">
+            <summary>
+            Specifies how null value properties are merged.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.MergeNullValueHandling.Ignore">
+            <summary>
+            The content's null value properties will be ignored during merging.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.MergeNullValueHandling.Merge">
+            <summary>
+            The content's null value properties will be merged.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JRaw">
             <summary>
             Represents a raw JSON string.
@@ -3715,9 +3742,9 @@
         </member>
         <member name="M:Newtonsoft.Json.Linq.JValue.CreateUndefined">
             <summary>
-            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> null value.
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> undefined value.
             </summary>
-            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> null value.</returns>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> undefined value.</returns>
         </member>
         <member name="P:Newtonsoft.Json.Linq.JValue.Type">
             <summary>
@@ -5896,7 +5923,7 @@
         </member>
         <member name="F:Newtonsoft.Json.MemberSerialization.OptIn">
             <summary>
-            Only members must be marked with <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> or <see cref="T:System.Runtime.Serialization.DataMemberAttribute"/> are serialized.
+            Only members marked with <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> or <see cref="T:System.Runtime.Serialization.DataMemberAttribute"/> are serialized.
             This member serialization mode can also be set by marking the class with <see cref="T:System.Runtime.Serialization.DataContractAttribute"/>.
             </summary>
         </member>

packages/Newtonsoft.Json.8.0.3/lib/net45/Newtonsoft.Json.xml

@@ -778,6 +778,12 @@
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
             </summary>
         </member>
+        <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
+            </summary>
+            <param name="camelCaseText"><c>true</c> if the written enum text will be camel case; otherwise, <c>false</c>.</param>
+        </member>
         <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
             <summary>
             Writes the JSON representation of the object.
@@ -5094,6 +5100,12 @@
             </summary>
             <value>The method used when merging JSON arrays.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonMergeSettings.MergeNullValueHandling">
+            <summary>
+            Gets or sets how how null value properties are merged.
+            </summary>
+            <value>How null value properties are merged.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JProperty">
             <summary>
             Represents a JSON property.
@@ -6670,9 +6682,9 @@
         </member>
         <member name="M:Newtonsoft.Json.Linq.JValue.CreateUndefined">
             <summary>
-            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> null value.
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> undefined value.
             </summary>
-            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> null value.</returns>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> undefined value.</returns>
         </member>
         <member name="P:Newtonsoft.Json.Linq.JValue.Type">
             <summary>
@@ -6821,6 +6833,21 @@
         <member name="F:Newtonsoft.Json.Linq.MergeArrayHandling.Merge">
             <summary>Merge array items together, matched by index.</summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.MergeNullValueHandling">
+            <summary>
+            Specifies how null value properties are merged.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.MergeNullValueHandling.Ignore">
+            <summary>
+            The content's null value properties will be ignored during merging.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.MergeNullValueHandling.Merge">
+            <summary>
+            The content's null value properties will be merged.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.MemberSerialization">
             <summary>
             Specifies the member serialization options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
@@ -6834,7 +6861,7 @@
         </member>
         <member name="F:Newtonsoft.Json.MemberSerialization.OptIn">
             <summary>
-            Only members must be marked with <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> or <see cref="T:System.Runtime.Serialization.DataMemberAttribute"/> are serialized.
+            Only members marked with <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> or <see cref="T:System.Runtime.Serialization.DataMemberAttribute"/> are serialized.
             This member serialization mode can also be set by marking the class with <see cref="T:System.Runtime.Serialization.DataContractAttribute"/>.
             </summary>
         </member>

packages/Newtonsoft.Json.8.0.3/lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml

@@ -610,6 +610,12 @@
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
             </summary>
         </member>
+        <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
+            </summary>
+            <param name="camelCaseText"><c>true</c> if the written enum text will be camel case; otherwise, <c>false</c>.</param>
+        </member>
         <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
             <summary>
             Writes the JSON representation of the object.
@@ -4588,6 +4594,12 @@
             </summary>
             <value>The method used when merging JSON arrays.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonMergeSettings.MergeNullValueHandling">
+            <summary>
+            Gets or sets how how null value properties are merged.
+            </summary>
+            <value>How null value properties are merged.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JToken">
             <summary>
             Represents an abstract JSON token.
@@ -5961,9 +5973,9 @@
         </member>
         <member name="M:Newtonsoft.Json.Linq.JValue.CreateUndefined">
             <summary>
-            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> null value.
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> undefined value.
             </summary>
-            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> null value.</returns>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> undefined value.</returns>
         </member>
         <member name="P:Newtonsoft.Json.Linq.JValue.Type">
             <summary>
@@ -6086,6 +6098,21 @@
         <member name="F:Newtonsoft.Json.Linq.MergeArrayHandling.Merge">
             <summary>Merge array items together, matched by index.</summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.MergeNullValueHandling">
+            <summary>
+            Specifies how null value properties are merged.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.MergeNullValueHandling.Ignore">
+            <summary>
+            The content's null value properties will be ignored during merging.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.MergeNullValueHandling.Merge">
+            <summary>
+            The content's null value properties will be merged.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.MemberSerialization">
             <summary>
             Specifies the member serialization options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
@@ -6099,7 +6126,7 @@
         </member>
         <member name="F:Newtonsoft.Json.MemberSerialization.OptIn">
             <summary>
-            Only members must be marked with <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> or <see cref="T:System.Runtime.Serialization.DataMemberAttribute"/> are serialized.
+            Only members marked with <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> or <see cref="T:System.Runtime.Serialization.DataMemberAttribute"/> are serialized.
             This member serialization mode can also be set by marking the class with <see cref="T:System.Runtime.Serialization.DataContractAttribute"/>.
             </summary>
         </member>

packages/Newtonsoft.Json.8.0.3/lib/portable-net45+wp80+win8+wpa81+dnxcore50/Newtonsoft.Json.xml

@@ -650,6 +650,12 @@
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
             </summary>
         </member>
+        <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
+            </summary>
+            <param name="camelCaseText"><c>true</c> if the written enum text will be camel case; otherwise, <c>false</c>.</param>
+        </member>
         <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
             <summary>
             Writes the JSON representation of the object.
@@ -4858,6 +4864,12 @@
             </summary>
             <value>The method used when merging JSON arrays.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonMergeSettings.MergeNullValueHandling">
+            <summary>
+            Gets or sets how how null value properties are merged.
+            </summary>
+            <value>How null value properties are merged.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JToken">
             <summary>
             Represents an abstract JSON token.
@@ -6249,9 +6261,9 @@
         </member>
         <member name="M:Newtonsoft.Json.Linq.JValue.CreateUndefined">
             <summary>
-            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> null value.
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> undefined value.
             </summary>
-            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> null value.</returns>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> undefined value.</returns>
         </member>
         <member name="P:Newtonsoft.Json.Linq.JValue.Type">
             <summary>
@@ -6383,6 +6395,21 @@
         <member name="F:Newtonsoft.Json.Linq.MergeArrayHandling.Merge">
             <summary>Merge array items together, matched by index.</summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.MergeNullValueHandling">
+            <summary>
+            Specifies how null value properties are merged.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.MergeNullValueHandling.Ignore">
+            <summary>
+            The content's null value properties will be ignored during merging.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.MergeNullValueHandling.Merge">
+            <summary>
+            The content's null value properties will be merged.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.MemberSerialization">
             <summary>
             Specifies the member serialization options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
@@ -6396,7 +6423,7 @@
         </member>
         <member name="F:Newtonsoft.Json.MemberSerialization.OptIn">
             <summary>
-            Only members must be marked with <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> or <see cref="T:System.Runtime.Serialization.DataMemberAttribute"/> are serialized.
+            Only members marked with <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> or <see cref="T:System.Runtime.Serialization.DataMemberAttribute"/> are serialized.
             This member serialization mode can also be set by marking the class with <see cref="T:System.Runtime.Serialization.DataContractAttribute"/>.
             </summary>
         </member>