Correct anti-captcha delay

ArchiSteamFarm/ArchiHandler.cs

@@ -90,9 +90,23 @@ namespace ArchiSteamFarm {
 			Client.Send(request);
 		}
 
-		internal void PlayGames(params ulong[] gameIDs) {
+		internal void PlayGames(params uint[] gameIDs) {
 			var request = new ClientMsgProtobuf<CMsgClientGamesPlayed>(EMsg.ClientGamesPlayed);
-			foreach (ulong gameID in gameIDs) {
+			foreach (uint gameID in gameIDs) {
+				if (gameID == 0) {
+					continue;
+				}
+
+				request.Body.games_played.Add(new CMsgClientGamesPlayed.GamePlayed {
+					game_id = new GameID(gameID),
+				});
+			}
+			Client.Send(request);
+		}
+
+		internal void PlayGames(ICollection<uint> gameIDs) {
+			var request = new ClientMsgProtobuf<CMsgClientGamesPlayed>(EMsg.ClientGamesPlayed);
+			foreach (uint gameID in gameIDs) {
 				if (gameID == 0) {
 					continue;
 				}

ArchiSteamFarm/ArchiSteamFarm.csproj

@@ -50,6 +50,8 @@
     <DocumentationFile>
     </DocumentationFile>
     <Prefer32Bit>true</Prefer32Bit>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>cirno.ico</ApplicationIcon>
@@ -63,7 +65,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.1-beta2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.8.0.1-beta3\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">
@@ -97,6 +99,7 @@
     <Compile Include="SteamTradeOffer.cs" />
     <Compile Include="Trading.cs" />
     <Compile Include="Utilities.cs" />
+    <Compile Include="WebBrowser.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

ArchiSteamFarm/ArchiWebHandler.cs

@@ -33,8 +33,8 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
-	internal class ArchiWebHandler {
-		private const int Timeout = 1000 * 30; // In miliseconds
+	internal sealed class ArchiWebHandler {
+		private const int Timeout = 1000 * WebBrowser.HttpTimeout; // In miliseconds
 
 		private readonly Bot Bot;
 		private readonly string ApiKey;
@@ -131,7 +131,7 @@ namespace ArchiSteamFarm {
 					{"pin", parentalPin}
 				};
 
-				HttpResponseMessage response = await Utilities.UrlPostRequestWithResponse("https://steamcommunity.com/parental/ajaxunlock", postData, SteamCookieDictionary, "https://steamcommunity.com/").ConfigureAwait(false);
+				HttpResponseMessage response = await WebBrowser.UrlPost("https://steamcommunity.com/parental/ajaxunlock", postData, SteamCookieDictionary, "https://steamcommunity.com/").ConfigureAwait(false);
 				if (response != null && response.IsSuccessStatusCode) {
 					Logging.LogGenericInfo(Bot.BotName, "Success!");
 
@@ -241,7 +241,7 @@ namespace ArchiSteamFarm {
 				{"action", "join"}
 			};
 
-			await Utilities.UrlPostRequest(request, postData, SteamCookieDictionary).ConfigureAwait(false);
+			await WebBrowser.UrlPost(request, postData, SteamCookieDictionary).ConfigureAwait(false);
 		}
 
 		internal async Task LeaveClan(ulong clanID) {
@@ -260,7 +260,8 @@ namespace ArchiSteamFarm {
 				{"action", "leaveGroup"},
 				{"groupId", clanID.ToString()}
 			};
-			await Utilities.UrlPostRequest(request, postData, SteamCookieDictionary).ConfigureAwait(false);
+
+			await WebBrowser.UrlPost(request, postData, SteamCookieDictionary).ConfigureAwait(false);
 		}
 
 		internal async Task<bool> AcceptTradeOffer(ulong tradeID) {
@@ -282,7 +283,7 @@ namespace ArchiSteamFarm {
 				{"tradeofferid", tradeID.ToString()}
 			};
 
-			HttpResponseMessage result = await Utilities.UrlPostRequestWithResponse(request, postData, SteamCookieDictionary, referer).ConfigureAwait(false);
+			HttpResponseMessage result = await WebBrowser.UrlPost(request, postData, SteamCookieDictionary, referer).ConfigureAwait(false);
 			if (result == null) {
 				return false;
 			}
@@ -338,7 +339,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			return await Utilities.UrlToHtmlDocument("http://steamcommunity.com/profiles/" + SteamID + "/badges?p=" + page, SteamCookieDictionary).ConfigureAwait(false);
+			return await WebBrowser.UrlGetToHtmlDocument("http://steamcommunity.com/profiles/" + SteamID + "/badges?p=" + page, SteamCookieDictionary).ConfigureAwait(false);
 		}
 
 		internal async Task<HtmlDocument> GetGameCardsPage(ulong appID) {
@@ -346,7 +347,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			return await Utilities.UrlToHtmlDocument("http://steamcommunity.com/profiles/" + SteamID + "/gamecards/" + appID, SteamCookieDictionary).ConfigureAwait(false);
+			return await WebBrowser.UrlGetToHtmlDocument("http://steamcommunity.com/profiles/" + SteamID + "/gamecards/" + appID, SteamCookieDictionary).ConfigureAwait(false);
 		}
 	}
 }

ArchiSteamFarm/Bot.cs

@@ -32,7 +32,7 @@ using System.Threading.Tasks;
 using System.Xml;
 
 namespace ArchiSteamFarm {
-	internal class Bot {
+	internal sealed class Bot {
 		private const ushort CallbackSleep = 500; // In miliseconds
 
 		private static readonly ConcurrentDictionary<string, Bot> Bots = new ConcurrentDictionary<string, Bot>();
@@ -62,10 +62,29 @@ namespace ArchiSteamFarm {
 		internal string SteamParentalPIN { get; private set; } = "0";
 		internal ulong SteamMasterID { get; private set; } = 0;
 		internal ulong SteamMasterClanID { get; private set; } = 0;
+		internal bool CardDropsRestricted { get; private set; } = false;
 		internal bool ShutdownOnFarmingFinished { get; private set; } = false;
 		internal HashSet<uint> Blacklist { get; private set; } = new HashSet<uint> { 303700, 335590, 368020 };
 		internal bool Statistics { get; private set; } = true;
 
+		private static bool IsValidCdKey(string key) {
+			if (string.IsNullOrEmpty(key)) {
+				return false;
+			}
+
+			if (key.Length != 17 && key.Length != 29) {
+				return false;
+			}
+
+			for (byte i = 5; i < key.Length; i += 6) {
+				if (key[i] != '-') {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
 		internal static int GetRunningBotsCount() {
 			return Bots.Count;
 		}
@@ -176,6 +195,9 @@ namespace ArchiSteamFarm {
 							case "SteamMasterClanID":
 								SteamMasterClanID = ulong.Parse(value);
 								break;
+							case "CardDropsRestricted":
+								CardDropsRestricted = bool.Parse(value);
+								break;
 							case "ShutdownOnFarmingFinished":
 								ShutdownOnFarmingFinished = bool.Parse(value);
 								break;
@@ -250,10 +272,6 @@ namespace ArchiSteamFarm {
 			}
 		}
 
-		internal void PlayGame(params ulong[] gameIDs) {
-			ArchiHandler.PlayGames(gameIDs);
-		}
-
 		private void HandleCallbacks() {
 			TimeSpan timeSpan = TimeSpan.FromMilliseconds(CallbackSleep);
 			while (IsRunning) {
@@ -286,8 +304,8 @@ namespace ArchiSteamFarm {
 				}
 			}
 
-			if (bot.CardsFarmer.CurrentGame > 0) {
-				SendMessageToUser(steamID, "Bot " + bot.BotName + " is currently farming appID " + bot.CardsFarmer.CurrentGame + " and has total of " + bot.CardsFarmer.GamesLeft + " games left to farm");
+			if (bot.CardsFarmer.CurrentGamesFarming.Count > 0) {
+				SendMessageToUser(steamID, "Bot " + bot.BotName + " is currently farming appIDs: " + string.Join(", ", bot.CardsFarmer.CurrentGamesFarming) + " and has a total of " + bot.CardsFarmer.GamesToFarm.Count + " games left to farm");
 			}
 			SendMessageToUser(steamID, "Currently " + Bots.Count + " bots are running");
 		}
@@ -429,7 +447,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (message.Length == 17 && message[5] == '-' && message[11] == '-') {
+			if (IsValidCdKey(message)) {
 				ArchiHandler.RedeemKey(message);
 				return;
 			}
@@ -506,6 +524,12 @@ namespace ArchiSteamFarm {
 				case EResult.AccountLoginDeniedNeedTwoFactor:
 					TwoFactorAuth = Program.GetUserInput(SteamLogin, Program.EUserInputType.TwoFactorAuthentication);
 					break;
+				case EResult.InvalidPassword:
+					Logging.LogGenericWarning(BotName, "Unable to login to Steam: " + result + ", will retry after a longer while");
+					await Stop().ConfigureAwait(false);
+					await Utilities.SleepAsync(25 * 1000).ConfigureAwait(false); // Steam removes requirement of captcha after around 20 minutes
+					await Start().ConfigureAwait(false);
+					break;
 				case EResult.OK:
 					Logging.LogGenericInfo(BotName, "Successfully logged on!");
 
@@ -533,12 +557,12 @@ namespace ArchiSteamFarm {
 					break;
 				case EResult.Timeout:
 				case EResult.TryAnotherCM:
-					Logging.LogGenericWarning(BotName, "Unable to login to Steam: " + callback.Result + " / " + callback.ExtendedResult + ", retrying...");
+					Logging.LogGenericWarning(BotName, "Unable to login to Steam: " + result + ", retrying...");
 					await Stop().ConfigureAwait(false);
 					await Start().ConfigureAwait(false);
 					break;
 				default:
-					Logging.LogGenericWarning(BotName, "Unable to login to Steam: " + callback.Result + " / " + callback.ExtendedResult);
+					Logging.LogGenericWarning(BotName, "Unable to login to Steam: " + result);
 					await Shutdown().ConfigureAwait(false);
 					break;
 			}

ArchiSteamFarm/CardsFarmer.cs

@@ -23,20 +23,24 @@
 */
 
 using HtmlAgilityPack;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
-	internal class CardsFarmer {
+	internal sealed class CardsFarmer {
 		private const byte StatusCheckSleep = 5; // In minutes, how long to wait before checking the appID again
+		private const ushort MaxFarmingTime = 600; // In minutes, how long ASF is allowed to farm one game in solo mode
 
 		private readonly ManualResetEvent FarmResetEvent = new ManualResetEvent(false);
 		private readonly SemaphoreSlim Semaphore = new SemaphoreSlim(1);
 		private readonly Bot Bot;
 
-		internal uint CurrentGame { get; private set; } = 0;
-		internal int GamesLeft { get; private set; } = 0;
+		internal readonly ConcurrentDictionary<uint, double> GamesToFarm = new ConcurrentDictionary<uint, double>();
+		internal readonly List<uint> CurrentGamesFarming = new List<uint>();
 
 		private volatile bool NowFarming = false;
 
@@ -44,6 +48,81 @@ namespace ArchiSteamFarm {
 			Bot = bot;
 		}
 
+		internal static List<uint> GetGamesToFarmSolo(ConcurrentDictionary<uint, double> gamesToFarm) {
+			if (gamesToFarm == null) {
+				return null;
+			}
+
+			List<uint> result = new List<uint>();
+			foreach (KeyValuePair<uint, double> keyValue in gamesToFarm) {
+				if (keyValue.Value >= 2) {
+					result.Add(keyValue.Key);
+				}
+			}
+
+			return result;
+		}
+
+		internal static uint GetAnyGameToFarm(ConcurrentDictionary<uint, double> gamesToFarm) {
+			if (gamesToFarm == null) {
+				return 0;
+			}
+
+			foreach (uint appID in gamesToFarm.Keys) {
+				return appID;
+			}
+
+			return 0;
+		}
+
+		internal bool FarmMultiple() {
+			if (GamesToFarm == null || GamesToFarm.Count == 0) {
+				return true;
+			}
+
+			double maxHour = -1;
+
+			foreach (double hour in GamesToFarm.Values) {
+				if (hour > maxHour) {
+					maxHour = hour;
+				}
+			}
+
+			CurrentGamesFarming.Clear();
+			foreach (uint appID in GamesToFarm.Keys) {
+				CurrentGamesFarming.Add(appID);
+			}
+
+			Logging.LogGenericInfo(Bot.BotName, "Now farming: " + string.Join(", ", GamesToFarm.Keys));
+			if (Farm(maxHour, GamesToFarm.Keys)) {
+				return true;
+			} else {
+				CurrentGamesFarming.Clear();
+				NowFarming = false;
+				return false;
+			}
+		}
+
+		internal async Task<bool> FarmSolo(uint appID) {
+			if (appID == 0) {
+				return true;
+			}
+
+			CurrentGamesFarming.Clear();
+			CurrentGamesFarming.Add(appID);
+
+			Logging.LogGenericInfo(Bot.BotName, "Now farming: " + appID);
+			if (await Farm(appID).ConfigureAwait(false)) {
+				double hours;
+				GamesToFarm.TryRemove(appID, out hours);
+				return true;
+			} else {
+				CurrentGamesFarming.Clear();
+				NowFarming = false;
+				return false;
+			}
+		}
+
 		internal async Task StartFarming() {
 			await StopFarming().ConfigureAwait(false);
 
@@ -71,7 +150,6 @@ namespace ArchiSteamFarm {
 			}
 
 			// Find APPIDs we need to farm
-			List<uint> appIDs = new List<uint>();
 			for (var page = 1; page <= maxPages; page++) {
 				Logging.LogGenericInfo(Bot.BotName, "Checking page: " + page + "/" + maxPages);
 
@@ -87,16 +165,15 @@ namespace ArchiSteamFarm {
 					continue;
 				}
 
+				GamesToFarm.Clear();
 				foreach (HtmlNode badgesPageNode in badgesPageNodes) {
 					string steamLink = badgesPageNode.GetAttributeValue("href", null);
 					if (steamLink == null) {
-						Logging.LogGenericError(Bot.BotName, "Couldn't get steamLink for one of the games: " + badgesPageNode.OuterHtml);
 						continue;
 					}
 
 					uint appID = (uint) Utilities.OnlyNumbers(steamLink);
 					if (appID == 0) {
-						Logging.LogGenericError(Bot.BotName, "Couldn't get appID for one of the games: " + badgesPageNode.OuterHtml);
 						continue;
 					}
 
@@ -104,33 +181,89 @@ namespace ArchiSteamFarm {
 						continue;
 					}
 
-					appIDs.Add(appID);
+					// We assume that every game has at least 2 hours played, until we actually check them
+					GamesToFarm.AddOrUpdate(appID, 2, (key, value) => 2);
+				}
+			}
+
+			// If we have restricted card drops, actually do check all games that are left to farm
+			if (Bot.CardDropsRestricted) {
+				foreach (uint appID in GamesToFarm.Keys) {
+					Logging.LogGenericInfo(Bot.BotName, "Checking hours of appID: " + appID);
+					HtmlDocument appPage = await Bot.ArchiWebHandler.GetGameCardsPage(appID).ConfigureAwait(false);
+					if (appPage == null) {
+						continue;
+					}
+
+					HtmlNode appNode = appPage.DocumentNode.SelectSingleNode("//div[@class='badge_title_stats_playtime']");
+					if (appNode == null) {
+						continue;
+					}
+
+					string hoursString = appNode.InnerText;
+					if (string.IsNullOrEmpty(hoursString)) {
+						continue;
+					}
+
+					hoursString = Regex.Match(hoursString, @"[0-9\.,]+").Value;
+					double hours;
+
+					if (string.IsNullOrEmpty(hoursString)) {
+						hours = 0;
+					} else {
+						hours = double.Parse(hoursString, CultureInfo.InvariantCulture);
+					}
+
+					GamesToFarm[appID] = hours;
 				}
 			}
 
 			Logging.LogGenericInfo(Bot.BotName, "Farming in progress...");
-			NowFarming = appIDs.Count > 0;
+
+			NowFarming = GamesToFarm.Count > 0;
 			Semaphore.Release();
 
-			GamesLeft = appIDs.Count;
-
-			// Start farming
-			while (appIDs.Count > 0) {
-				uint appID = appIDs[0];
-				CurrentGame = appID;
-				Logging.LogGenericInfo(Bot.BotName, "Now farming: " + appID);
-				if (await Farm(appID).ConfigureAwait(false)) {
-					appIDs.Remove(appID);
-					GamesLeft--;
-				} else {
-					GamesLeft = 0;
-					CurrentGame = 0;
-					NowFarming = false;
-					return;
+			// Now the algorithm used for farming depends on whether account is restricted or not
+			if (Bot.CardDropsRestricted) {
+				// If we have restricted card drops, we use complex algorithm, which prioritizes farming solo titles >= 2 hours, then all at once, until any game hits mentioned 2 hours
+				Logging.LogGenericInfo(Bot.BotName, "Chosen farming algorithm: Complex");
+				while (GamesToFarm.Count > 0) {
+					List<uint> gamesToFarmSolo = GetGamesToFarmSolo(GamesToFarm);
+					if (gamesToFarmSolo.Count > 0) {
+						while (gamesToFarmSolo.Count > 0) {
+							uint appID = gamesToFarmSolo[0];
+							bool success = await FarmSolo(appID).ConfigureAwait(false);
+							if (success) {
+								Logging.LogGenericInfo(Bot.BotName, "Done farming: " + appID);
+								gamesToFarmSolo.Remove(appID);
+							} else {
+								return;
+							}
+						}
+					} else {
+						bool success = FarmMultiple();
+						if (success) {
+							Logging.LogGenericInfo(Bot.BotName, "Done farming: " + string.Join(", ", GamesToFarm.Keys));
+						} else {
+							return;
+						}
+					}
+				}
+			} else {
+				// If we have unrestricted card drops, we use simple algorithm and farm cards one-by-one
+				Logging.LogGenericInfo(Bot.BotName, "Chosen farming algorithm: Simple");
+				while (GamesToFarm.Count > 0) {
+					uint appID = GetAnyGameToFarm(GamesToFarm);
+					bool success = await FarmSolo(appID).ConfigureAwait(false);
+					if (success) {
+						Logging.LogGenericInfo(Bot.BotName, "Done farming: " + appID);
+					} else {
+						return;
+					}
 				}
 			}
 
-			CurrentGame = 0;
+			CurrentGamesFarming.Clear();
 			NowFarming = false;
 			Logging.LogGenericInfo(Bot.BotName, "Farming finished!");
 			await Bot.OnFarmingFinished().ConfigureAwait(false);
@@ -167,12 +300,13 @@ namespace ArchiSteamFarm {
 			return result;
 		}
 
-		private async Task<bool> Farm(ulong appID) {
-			Bot.PlayGame(appID);
+		private async Task<bool> Farm(uint appID) {
+			Bot.ArchiHandler.PlayGames(appID);
 
 			bool success = true;
+
 			bool? keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
-			while (keepFarming == null || keepFarming.Value) {
+			for (ushort farmingTime = 0; farmingTime <= MaxFarmingTime && (!keepFarming.HasValue || keepFarming.Value); farmingTime += StatusCheckSleep) {
 				Logging.LogGenericInfo(Bot.BotName, "Still farming: " + appID);
 				if (FarmResetEvent.WaitOne(1000 * 60 * StatusCheckSleep)) {
 					success = false;
@@ -181,9 +315,42 @@ namespace ArchiSteamFarm {
 				keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
 			}
 
-			Bot.PlayGame(0);
+			Bot.ArchiHandler.PlayGames(0);
 			Logging.LogGenericInfo(Bot.BotName, "Stopped farming: " + appID);
 			return success;
 		}
+
+		private bool Farm(double maxHour, ICollection<uint> appIDs) {
+			if (maxHour >= 2) {
+				return true;
+			}
+
+			Bot.ArchiHandler.PlayGames(appIDs);
+
+			bool success = true;
+			while (maxHour < 2) {
+				Logging.LogGenericInfo(Bot.BotName, "Still farming: " + string.Join(", ", appIDs));
+				if (FarmResetEvent.WaitOne(1000 * 60 * StatusCheckSleep)) {
+					success = false;
+					break;
+				}
+
+				// Don't forget to update our GamesToFarm hours
+				double timePlayed = StatusCheckSleep / 60.0;
+				foreach (KeyValuePair<uint, double> keyValue in GamesToFarm) {
+					if (!appIDs.Contains(keyValue.Key)) {
+						continue;
+					}
+
+					GamesToFarm[keyValue.Key] = keyValue.Value + timePlayed;
+				}
+
+				maxHour += timePlayed;
+			}
+
+			Bot.ArchiHandler.PlayGames(0);
+			Logging.LogGenericInfo(Bot.BotName, "Stopped farming: " + string.Join(", ", appIDs));
+			return success;
+		}
 	}
 }

ArchiSteamFarm/Program.cs

@@ -50,12 +50,12 @@ namespace ArchiSteamFarm {
 		private static readonly string ExecutablePath = Assembly.Location;
 		private static readonly AssemblyName AssemblyName = Assembly.GetName();
 		//private static readonly string ExeName = AssemblyName.Name + ".exe";
-		private static readonly string Version = AssemblyName.Version.ToString();
 
+		internal static readonly string Version = AssemblyName.Version.ToString();
 		internal static readonly object ConsoleLock = new object();
 
 		private static async Task CheckForUpdate() {
-			JObject response = await Utilities.UrlToJObject(LatestGithubReleaseURL).ConfigureAwait(false);
+			JObject response = await WebBrowser.UrlGetToJObject(LatestGithubReleaseURL).ConfigureAwait(false);
 			if (response == null) {
 				return;
 			}
@@ -133,9 +133,15 @@ namespace ArchiSteamFarm {
 			}
 		}
 
+		private static void InitServices() {
+			WebBrowser.Init();
+		}
+
 		private static void Main(string[] args) {
 			Logging.LogGenericInfo("Main", "Archi's Steam Farm, version " + Version);
 
+			InitServices();
+
 			Task.Run(async () => await CheckForUpdate().ConfigureAwait(false)).Wait();
 
 			// Allow loading configs from source tree if it's a debug build

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("0.7.0.0")]
-[assembly: AssemblyFileVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.8.0.0")]
+[assembly: AssemblyFileVersion("0.8.0.0")]

ArchiSteamFarm/Utilities.cs

@@ -22,14 +22,8 @@
 
 */
 
-using HtmlAgilityPack;
-using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Net;
-using System.Net.Http;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
@@ -37,6 +31,14 @@ namespace ArchiSteamFarm {
 	internal static class Utilities {
 		private static readonly Random Random = new Random();
 
+		internal static int RandomNumber(int min, int max) {
+			return Random.Next(min, max + 1);
+		}
+
+		internal static byte RandomDice() {
+			return (byte) RandomNumber(1, 6);
+		}
+
 		internal static async Task SleepAsync(int miliseconds) {
 			await Task.Delay(miliseconds).ConfigureAwait(false);
 		}
@@ -57,161 +59,5 @@ namespace ArchiSteamFarm {
 
 			return ulong.Parse(resultString, CultureInfo.InvariantCulture);
 		}
-
-		internal static async Task<HttpResponseMessage> UrlToHttpResponse(string websiteAddress, Dictionary<string, string> cookieVariables = null) {
-			if (string.IsNullOrEmpty(websiteAddress)) {
-				return null;
-			}
-
-			HttpResponseMessage result = null;
-
-			try {
-				using (HttpClientHandler clientHandler = new HttpClientHandler { UseCookies = false }) {
-					using (HttpClient client = new HttpClient(clientHandler)) {
-						client.Timeout = TimeSpan.FromSeconds(30);
-						client.DefaultRequestHeaders.UserAgent.ParseAdd("ArchiSteamFarm/1.0");
-						HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, websiteAddress);
-						if (cookieVariables != null) {
-							StringBuilder cookie = new StringBuilder();
-							foreach (KeyValuePair<string, string> cookieVariable in cookieVariables) {
-								cookie.Append(cookieVariable.Key + "=" + cookieVariable.Value + ";");
-							}
-							requestMessage.Headers.Add("Cookie", cookie.ToString());
-						}
-						HttpResponseMessage responseMessage = await client.SendAsync(requestMessage).ConfigureAwait(false);
-						if (responseMessage != null) {
-							responseMessage.EnsureSuccessStatusCode();
-							result = responseMessage;
-						}
-					}
-				}
-			} catch (Exception e) {
-				Logging.LogGenericException("Utilities", e);
-			}
-
-			return result;
-		}
-
-		internal static async Task<HtmlDocument> UrlToHtmlDocument(string websiteAddress, Dictionary<string, string> cookieVariables = null) {
-			if (string.IsNullOrEmpty(websiteAddress)) {
-				return null;
-			}
-
-			HtmlDocument result = null;
-
-			try {
-				HttpResponseMessage responseMessage = await UrlToHttpResponse(websiteAddress, cookieVariables).ConfigureAwait(false);
-				if (responseMessage != null) {
-					string source = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
-					if (!string.IsNullOrEmpty(source)) {
-						source = WebUtility.HtmlDecode(source);
-						result = new HtmlDocument();
-						result.LoadHtml(source);
-					}
-				}
-			} catch (Exception e) {
-				Logging.LogGenericException("Utilities", e);
-			}
-
-			return result;
-		}
-
-		internal static async Task<bool> UrlPostRequest(string request, Dictionary<string, string> postData, Dictionary<string, string> cookieVariables = null, string referer = null) {
-			if (string.IsNullOrEmpty(request) || postData == null) {
-				return false;
-			}
-
-			bool result = false;
-
-			try {
-				using (HttpClientHandler clientHandler = new HttpClientHandler { UseCookies = false }) {
-					using (HttpClient client = new HttpClient(clientHandler)) {
-						client.Timeout = TimeSpan.FromSeconds(30);
-						client.DefaultRequestHeaders.UserAgent.ParseAdd("ArchiSteamFarm/1.0");
-						HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, request);
-						requestMessage.Content = new FormUrlEncodedContent(postData);
-						if (cookieVariables != null && cookieVariables.Count > 0) {
-							StringBuilder cookie = new StringBuilder();
-							foreach (KeyValuePair<string, string> cookieVariable in cookieVariables) {
-								cookie.Append(cookieVariable.Key + "=" + cookieVariable.Value + ";");
-							}
-							requestMessage.Headers.Add("Cookie", cookie.ToString());
-						}
-						if (referer != null) {
-							requestMessage.Headers.Referrer = new Uri(referer);
-						}
-						HttpResponseMessage responseMessage = await client.SendAsync(requestMessage).ConfigureAwait(false);
-						if (responseMessage != null) {
-							result = responseMessage.IsSuccessStatusCode;
-						}
-					}
-				}
-			} catch (Exception e) {
-				Logging.LogGenericException("Utilities", e);
-			}
-
-			return result;
-		}
-
-		internal static async Task<HttpResponseMessage> UrlPostRequestWithResponse(string request, Dictionary<string, string> postData, Dictionary<string, string> cookieVariables = null, string referer = null) {
-			if (string.IsNullOrEmpty(request) || postData == null) {
-				return null;
-			}
-
-			HttpResponseMessage result = null;
-
-			try {
-				using (HttpClientHandler clientHandler = new HttpClientHandler { UseCookies = false }) {
-					using (HttpClient client = new HttpClient(clientHandler)) {
-						client.Timeout = TimeSpan.FromSeconds(30);
-						client.DefaultRequestHeaders.UserAgent.ParseAdd("ArchiSteamFarm/1.0");
-						HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, request);
-						requestMessage.Content = new FormUrlEncodedContent(postData);
-						if (cookieVariables != null && cookieVariables.Count > 0) {
-							StringBuilder cookie = new StringBuilder();
-							foreach (KeyValuePair<string, string> cookieVariable in cookieVariables) {
-								cookie.Append(cookieVariable.Key + "=" + cookieVariable.Value + ";");
-							}
-							requestMessage.Headers.Add("Cookie", cookie.ToString());
-						}
-						if (referer != null) {
-							requestMessage.Headers.Referrer = new Uri(referer);
-						}
-						HttpResponseMessage responseMessage = await client.SendAsync(requestMessage).ConfigureAwait(false);
-						if (responseMessage != null) {
-							result = responseMessage;
-						}
-					}
-				}
-			} catch (Exception e) {
-				Logging.LogGenericException("Utilities", e);
-			}
-
-			return result;
-		}
-
-		internal static async Task<JObject> UrlToJObject(string request) {
-			if (string.IsNullOrEmpty(request)) {
-				return null;
-			}
-
-			HttpResponseMessage httpResponseMessage = await UrlToHttpResponse(request, null).ConfigureAwait(false);
-			if (httpResponseMessage == null) {
-				return null;
-			}
-
-			string source = await httpResponseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
-			if (string.IsNullOrEmpty(source)) {
-				return null;
-			}
-
-			JObject result = null;
-			try {
-				result = JObject.Parse(source);
-			} catch {
-			}
-
-			return result;
-		}
 	}
 }

ArchiSteamFarm/WebBrowser.cs

@@ -0,0 +1,220 @@
+using HtmlAgilityPack;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+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 HttpTimeout = 180; // In seconds
+
+		private static readonly HttpClientHandler HttpClientHandler = new HttpClientHandler { UseCookies = false };
+		private static readonly HttpClient HttpClient = new HttpClient(HttpClientHandler) { Timeout = TimeSpan.FromSeconds(HttpTimeout) };
+
+		internal static void Init() {
+			HttpClient.DefaultRequestHeaders.UserAgent.ParseAdd("ArchiSteamFarm/" + Program.Version);
+		}
+
+		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;
+			}
+
+			HttpRequestMessage requestMessage = new HttpRequestMessage(httpMethod, request);
+
+			if (httpMethod == HttpMethod.Post && data != null) {
+				requestMessage.Content = new FormUrlEncodedContent(data);
+			}
+
+			if (cookies != null && cookies.Count > 0) {
+				StringBuilder cookieHeader = new StringBuilder();
+				foreach (KeyValuePair<string, string> cookie in cookies) {
+					cookieHeader.Append(cookie.Key + "=" + cookie.Value + ";");
+				}
+				requestMessage.Headers.Add("Cookie", cookieHeader.ToString());
+			}
+
+			if (referer != null) {
+				requestMessage.Headers.Referrer = new Uri(referer);
+			}
+
+			HttpResponseMessage responseMessage;
+
+			try {
+				responseMessage = await HttpClient.SendAsync(requestMessage).ConfigureAwait(false);
+			} catch { // Request failed, we don't need to know the exact reason, swallow exception
+				return null;
+			}
+
+			if (responseMessage == null || !responseMessage.IsSuccessStatusCode) {
+				return null;
+			}
+
+			if (!responseMessage.IsSuccessStatusCode) {
+				return null;
+			}
+
+			return responseMessage;
+		}
+
+		internal static async Task<HttpResponseMessage> UrlGet(string request, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			return await UrlRequest(request, HttpMethod.Get, null, cookies, referer).ConfigureAwait(false);
+		}
+
+		internal static async Task<HttpResponseMessage> UrlPost(string request, Dictionary<string, string> postData = null, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			return await UrlRequest(request, HttpMethod.Post, postData, cookies, referer).ConfigureAwait(false);
+		}
+
+		internal static async Task<HtmlDocument> HttpResponseToHtmlDocument(HttpResponseMessage httpResponse) {
+			if (httpResponse == null || httpResponse.Content == null) {
+				return null;
+			}
+
+			string content = await httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+			if (string.IsNullOrEmpty(content)) {
+				return null;
+			}
+
+			content = WebUtility.HtmlDecode(content);
+			HtmlDocument htmlDocument = new HtmlDocument();
+			htmlDocument.LoadHtml(content);
+
+			return htmlDocument;
+		}
+
+		internal static async Task<string> UrlGetToContent(string request, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			HttpResponseMessage responseMessage = await UrlGet(request, cookies, referer).ConfigureAwait(false);
+			if (responseMessage == null || responseMessage.Content == null) {
+				return null;
+			}
+
+			return await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
+		}
+
+		internal static async Task<string> UrlPostToContent(string request, Dictionary<string, string> postData = null, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			HttpResponseMessage responseMessage = await UrlPost(request, postData, cookies, referer).ConfigureAwait(false);
+			if (responseMessage == null || responseMessage.Content == null) {
+				return null;
+			}
+
+			return await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
+		}
+
+		internal static async Task<string> UrlGetToTitle(string request, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			HtmlDocument htmlDocument = await UrlGetToHtmlDocument(request, cookies, referer).ConfigureAwait(false);
+			if (htmlDocument == null) {
+				return null;
+			}
+
+			HtmlNode htmlNode = htmlDocument.DocumentNode.SelectSingleNode("//head/title");
+			if (htmlNode == null) {
+				return null;
+			}
+
+			return htmlNode.InnerText;
+		}
+
+		internal static async Task<HtmlDocument> UrlGetToHtmlDocument(string request, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			HttpResponseMessage httpResponse = await UrlGet(request, cookies, referer).ConfigureAwait(false);
+			if (httpResponse == null) {
+				return null;
+			}
+
+			return await HttpResponseToHtmlDocument(httpResponse).ConfigureAwait(false);
+		}
+
+		internal static async Task<JArray> UrlGetToJArray(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;
+			}
+
+			JArray jArray;
+
+			try {
+				jArray = JArray.Parse(content);
+			} catch (Exception e) {
+				Logging.LogGenericException("WebBrowser", e);
+				return null;
+			}
+
+			return jArray;
+		}
+
+		internal static async Task<JObject> UrlGetToJObject(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;
+			}
+
+			JObject jObject;
+
+			try {
+				jObject = JObject.Parse(content);
+			} catch (Exception e) {
+				Logging.LogGenericException("WebBrowser", e);
+				return null;
+			}
+
+			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("WebBrowser", e);
+				return null;
+			}
+
+			return xmlDocument;
+		}
+	}
+}

ArchiSteamFarm/config/example.xml

@@ -43,6 +43,12 @@
 	<!-- TIP: Most likely you don't want to change it -->
 	<SteamMasterClanID type="ulong" value="0"/>
 
+	<!-- This switch defines if the account has card drops restricted -->
+	<!-- Restricted card drops means that the account doesn't receive any steam cards until it plays the game for at least 2 hours -->
+	<!-- As there is no magical way to detect it by ASF, I made this option config-based switch -->
+	<!-- TIP: Based on this parameter, ASF will try to choose the most optimized cards farming algorithm for this account -->
+	<CardDropsRestricted type="bool" value="false"/>
+
 	<!-- This switch defines if bot should disconnect once farming is finished -->
 	<!-- When no bots are active, ASF will shutdown as well -->
 	<!-- Some people may want to keep their bots 24/7, other disconnect them after job is done -->

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.1-beta2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="8.0.1-beta3" targetFramework="net45" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
   <package id="SteamKit2" version="1.6.5" targetFramework="net45" />
 </packages>

README.md

@@ -1,42 +1,53 @@
 ArchiSteamFarm
 ===================
 
-Big work-in-progress. This bot allows you to farm steam cards using multiple accounts simultaneously. Each account is defined by it's own XML config in `config` directory and you don´t need any steam-client running in the background.
+ASF is a C# application that allows you to farm steam cards using multiple steam accounts simultaneously. Unlike idle master which works only on one account at given time, requires steam client running in background, and launches additional processes imitiating "game playing" status, ASF doesn't require any steam client running in the background, doesn't launch any additional processes and is made to handle unlimited steam accounts at once. In addition to that, it's meant to be run on servers or other desktop-less machines, and features full Mono support, which makes it possible to launch on any Mono-supported operating system, such as Windows, Linux or OS X. ASF is based on, and possible, thanks to [SteamKit2](https://github.com/SteamRE/SteamKit).
 
-**Current functions:**
+**Core features:**
 
- - Automatically farm steam cards using any number of active accounts
+ - Automatically farm available games using any number of active accounts
  - Automatically accept friend requests sent from master
  - Automatically accept all trades coming from master
  - Automatically accept all steam cd-keys sent via chat from master
- - SteamGuard / 2-factor-authentication support
- - Full Mono support, tested on Debian "9.0" Stretch (testing)
+ - Possibility to choose the most efficient cards farming algorithm, based on given account
+ - SteamGuard / SteamParental / 2FA support
+ - Update notifications
+ - Full Mono support, cross-OS compatibility
+
+**Setting up:**
+
+Each ASF bot is defined in it's own XML config file in `config` directory. ASF comes with included ```example.xml``` config file, on which you should base all of your bots. Simply copy ```example.xml``` to a new file, and edit properties inside. Don't forget to switch ```Enabled``` property to ```true``` once you're done, as this is the master switch which enables configured bot to launch.
+
+ASF expects exclusive access to all steam accounts it's using, which means that you should not use the account which is currently being used by ASF at the same time. You may however ```!start``` and ```!stop``` bots during farming, as well as use config property such as ```ShutdownOnFarmingFinished``` which will automatically release account after farming is done.
+
+After you set up all your bots (their configs), you should launch ```ASF.exe```. If your accounts require additional steps to unlock, such as Steam guard code, you'll need to enter those too after ASF tries to launch given bot. If everything ended properly, you should notice in the console output, as well as on your Steam, that all of your bots automatically started cards farming.
+
+ASF doesn't require and doesn't interfere in any way with Steam client, which means that you can be logged in to Steam client as your primary account with e.g. Idle Master in the background, and launch ASF for all other accounts (your alts) at the same time.
 
 **Current Commands:**
 
  - `!exit` Stops whole ASF
- - `!farm` Restarts the bot and starts card-farming (again)
- - `!start <BOT>` Starts given bot instance
+ - `!farm` Restarts cards farming module. ASF automatically executes that if any cd-key is successfully claimed
+ - `!redeem <KEY>` Redeems cd-key on current bot instance. You can also paste cd-key directly to the chat
+ - `!start <BOT>` Starts given bot instance, after it was ```!stop```pped
  - `!status` Prints current status of ASF
+ - `!stop` Stops current bot instance
  - `!stop <BOT>` Stops given bot instance
 
-> You can use chat-commands in group-chat or private-chat with your bot.
-> The MasterID has to be set for this specific bot / config-file.
+> Commands can be executed via a private chat with your bot.
+> Remember that bot accepts commands only from ```SteamMasterID```. That property can be configured in the config.
 
 **Supported / Tested Operating-Systems:**
 
- - Windows 10 Enterprise Edition
+ - Windows 10 Professional/Enterprise Edition (Native)
+ - Windows 8.1 Professional (Native)
+ - Windows 7 Ultimate (Native)
  - Debian 9.0 Stretch (Mono)
  - Debian 8.1 Jessie (Mono)
+ - OS X 10.11.1 (Mono)
+ 
+However, any operating system [listed here](http://www.mono-project.com/docs/about-mono/supported-platforms/) should run ASF flawlessly.
 
-**TODO**:
+**Need help or more info?**
 
-- Smart Multi-Game-Farming
-- Possible integration with SteamTradeMatcher, bot can detect dupes and trade them automatically. Backend-code is already here, just missing actual implementation.
-- Automatic sending of steamtrades to master(after game is fully farmed)
-- Probably much more
-
-
-> This is big WIP, so feel free to send pull requests if you wish. I'll
-> release some releases later, when everything is tested and code
-> cleaned up.
+Head over to our [wiki](https://github.com/JustArchi/ArchiSteamFarm/wiki) then.

packages/Newtonsoft.Json.8.0.1-beta3/lib/net20/Newtonsoft.Json.xml

@@ -1047,6 +1047,21 @@
             Load comments as a <see cref="T:Newtonsoft.Json.Linq.JValue"/> with type <see cref="F:Newtonsoft.Json.Linq.JTokenType.Comment"/>.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.LineInfoHandling">
+            <summary>
+            Specifies how line information is handled when loading JSON.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Ignore">
+            <summary>
+            Ignore line information.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Load">
+            <summary>
+            Load line information.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonLoadSettings">
             <summary>
             Specifies the settings used when loading JSON.
@@ -1058,6 +1073,12 @@
             </summary>
             <value>The JSON comment handling.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonLoadSettings.LineInfoHandling">
+            <summary>
+            Gets or sets how JSON line info is handled when loading JSON.
+            </summary>
+            <value>The JSON line info handling.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonMergeSettings">
             <summary>
             Specifies the settings used when merging JSON.
@@ -6093,6 +6114,11 @@
             The property must be defined in JSON and cannot be a null value.
             </summary>
         </member>
+        <member name="F:Newtonsoft.Json.Required.DisallowNull">
+            <summary>
+            The property is not required but it cannot be a null value.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.PreserveReferencesHandling">
             <summary>
             Specifies reference handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.

packages/Newtonsoft.Json.8.0.1-beta3/lib/net35/Newtonsoft.Json.xml

@@ -1098,6 +1098,21 @@
             Load comments as a <see cref="T:Newtonsoft.Json.Linq.JValue"/> with type <see cref="F:Newtonsoft.Json.Linq.JTokenType.Comment"/>.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.LineInfoHandling">
+            <summary>
+            Specifies how line information is handled when loading JSON.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Ignore">
+            <summary>
+            Ignore line information.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Load">
+            <summary>
+            Load line information.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JPropertyDescriptor">
             <summary>
             Represents a view of a <see cref="T:Newtonsoft.Json.Linq.JProperty"/>.
@@ -1198,6 +1213,12 @@
             </summary>
             <value>The JSON comment handling.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonLoadSettings.LineInfoHandling">
+            <summary>
+            Gets or sets how JSON line info is handled when loading JSON.
+            </summary>
+            <value>The JSON line info handling.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonMergeSettings">
             <summary>
             Specifies the settings used when merging JSON.
@@ -5143,6 +5164,11 @@
             The property must be defined in JSON and cannot be a null value.
             </summary>
         </member>
+        <member name="F:Newtonsoft.Json.Required.DisallowNull">
+            <summary>
+            The property is not required but it cannot be a null value.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.PreserveReferencesHandling">
             <summary>
             Specifies reference handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.

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

@@ -3643,6 +3643,21 @@
             Load comments as a <see cref="T:Newtonsoft.Json.Linq.JValue"/> with type <see cref="F:Newtonsoft.Json.Linq.JTokenType.Comment"/>.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.LineInfoHandling">
+            <summary>
+            Specifies how line information is handled when loading JSON.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Ignore">
+            <summary>
+            Ignore line information.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Load">
+            <summary>
+            Load line information.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.Extensions">
             <summary>
             Contains the LINQ to JSON extension methods.
@@ -4546,6 +4561,12 @@
             </summary>
             <value>The JSON comment handling.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonLoadSettings.LineInfoHandling">
+            <summary>
+            Gets or sets how JSON line info is handled when loading JSON.
+            </summary>
+            <value>The JSON line info handling.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonMergeSettings">
             <summary>
             Specifies the settings used when merging JSON.
@@ -6260,6 +6281,11 @@
             The property must be defined in JSON and cannot be a null value.
             </summary>
         </member>
+        <member name="F:Newtonsoft.Json.Required.DisallowNull">
+            <summary>
+            The property is not required but it cannot be a null value.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Schema.Extensions">
             <summary>
             <para>

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

@@ -3893,6 +3893,21 @@
             Load comments as a <see cref="T:Newtonsoft.Json.Linq.JValue"/> with type <see cref="F:Newtonsoft.Json.Linq.JTokenType.Comment"/>.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.LineInfoHandling">
+            <summary>
+            Specifies how line information is handled when loading JSON.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Ignore">
+            <summary>
+            Ignore line information.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Load">
+            <summary>
+            Load line information.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.Extensions">
             <summary>
             Contains the LINQ to JSON extension methods.
@@ -4816,6 +4831,12 @@
             </summary>
             <value>The JSON comment handling.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonLoadSettings.LineInfoHandling">
+            <summary>
+            Gets or sets how JSON line info is handled when loading JSON.
+            </summary>
+            <value>The JSON line info handling.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonMergeSettings">
             <summary>
             Specifies the settings used when merging JSON.
@@ -6557,6 +6578,11 @@
             The property must be defined in JSON and cannot be a null value.
             </summary>
         </member>
+        <member name="F:Newtonsoft.Json.Required.DisallowNull">
+            <summary>
+            The property is not required but it cannot be a null value.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Schema.Extensions">
             <summary>
             <para>