diff --git a/FFXIVAPP.Client/FFXIVAPP.Client.csproj b/FFXIVAPP.Client/FFXIVAPP.Client.csproj index 226178a0..bf812f9d 100644 --- a/FFXIVAPP.Client/FFXIVAPP.Client.csproj +++ b/FFXIVAPP.Client/FFXIVAPP.Client.csproj @@ -77,8 +77,9 @@ ..\..\ffxivapp-resources\FFXIVAPP.Localization.dll - - ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll + + False + ..\..\ffxivapp-aio\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll False @@ -90,10 +91,11 @@ False - ..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\ffxivapp-aio\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll - - ..\packages\NLog.2.1.0\lib\net45\NLog.dll + + False + ..\..\ffxivapp-aio\packages\NLog.3.1.0.0\lib\net45\NLog.dll @@ -134,6 +136,7 @@ + @@ -309,6 +312,9 @@ Designer + + Always + Designer diff --git a/FFXIVAPP.Client/Helpers/ActorEntityHelper.cs b/FFXIVAPP.Client/Helpers/ActorEntityHelper.cs index 6e4c374b..e16bd3c8 100644 --- a/FFXIVAPP.Client/Helpers/ActorEntityHelper.cs +++ b/FFXIVAPP.Client/Helpers/ActorEntityHelper.cs @@ -69,21 +69,21 @@ public static ActorEntity ResolveActorFromBytes(byte[] source) entry.ClaimedByID = BitConverter.ToUInt32(source, 0x1A0); var targetID = BitConverter.ToUInt32(source, 0x1A8); var pcTargetID = BitConverter.ToUInt32(source, 0xAA8); - entry.Job = (Actor.Job) source[0x1790]; - entry.Level = source[0x1791]; - entry.GrandCompany = source[0x1793]; - entry.GrandCompanyRank = source[0x1794]; - entry.Title = source[0x1796]; - entry.HPCurrent = BitConverter.ToInt32(source, 0x1798); - entry.HPMax = BitConverter.ToInt32(source, 0x179C); - entry.MPCurrent = BitConverter.ToInt32(source, 0x17A0); - entry.MPMax = BitConverter.ToInt32(source, 0x17A4); - entry.TPCurrent = BitConverter.ToInt16(source, 0x17A8); + entry.Job = (Actor.Job) source[0x17C0]; + entry.Level = source[0x17C1]; + entry.GrandCompany = source[0x17C3]; + entry.GrandCompanyRank = source[0x17C4]; + entry.Title = source[0x17C6]; + entry.HPCurrent = BitConverter.ToInt32(source, 0x17C8); + entry.HPMax = BitConverter.ToInt32(source, 0x17CC); + entry.MPCurrent = BitConverter.ToInt32(source, 0x17D0); + entry.MPMax = BitConverter.ToInt32(source, 0x17D4); + entry.TPCurrent = BitConverter.ToInt16(source, 0x17D8); entry.TPMax = 1000; - entry.GPCurrent = BitConverter.ToInt16(source, 0x17AA); - entry.GPMax = BitConverter.ToInt16(source, 0x17AC); - entry.CPCurrent = BitConverter.ToInt16(source, 0x17AE); - entry.CPMax = BitConverter.ToInt16(source, 0x18B0); + entry.GPCurrent = BitConverter.ToInt16(source, 0x17DA); + entry.GPMax = BitConverter.ToInt16(source, 0x17DC); + entry.CPCurrent = BitConverter.ToInt16(source, 0x17DE); + entry.CPMax = BitConverter.ToInt16(source, 0x17E0); entry.Race = source[0x2808]; // ?? entry.Sex = (Actor.Sex) source[0x2809]; //? entry.IsCasting = BitConverter.ToBoolean(source, 0x2C90); diff --git a/FFXIVAPP.Client/Helpers/PlayerEntityHelper.cs b/FFXIVAPP.Client/Helpers/PlayerEntityHelper.cs new file mode 100644 index 00000000..6fa0d046 --- /dev/null +++ b/FFXIVAPP.Client/Helpers/PlayerEntityHelper.cs @@ -0,0 +1,220 @@ +// FFXIVAPP.Client +// PlayerEntityHelper.cs +// +// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// * Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// * Neither the name of SyndicatedLife nor the names of its contributors may +// be used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. + +using System; +using FFXIVAPP.Client.Memory; +using FFXIVAPP.Common.Core.Memory; +using FFXIVAPP.Common.Core.Memory.Enums; + +namespace FFXIVAPP.Client.Helpers +{ + public static class PlayerEntityHelper + { + public static PlayerEntity ResolvePlayerFromBytes(byte[] source) + { + var entry = new PlayerEntity(); + try + { + entry.Name = MemoryHandler.Instance.GetStringFromBytes(source, 1); + + entry.JobID = source[0x64]; + entry.Job = (Actor.Job) entry.JobID; + + #region Job Levels + + entry.GLD = source[0x66]; + entry.PGL = source[0x68]; + entry.MRD = source[0x6A]; + entry.LNC = source[0x6C]; + entry.ARC = source[0x6E]; + entry.CNJ = source[0x70]; + entry.THM = source[0x72]; + + entry.CPT = source[0x74]; + entry.BSM = source[0x76]; + entry.ARM = source[0x78]; + entry.GSM = source[0x7A]; + entry.LTW = source[0x7C]; + entry.WVR = source[0x7E]; + entry.ALC = source[0x80]; + entry.CUL = source[0x82]; + + entry.MIN = source[0x84]; + entry.BTN = source[0x86]; + entry.FSH = source[0x88]; + + entry.ACN = source[0x8A]; + entry.ROG = source[0x8C]; + + #endregion + + #region Current Experience + + entry.GLD_CurrentEXP = BitConverter.ToInt32(source, 0x94); + entry.PGL_CurrentEXP = BitConverter.ToInt32(source, 0x98); + entry.MRD_CurrentEXP = BitConverter.ToInt32(source, 0x9C); + entry.LNC_CurrentEXP = BitConverter.ToInt32(source, 0xA0); + entry.ARC_CurrentEXP = BitConverter.ToInt32(source, 0xA4); + entry.CNJ_CurrentEXP = BitConverter.ToInt32(source, 0xA8); + entry.THM_CurrentEXP = BitConverter.ToInt32(source, 0xAC); + + entry.CPT_CurrentEXP = BitConverter.ToInt32(source, 0xB0); + entry.BSM_CurrentEXP = BitConverter.ToInt32(source, 0xB4); + entry.ARM_CurrentEXP = BitConverter.ToInt32(source, 0xB8); + entry.GSM_CurrentEXP = BitConverter.ToInt32(source, 0xBC); + entry.LTW_CurrentEXP = BitConverter.ToInt32(source, 0xC0); + entry.WVR_CurrentEXP = BitConverter.ToInt32(source, 0xC4); + entry.ALC_CurrentEXP = BitConverter.ToInt32(source, 0xC8); + entry.CUL_CurrentEXP = BitConverter.ToInt32(source, 0xCC); + + entry.MIN_CurrentEXP = BitConverter.ToInt32(source, 0xD0); + entry.BTN_CurrentEXP = BitConverter.ToInt32(source, 0xD4); + entry.FSH_CurrentEXP = BitConverter.ToInt32(source, 0xD8); + + entry.ACN_CurrentEXP = BitConverter.ToInt32(source, 0xDC); + entry.ROG_CurrentEXP = BitConverter.ToInt32(source, 0xE0); + + #endregion + + #region Base Stats + + entry.BaseStrength = BitConverter.ToInt16(source, 0xFC); + entry.BaseDexterity = BitConverter.ToInt16(source, 0x100); + entry.BaseVitality = BitConverter.ToInt16(source, 0x104); + entry.BaseIntelligence = BitConverter.ToInt16(source, 0x108); + entry.BaseMind = BitConverter.ToInt16(source, 0x10C); + entry.BasePiety = BitConverter.ToInt16(source, 0x110); + + #endregion + + #region Base Stats (base+gear+bonus) + + entry.Strength = BitConverter.ToInt16(source, 0x118); + entry.Dexterity = BitConverter.ToInt16(source, 0x11C); + entry.Vitality = BitConverter.ToInt16(source, 0x120); + entry.Intelligence = BitConverter.ToInt16(source, 0x124); + entry.Mind = BitConverter.ToInt16(source, 0x128); + entry.Piety = BitConverter.ToInt16(source, 0x12C); + + #endregion + + #region Basic Info + + entry.HPMax = BitConverter.ToInt16(source, 0x130); + entry.MPMax = BitConverter.ToInt16(source, 0x134); + entry.TPMax = BitConverter.ToInt16(source, 0x138); + entry.GPMax = BitConverter.ToInt16(source, 0x13C); + entry.CPMax = BitConverter.ToInt16(source, 0x140); + + #endregion + + #region Offensive Properties + + entry.Accuracy = BitConverter.ToInt16(source, 0x16C); + entry.CriticalHitRate = BitConverter.ToInt16(source, 0x180); + entry.Determination = BitConverter.ToInt16(source, 0x1C4); + + #endregion + + #region Defensive Properties + + entry.Parry = BitConverter.ToInt16(source, 0x160); + entry.Defense = BitConverter.ToInt16(source, 0x168); + entry.MagicDefense = BitConverter.ToInt16(source, 0x174); + + #endregion + + #region Phyiscal Properties + + entry.AttackPower = BitConverter.ToInt16(source, 0x164); + entry.SkillSpeed = BitConverter.ToInt16(source, 0x1C8); + + #endregion + + #region Mental Properties + + entry.SpellSpeed = BitConverter.ToInt16(source, 0x170); + entry.AttackMagicPotency = BitConverter.ToInt16(source, 0x198); + entry.HealingMagicPotency = BitConverter.ToInt16(source, 0x19C); + + #endregion + + #region Status Resistances + + //entry.SlowResistance = BitConverter.ToInt16(source, 0x1C8); + //entry.SilenceResistance = BitConverter.ToInt16(source, 0x1CC); + //entry.BindResistance = BitConverter.ToInt16(source, 0x1D0); + //entry.PoisionResistance = BitConverter.ToInt16(source, 0x1D4); + //entry.StunResistance = BitConverter.ToInt16(source, 0x1D8); + //entry.SleepResistance = BitConverter.ToInt16(source, 0x1DC); + //entry.BindResistance = BitConverter.ToInt16(source, 0x1E0); + //entry.HeavyResistance = BitConverter.ToInt16(source, 0x1E4); + + #endregion + + #region Elemental Resistances + + entry.FireResistance = BitConverter.ToInt16(source, 0x1A8); + entry.IceResistance = BitConverter.ToInt16(source, 0x1AC); + entry.WindResistance = BitConverter.ToInt16(source, 0x1B0); + entry.EarthResistance = BitConverter.ToInt16(source, 0x1B4); + entry.LightningResistance = BitConverter.ToInt16(source, 0x1B8); + entry.WaterResistance = BitConverter.ToInt16(source, 0x1BC); + + #endregion + + #region Physical Resistances + + entry.SlashingResistance = BitConverter.ToInt16(source, 0x188); + entry.PiercingResistance = BitConverter.ToInt16(source, 0x18C); + entry.BluntResistance = BitConverter.ToInt16(source, 0x190); + + #endregion + + #region Crafting + + entry.Craftmanship = BitConverter.ToInt16(source, 0x22C); + entry.Control = BitConverter.ToInt16(source, 0x230); + + #endregion + + #region Gathering + + entry.Gathering = BitConverter.ToInt16(source, 0x234); + entry.Perception = BitConverter.ToInt16(source, 0x238); + + #endregion + } + catch (Exception ex) + { + } + return entry; + } + } +} diff --git a/FFXIVAPP.Client/Initializer.cs b/FFXIVAPP.Client/Initializer.cs index 264086c1..28e22b42 100644 --- a/FFXIVAPP.Client/Initializer.cs +++ b/FFXIVAPP.Client/Initializer.cs @@ -532,21 +532,6 @@ public static void CheckUpdates() // { // var key = feature["Hash"].ToString(); // var enabled = (bool) feature["Enabled"]; - // switch (key) - // { - // case "E9FA3917-ACEB-47AE-88CC-58AB014058F5": - // XIVDBViewModel.Instance.MonsterUploadEnabled = enabled; - // break; - // case "6D2DB102-B1AE-4249-9E73-4ABC7B1947BC": - // XIVDBViewModel.Instance.NPCUploadEnabled = enabled; - // break; - // case "D95ADD76-7DA7-4692-AD00-DB12F2853908": - // XIVDBViewModel.Instance.KillUploadEnabled = enabled; - // break; - // case "6A50A13B-BA83-45D7-862F-F110049E7E78": - // XIVDBViewModel.Instance.LootUploadEnabled = enabled; - // break; - // } // } //} //catch (Exception ex) @@ -619,31 +604,31 @@ public static void SetSignatures() { Key = "GAMEMAIN", Value = "47616D654D61696E000000", - Offset = 1176 + Offset = 1248 }); AppViewModel.Instance.Signatures.Add(new Signature { Key = "CHARMAP", - Value = "??FFFFFF000000??000000??DB0FC93FDB0F49416F1283????FFFFFF", - Offset = 792 + Value = "00000000DB0FC93FDB0F49416F1283????FFFFFF000000??000000??DB0FC93FDB0F49416F1283????FFFFFF", + Offset = 872 }); AppViewModel.Instance.Signatures.Add(new Signature { Key = "NPCMAP", Value = "3E000000????????4000000001000000000000000001000000", - Offset = 2732 + Offset = 2716 }); AppViewModel.Instance.Signatures.Add(new Signature { Key = "ACTORMAP", Value = "3E000000????????4000000001000000000000000001000000", - Offset = 1332 + Offset = 1316 }); AppViewModel.Instance.Signatures.Add(new Signature { Key = "PARTYMAP", Value = "DB0F49416F1283??FFFFFFFF0000000000000000DB0FC93FDB0F49416F1283??00", - Offset = 56 + Offset = 52 }); AppViewModel.Instance.Signatures.Add(new Signature { @@ -660,8 +645,8 @@ public static void SetSignatures() AppViewModel.Instance.Signatures.Add(new Signature { Key = "TARGET", - Value = "40??00000000000000000000000000000000000000000000000000000000????0000????000000000000DB0FC93FDB0F49416F1283??FFFFFFFF", - Offset = 206 + Value = "DB0FC93FDB0F49416F1283????FFFFFFDB0FC940920A063F", + Offset = 172 }); AppViewModel.Instance.Signatures.Add(new Signature { diff --git a/FFXIVAPP.Client/Memory/PlayerInfoWorker.cs b/FFXIVAPP.Client/Memory/PlayerInfoWorker.cs index 791965d5..0a255df3 100644 --- a/FFXIVAPP.Client/Memory/PlayerInfoWorker.cs +++ b/FFXIVAPP.Client/Memory/PlayerInfoWorker.cs @@ -36,7 +36,6 @@ using FFXIVAPP.Client.Helpers; using FFXIVAPP.Client.Properties; using FFXIVAPP.Common.Core.Memory; -using FFXIVAPP.Common.Core.Memory.Enums; using Newtonsoft.Json; using NLog; @@ -140,111 +139,35 @@ private void ScanTimerElapsed(object sender, ElapsedEventArgs e) } } } - var playerInfo = MemoryHandler.Instance.GetStructure(PlayerInfoMap); - var playerEntity = new PlayerEntity + var source = MemoryHandler.Instance.GetByteArray(PlayerInfoMap, 0x256); + try { - Name = MemoryHandler.Instance.GetString(PlayerInfoMap, 1), - EnmityEntries = enmityEntries, - Accuracy = playerInfo.Accuracy, - ACN = playerInfo.ACN, - ACN_CurrentEXP = playerInfo.ACN_CurrentEXP, - ALC = playerInfo.ALC, - ARC = playerInfo.ARC, - ARC_CurrentEXP = playerInfo.ARC_CurrentEXP, - ARM = playerInfo.ARM, - ARM_CurrentEXP = playerInfo.ARM_CurrentEXP, - AttackMagicPotency = playerInfo.AttackMagicPotency, - AttackPower = playerInfo.AttackPower, - BTN = playerInfo.BTN, - BTN_CurrentEXP = playerInfo.BTN_CurrentEXP, - BSM = playerInfo.BSM, - BSM_CurrentEXP = playerInfo.BSM_CurrentEXP, - BaseDexterity = playerInfo.BaseDexterity, - BaseIntelligence = playerInfo.BaseIntelligence, - BaseMind = playerInfo.BaseMind, - BasePiety = playerInfo.BasePiety, - BaseStrength = playerInfo.BaseStrength, - BaseVitality = playerInfo.BaseVitality, - CNJ = playerInfo.CNJ, - CNJ_CurrentEXP = playerInfo.CNJ_CurrentEXP, - CPMax = playerInfo.CPMax, - CPT = playerInfo.CPT, - CPT_CurrentEXP = playerInfo.CPT_CurrentEXP, - CUL = playerInfo.CUL, - CUL_CurrentEXP = playerInfo.CUL_CurrentEXP, - Control = playerInfo.Control, - Craftmanship = playerInfo.Craftmanship, - CriticalHitRate = playerInfo.CriticalHitRate, - Defense = playerInfo.Defense, - Determination = playerInfo.Determination, - Dexterity = playerInfo.Dexterity, - FSH = playerInfo.FSH, - FSH_CurrentEXP = playerInfo.FSH_CurrentEXP, - FireResistance = playerInfo.FireResistance, - GLD = playerInfo.GLD, - GLD_CurrentEXP = playerInfo.GLD_CurrentEXP, - GPMax = playerInfo.GPMax, - GSM = playerInfo.GSM, - GSM_CurrentEXP = playerInfo.GSM_CurrentEXP, - Gathering = playerInfo.Gathering, - HPMax = playerInfo.HPMax, - HealingMagicPotency = playerInfo.HealingMagicPotency, - IceResistance = playerInfo.IceResistance, - Intelligence = playerInfo.Intelligence, - JobID = playerInfo.JobID, - LNC = playerInfo.LNC, - LNC_CurrentEXP = playerInfo.LNC_CurrentEXP, - LTW = playerInfo.LTW, - LTW_CurrentEXP = playerInfo.LTW_CurrentEXP, - LightningResistance = playerInfo.LightningResistance, - MIN = playerInfo.MIN, - MIN_CurrentEXP = playerInfo.MIN_CurrentEXP, - MPMax = playerInfo.MPMax, - MRD = playerInfo.MRD, - MRD_CurrentEXP = playerInfo.MRD_CurrentEXP, - MagicDefense = playerInfo.MagicDefense, - Mind = playerInfo.Mind, - PGL = playerInfo.PGL, - PGL_CurrentEXP = playerInfo.PGL_CurrentEXP, - Parry = playerInfo.Parry, - Perception = playerInfo.Perception, - PiercingResistance = playerInfo.PiercingResistance, - Piety = playerInfo.Piety, - SkillSpeed = playerInfo.SkillSpeed, - SlashingResistance = playerInfo.SlashingResistance, - SpellSpeed = playerInfo.SpellSpeed, - Strength = playerInfo.Strength, - THM = playerInfo.THM, - THM_CurrentEXP = playerInfo.THM_CurrentEXP, - TPMax = playerInfo.TPMax, - Vitality = playerInfo.Vitality, - WVR = playerInfo.WVR, - WVR_CurrentEXP = playerInfo.WVR_CurrentEXP, - WaterResistance = playerInfo.WaterResistance, - WindResistance = playerInfo.WindResistance - }; - playerEntity.Job = (Actor.Job) playerEntity.JobID; - var notify = false; - if (LastPlayerEntity == null) - { - LastPlayerEntity = playerEntity; - notify = true; - } - else - { - var hash1 = JsonConvert.SerializeObject(LastPlayerEntity) - .GetHashCode(); - var hash2 = JsonConvert.SerializeObject(playerEntity) - .GetHashCode(); - if (!hash1.Equals(hash2)) + var entry = PlayerEntityHelper.ResolvePlayerFromBytes(source); + var notify = false; + if (LastPlayerEntity == null) { - LastPlayerEntity = playerEntity; + LastPlayerEntity = entry; notify = true; } + else + { + var hash1 = JsonConvert.SerializeObject(LastPlayerEntity) + .GetHashCode(); + var hash2 = JsonConvert.SerializeObject(entry) + .GetHashCode(); + if (!hash1.Equals(hash2)) + { + LastPlayerEntity = entry; + notify = true; + } + } + if (notify) + { + AppContextHelper.Instance.RaiseNewPlayerEntity(entry); + } } - if (notify) + catch (Exception ex) { - AppContextHelper.Instance.RaiseNewPlayerEntity(playerEntity); } } catch (Exception ex) diff --git a/FFXIVAPP.Client/Memory/Structures.cs b/FFXIVAPP.Client/Memory/Structures.cs index 2db35aff..5ff097e5 100644 --- a/FFXIVAPP.Client/Memory/Structures.cs +++ b/FFXIVAPP.Client/Memory/Structures.cs @@ -138,362 +138,6 @@ public struct PartyMember public Status[] Statuses; }; - [StructLayout(LayoutKind.Explicit, Pack = 1)] - public struct PlayerInfo - { - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x64)] //100 - public byte JobID; - - #region Job Levels - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x66)] //102 - public byte PGL; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x68)] //104 - public byte GLD; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x6A)] //106 - public byte MRD; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x6C)] //108 - public byte ARC; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x6E)] //110 - public byte LNC; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x70)] //112 - public byte THM; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x72)] //114 - public byte CNJ; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x74)] //116 - public byte CPT; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x76)] //118 - public byte BSM; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x78)] //120 - public byte ARM; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x7A)] //122 - public byte GSM; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x7C)] //124 - public byte LTW; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x7E)] //126 - public byte WVR; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x80)] //128 - public byte ALC; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x82)] //130 - public byte CUL; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x84)] //132 - public byte MIN; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x86)] //134 - public byte BTN; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x88)] //136 - public byte FSH; - - [MarshalAs(UnmanagedType.I1)] - [FieldOffset(0x8A)] //138 - public byte ACN; - - #endregion - - #region Job Exp In Level - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x8C)] //140 - public int PGL_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x90)] //144 - public int GLD_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x94)] //148 - public int MRD_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x98)] //152 - public int ARC_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x9C)] //156 - public int LNC_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xA0)] //160 - public int THM_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xA4)] //164 - public int CNJ_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xA8)] //168 - public int ACN_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xAC)] //172 - public int BSM_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xB0)] //176 - public int CPT_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xB4)] //180 - public int GSM_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xB8)] //184 - public int ARM_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xBC)] //188 - public int WVR_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xC0)] //192 - public int LTW_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xC4)] //196 - public int CUL_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xC8)] //200 - public int MIN_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xCC)] //204 - public int BTN_CurrentEXP; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0xD0)] //208 - public int FSH_CurrentEXP; - - #endregion - - #region Base Stats - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0xE4)] //228 - public short BaseStrength; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0xE8)] //232 - public short BaseDexterity; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0xEC)] //236 - public short BaseVitality; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0xF0)] //240 - public short BaseIntelligence; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0xF4)] //244 - public short BaseMind; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0xF8)] //248 - public short BasePiety; - - #endregion - - #region Stats (base+gear+bonus) - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x100)] //256 - public short Strength; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x104)] //260 - public short Dexterity; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x108)] //264 - public short Vitality; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x10C)] //268 - public short Intelligence; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x110)] //272 - public short Mind; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x114)] //276 - public short Piety; - - #endregion - - #region Basic infos - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x118)] //280 - public int HPMax; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x11C)] //284 - public int MPMax; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x120)] //288 - public int TPMax; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x124)] //292 - public int GPMax; - - [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x128)] //296 - public int CPMax; - - #endregion - - #region Defensive stats - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x148)] //328 - public short Parry; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x14A)] //330 - public short Defense; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x158)] //344 - public short Evasion; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x15C)] //348 - public short MagicDefense; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x170)] //368 - public short SlashingResistance; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x174)] //372 - public short PiercingResistance; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x178)] //376 - public short BluntResistance; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x190)] //400 - public short FireResistance; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x194)] //404 - public short IceResistance; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x198)] //408 - public short WindResistance; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x19C)] //412 - public short EarthResistance; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x1A0)] //416 - public short LightningResistance; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x1A4)] //420 - public short WaterResistance; - - #endregion - - #region Offensive stats - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x14C)] //332 - public short AttackPower; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x154)] //340 - public short Accuracy; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x168)] //360 - public short CriticalHitRate; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x180)] //384 - public short AttackMagicPotency; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x184)] //388 - public short HealingMagicPotency; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x1AC)] //428 - public short Determination; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x1B0)] //432 - public short SkillSpeed; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x1B4)] //436 - public short SpellSpeed; - - #endregion - - #region DoH/DoL stats - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x214)] //532 - public short Craftmanship; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x218)] //536 - public short Control; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x21C)] //540 - public short Gathering; - - [MarshalAs(UnmanagedType.I2)] - [FieldOffset(0x220)] //544 - public short Perception; - - #endregion - }; - [StructLayout(LayoutKind.Explicit, Pack = 1)] public struct Status { @@ -518,19 +162,19 @@ public struct Target public uint CurrentTarget; [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x18)] //24 + [FieldOffset(0xC)] //12 public uint MouseOverTarget; [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x48)] //64 + [FieldOffset(0x3C)] //60 public uint FocusTarget; [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x54)] //76 + [FieldOffset(0x48)] //72 public uint PreviousTarget; [MarshalAs(UnmanagedType.I4)] - [FieldOffset(0x68)] //96 + [FieldOffset(0x5C)] //94 public uint CurrentTargetID; } } diff --git a/FFXIVAPP.Client/NLog.config b/FFXIVAPP.Client/NLog.config new file mode 100644 index 00000000..ede1596b --- /dev/null +++ b/FFXIVAPP.Client/NLog.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FFXIVAPP.Client/NLog.xsd b/FFXIVAPP.Client/NLog.xsd index 49dd6204..98aba4e2 100644 --- a/FFXIVAPP.Client/NLog.xsd +++ b/FFXIVAPP.Client/NLog.xsd @@ -229,18 +229,18 @@ - - + + Name of the target. - + - Indicates whether buffer should grow as needed. + Maximum number of log events that the buffer can keep. @@ -248,9 +248,9 @@ Number of log events to be buffered. - + - Maximum number of log events that the buffer can keep. + Indicates whether buffer should grow as needed. @@ -281,22 +281,22 @@ - + Name of the target. - + - Indicates whether to add <!-- --> comments around all written texts. + Layout used to format log messages. - + - Layout used to format log messages. + Indicates whether to add <!-- --> comments around all written texts. @@ -307,34 +307,34 @@ - - + + Name of the target. - + - Limit on the number of requests in the lazy writer thread request queue. + Number of log events that should be processed in a batch by the lazy writer thread. - + - Time in milliseconds to sleep between batches. + Action to be taken when the lazy writer thread request queue count exceeds the set limit. - + - Number of log events that should be processed in a batch by the lazy writer thread. + Limit on the number of requests in the lazy writer thread request queue. - + - Action to be taken when the lazy writer thread request queue count exceeds the set limit. + Time in milliseconds to sleep between batches. @@ -366,18 +366,18 @@ - - + + Name of the target. - + - Indicates whether to use sliding timeout. + Number of log events to be buffered. @@ -385,9 +385,9 @@ Timeout (in milliseconds) after which the contents of buffer will be flushed if there's no write in the specified period of time. Use -1 to disable timed flushes. - + - Number of log events to be buffered. + Indicates whether to use sliding timeout. @@ -398,37 +398,37 @@ - - - - + + + + - + + + + - - - - + Name of the target. - + - Indicates whether to append newline at the end of log message. + Encoding to be used. - + - Action that should be taken if the message is larger than maxMessageSize. + Instance of that is used to format log messages. @@ -436,24 +436,24 @@ Maximum message size in bytes. - + - Encoding to be used. + Indicates whether to append newline at the end of log message. - + - Instance of that is used to format log messages. + Action that should be taken if the message is larger than maxMessageSize. - + - Network address. + Size of the connection cache (number of connections which are kept alive). - + - Size of the connection cache (number of connections which are kept alive). + Network address. @@ -466,39 +466,39 @@ Maximum queue size. - + - Indicates whether to include dictionary contents. + Indicates whether to include NLog-specific extensions to log4j schema. - + - Indicates whether to include call site (class and method name) in the information sent over the network. + Indicates whether to include source info (file name and line number) in the information sent over the network. - + - AppInfo field. By default it's the friendly name of the current AppDomain. + NDC item separator. - + - Indicates whether to include NLog-specific extensions to log4j schema. + Indicates whether to include call site (class and method name) in the information sent over the network. - + - Indicates whether to include stack contents. + AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. + Indicates whether to include stack contents. - + - Indicates whether to include source info (file name and line number) in the information sent over the network. + Indicates whether to include dictionary contents. @@ -532,12 +532,12 @@ - - + + + - @@ -545,9 +545,9 @@ Name of the target. - + - Footer. + Text to be rendered. @@ -555,9 +555,9 @@ Header. - + - Text to be rendered. + Footer. @@ -661,9 +661,9 @@ - - + + @@ -671,9 +671,9 @@ Name of the target. - + - Footer. + Text to be rendered. @@ -681,9 +681,9 @@ Header. - + - Text to be rendered. + Footer. @@ -699,44 +699,45 @@ - - - - - - - + - - + + + + + + - + + + + Name of the target. - + - Database user name. If the ConnectionString is not provided this value will be used to construct the "User ID=" part of the connection string. + Connection string. When provided, it overrides the values specified in DBHost, DBUserName, DBPassword, DBDatabase. - + - Name of the database provider. + Name of the connection string (as specified in <connectionStrings> configuration section. - + - Indicates whether to use database transactions. Some data providers require this. + Database name. If the ConnectionString is not provided this value will be used to construct the "Database=" part of the connection string. - + - Indicates whether to keep the database connection open between the log events. + Database host name. If the ConnectionString is not provided this value will be used to construct the "Server=" part of the connection string. @@ -744,24 +745,24 @@ Database password. If the ConnectionString is not provided this value will be used to construct the "Password=" part of the connection string. - + - Name of the connection string (as specified in <connectionStrings> configuration section. + Name of the database provider. - + - Connection string. When provided, it overrides the values specified in DBHost, DBUserName, DBPassword, DBDatabase. + Database user name. If the ConnectionString is not provided this value will be used to construct the "User ID=" part of the connection string. - + - Database host name. If the ConnectionString is not provided this value will be used to construct the "Server=" part of the connection string. + Indicates whether to keep the database connection open between the log events. - + - Database name. If the ConnectionString is not provided this value will be used to construct the "Database=" part of the connection string. + Indicates whether to use database transactions. Some data providers require this. @@ -774,6 +775,11 @@ Text of the SQL command to be run on each log level. + + + Type of the SQL command to be run on each log level. + + @@ -852,18 +858,18 @@ - - + + Name of the target. - + - Footer. + Text to be rendered. @@ -871,9 +877,9 @@ Header. - + - Text to be rendered. + Footer. @@ -905,11 +911,11 @@ - - - + + + @@ -921,14 +927,14 @@ Layout used to format log messages. - + - Name of the machine on which Event Log service is running. + Layout that renders event Category. - + - Value to be used as the event Source. + Layout that renders event ID. @@ -936,14 +942,14 @@ Name of the Event Log to write to. This can be System, Application or any user-defined name. - + - Layout that renders event Category. + Name of the machine on which Event Log service is running. - + - Layout that renders event ID. + Value to be used as the event Source. @@ -974,46 +980,47 @@ - - - + + + + + - - - - + + - + - + - - + - - + + + + Name of the target. - + - File encoding. + Text to be rendered. - + - Line ending mode. + Header. @@ -1021,39 +1028,39 @@ Footer. - + - Text to be rendered. + File encoding. - + - Header. + Line ending mode. - + - Indicates whether to automatically archive log files every time the specified time passes. + Way file archives are numbered. - + - Size in bytes above which log files will be automatically archived. + Name of the file to be used for an archive. - + - Name of the file to be used for an archive. + Indicates whether to automatically archive log files every time the specified time passes. - + - Maximum number of archive files that should be kept. + Size in bytes above which log files will be automatically archived. - + - Way file archives are numbered. + Maximum number of archive files that should be kept. @@ -1061,19 +1068,19 @@ Gets ors set a value indicating whether a managed file stream is forced, instead of used the native implementation. - + - File attributes (Windows only). + Indicates whether to replace file contents on each write instead of appending log message at the end. - + - Indicates whether to delete old log file on startup. + Indicates whether to enable log file(s) to be deleted. - + - Indicates whether to enable log file(s) to be deleted. + Indicates whether to delete old log file on startup. @@ -1081,9 +1088,9 @@ Indicates whether to create directories if they don't exist. - + - Indicates whether to replace file contents on each write instead of appending log message at the end. + Value specifying the date format to use when archving files. @@ -1091,9 +1098,9 @@ Name of the file to write to. - + - Maximum number of seconds that files are kept open. If this number is negative the files are not automatically closed after a period of inactivity. + File attributes (Windows only). @@ -1101,24 +1108,29 @@ Log file buffer size in bytes. + + + Delay in milliseconds to wait before attempting to write to the file again. + + Number of times the write is appended on the file before NLog discards the log message. - + - Delay in milliseconds to wait before attempting to write to the file again. + Indicates whether concurrent writes to the log file by multiple processes on the same host. - + - Indicates whether to automatically flush the file buffers after each log message. + Indicates whether to keep log file open instead of opening and closing it on each logging event. - + - Indicates whether concurrent writes to the log file by multiple processes on the same host. + Indicates whether concurrent writes to the log file by multiple processes on different network hosts. @@ -1126,14 +1138,14 @@ Number of files to be kept open. Setting this to a higher value may improve performance in a situation where a single File target is writing to many files (such as splitting by level or by logger). - + - Indicates whether concurrent writes to the log file by multiple processes on different network hosts. + Maximum number of seconds that files are kept open. If this number is negative the files are not automatically closed after a period of inactivity. - + - Indicates whether to keep log file open instead of opening and closing it on each logging event. + Indicates whether to automatically flush the file buffers after each log message. @@ -1148,6 +1160,13 @@ + + + + + + + @@ -1158,12 +1177,6 @@ - - - - - - @@ -1210,9 +1223,9 @@ - - + + @@ -1225,9 +1238,9 @@ Layout used to format log messages. - + - Name of the Form on which the control is located. + Indicates whether log text should be appended to the text of the control instead of overwriting it. @@ -1235,9 +1248,9 @@ Name of control to which NLog will log write log text. - + - Indicates whether log text should be appended to the text of the control instead of overwriting it. + Name of the Form on which the control is located. @@ -1253,32 +1266,32 @@ - - - - + + + + Name of the target. - + - User account password. + Windows domain name to change context to. - + - Indicates whether to revert to the credentials of the process instead of impersonating another user. + Required impersonation level. - + - Username to change context to. + Type of the logon provider. @@ -1286,34 +1299,24 @@ Logon Type. - + - Windows domain name to change context to. + User account password. - + - Required impersonation level. + Indicates whether to revert to the credentials of the process instead of impersonating another user. - + - Type of the logon provider. + Username to change context to. - - - - - - - - - - @@ -1327,36 +1330,41 @@ + + + + + + + + + + - - - + + + Name of the target. - - - Name of the endpoint configuration in WCF configuration file. - - Endpoint address. - + - Indicates whether to use binary message encoding. + Name of the endpoint configuration in WCF configuration file. @@ -1369,6 +1377,11 @@ Indicates whether to include per-event properties in the payload sent to the server. + + + Indicates whether to use binary message encoding. + + @@ -1399,61 +1412,67 @@ - - - + + + + - - + - + - - + + + Name of the target. - + - Indicates whether to send message as HTML instead of plain text. + Text to be rendered. - + - Encoding to be used for sending e-mail. + Header. - + - Indicates whether to add new lines between log entries. + Footer. - + - Text to be rendered. + Indicates whether to send message as HTML instead of plain text. - + - Header. + Encoding to be used for sending e-mail. - + - Footer. + Indicates whether to add new lines between log entries. + + + + + BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). @@ -1466,9 +1485,9 @@ CC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - + - BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). + Mail message body (repeated for each log message send in one mail). @@ -1476,11 +1495,6 @@ Mail subject. - - - Mail message body (repeated for each log message send in one mail). - - Sender's email address (e.g. joe@domain.com). @@ -1496,9 +1510,9 @@ Priority used for sending mails. - + - Indicates whether the default Settings from System.Net.MailSettings should be used. + Indicates the SMTP client timeout. @@ -1506,19 +1520,14 @@ SMTP Server to be used for sending. - - - Username used to connect to SMTP server (used when SmtpAuthentication is set to "basic"). - - - + - Port number that SMTP Server is listening on. + SMTP Authentication mode. - + - SMTP Authentication mode. + Username used to connect to SMTP server (used when SmtpAuthentication is set to "basic"). @@ -1531,9 +1540,19 @@ Indicates whether SSL (secure sockets layer) should be used when communicating with SMTP server. - - - + + + Port number that SMTP Server is listening on. + + + + + Indicates whether the default Settings from System.Net.MailSettings should be used. + + + + + @@ -1592,30 +1611,20 @@ - - - - + + + + Name of the target. - - - Indicates whether to use the XML format when serializing message. This will also disable creating queues. - - - - - Indicates whether to check if a queue exists before writing to it. - - Layout used to format log messages. @@ -1626,14 +1635,14 @@ Encoding to be used when writing text to the queue. - + - Name of the queue to write to. + Indicates whether to use the XML format when serializing message. This will also disable creating queues. - + - Indicates whether to use recoverable messages (with guaranteed delivery). + Indicates whether to check if a queue exists before writing to it. @@ -1646,6 +1655,16 @@ Label to associate with each message. + + + Name of the queue to write to. + + + + + Indicates whether to use recoverable messages (with guaranteed delivery). + + @@ -1654,8 +1673,8 @@ - + @@ -1663,14 +1682,14 @@ Name of the target. - + - Method name. The method must be public and static. + Class name. - + - Class name. + Method name. The method must be public and static. @@ -1681,14 +1700,14 @@ - - - - - + + + + + @@ -1696,14 +1715,14 @@ Name of the target. - + - Indicates whether to append newline at the end of log message. + Layout used to format log messages. - + - Action that should be taken if the message is larger than maxMessageSize. + Encoding to be used. @@ -1711,19 +1730,19 @@ Maximum message size in bytes. - + - Layout used to format log messages. + Indicates whether to append newline at the end of log message. - + - Encoding to be used. + Action that should be taken if the message is larger than maxMessageSize. - + - Indicates whether to keep connection open whenever possible. + Network address. @@ -1731,9 +1750,9 @@ Size of the connection cache (number of connections which are kept alive). - + - Network address. + Indicates whether to keep connection open whenever possible. @@ -1749,37 +1768,37 @@ - - - - + + + + - + + + + - - - - + Name of the target. - + - Indicates whether to append newline at the end of log message. + Encoding to be used. - + - Action that should be taken if the message is larger than maxMessageSize. + Instance of that is used to format log messages. @@ -1787,24 +1806,24 @@ Maximum message size in bytes. - + - Encoding to be used. + Indicates whether to append newline at the end of log message. - + - Instance of that is used to format log messages. + Action that should be taken if the message is larger than maxMessageSize. - + - Network address. + Size of the connection cache (number of connections which are kept alive). - + - Size of the connection cache (number of connections which are kept alive). + Network address. @@ -1817,39 +1836,39 @@ Maximum queue size. - + - Indicates whether to include dictionary contents. + Indicates whether to include NLog-specific extensions to log4j schema. - + - Indicates whether to include call site (class and method name) in the information sent over the network. + Indicates whether to include source info (file name and line number) in the information sent over the network. - + - AppInfo field. By default it's the friendly name of the current AppDomain. + NDC item separator. - + - Indicates whether to include NLog-specific extensions to log4j schema. + Indicates whether to include call site (class and method name) in the information sent over the network. - + - Indicates whether to include stack contents. + AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. + Indicates whether to include stack contents. - + - Indicates whether to include source info (file name and line number) in the information sent over the network. + Indicates whether to include dictionary contents. @@ -1860,22 +1879,22 @@ - + Name of the target. - + - Indicates whether to perform layout calculation. + Layout used to format log messages. - + - Layout used to format log messages. + Indicates whether to perform layout calculation. @@ -1906,46 +1925,46 @@ - - - + + + Name of the target. - + - Name of the performance counter. + Indicates whether performance counter should be automatically created. - + - Performance counter type. + Name of the performance counter category. - + - Performance counter instance name. + Counter help text. - + - Indicates whether performance counter should be automatically created. + Name of the performance counter. - + - Name of the performance counter category. + Performance counter type. - + - Counter help text. + Performance counter instance name. @@ -2059,22 +2078,22 @@ - + Name of the target. - + - Time to wait between retries in milliseconds. + Number of retries that should be attempted on the wrapped target in case of a failure. - + - Number of retries that should be attempted on the wrapped target in case of a failure. + Time to wait between retries in milliseconds. @@ -2086,17 +2105,17 @@ - - - - - - + - - + + + + + + + @@ -2108,44 +2127,44 @@ Layout used to format log messages. - + - Indicates whether the created form will be initially minimized. + Indicates whether scroll bar will be moved automatically to show most recent log entries. - + - Maximum number of lines the rich text box will store (or 0 to disable this feature). + Name of RichTextBox to which Nlog will write. - + - Initial width of the form with rich text box. + Name of the Form on which the control is located. If there is no open form of a specified name than NLog will create a new one. - + - Indicates whether the created window will be a tool window. + Initial height of the form with rich text box. - + - Name of RichTextBox to which Nlog will write. + Maximum number of lines the rich text box will store (or 0 to disable this feature). - + - Indicates whether scroll bar will be moved automatically to show most recent log entries. + Indicates whether the created form will be initially minimized. - + - Initial height of the form with rich text box. + Indicates whether the created window will be a tool window. - + - Name of the Form on which the control is located. If there is no open form of a specified name than NLog will create a new one. + Initial width of the form with rich text box. @@ -2165,6 +2184,34 @@ + + + + + + + + + + Condition that must be met in order to set the specified font color. + + + + + Background color. + + + + + Font color. + + + + + Font style of matched text. + + + @@ -2211,34 +2258,6 @@ - - - - - - - - - - Condition that must be met in order to set the specified font color. - - - - - Background color. - - - - - Font color. - - - - - Font style of matched text. - - - @@ -2293,20 +2312,25 @@ - + + - - + Name of the target. - + - Web service URL. + Encoding. + + + + + Web service method name. @@ -2319,14 +2343,9 @@ Protocol to be used when calling web service. - - - Web service method name. - - - + - Encoding. + Web service URL. @@ -2344,19 +2363,19 @@ - - - - - + + + + + - + - Body layout (can be repeated multiple times). + Footer layout. @@ -2364,46 +2383,39 @@ Header layout. - + - Footer layout. + Body layout (can be repeated multiple times). - + - Quote Character. + Custom column delimiter value (valid when ColumnDelimiter is set to 'Custom'). - + - Quoting mode. + Column delimiter. - + - Indicates whether CVS should include header. + Quote Character. - + - Custom column delimiter value (valid when ColumnDelimiter is set to 'Custom'). + Quoting mode. - + - Column delimiter. + Indicates whether CVS should include header. - - - - - - - @@ -2415,6 +2427,13 @@ + + + + + + + @@ -2435,13 +2454,13 @@ - - + + - + - Body layout (can be repeated multiple times). + Footer layout. @@ -2449,9 +2468,9 @@ Header layout. - + - Footer layout. + Body layout (can be repeated multiple times). @@ -2482,17 +2501,17 @@ - + - + - Condition expression. + Action to be taken when filter matches. - + - Action to be taken when filter matches. + Condition expression. @@ -2511,29 +2530,29 @@ - - + + - + - Layout to be used to filter log messages. + Action to be taken when filter matches. - + - Substring to be matched. + Indicates whether to ignore case when comparing strings. - + - Action to be taken when filter matches. + Layout to be used to filter log messages. - + - Indicates whether to ignore case when comparing strings. + Substring to be matched. @@ -2543,29 +2562,29 @@ - - + + - + - Indicates whether to ignore case when comparing strings. + Action to be taken when filter matches. - + - Layout to be used to filter log messages. + String to compare the layout to. - + - Action to be taken when filter matches. + Indicates whether to ignore case when comparing strings. - + - String to compare the layout to. + Layout to be used to filter log messages. @@ -2575,29 +2594,29 @@ - - + + - + - Layout to be used to filter log messages. + Action to be taken when filter matches. - + - Substring to be matched. + Indicates whether to ignore case when comparing strings. - + - Action to be taken when filter matches. + Layout to be used to filter log messages. - + - Indicates whether to ignore case when comparing strings. + Substring to be matched. @@ -2607,29 +2626,29 @@ - - + + - + - Indicates whether to ignore case when comparing strings. + Action to be taken when filter matches. - + - Layout to be used to filter log messages. + String to compare the layout to. - + - Action to be taken when filter matches. + Indicates whether to ignore case when comparing strings. - + - String to compare the layout to. + Layout to be used to filter log messages. diff --git a/FFXIVAPP.Client/app.config b/FFXIVAPP.Client/app.config index 32757adf..798210cf 100644 --- a/FFXIVAPP.Client/app.config +++ b/FFXIVAPP.Client/app.config @@ -1,10 +1,10 @@ - + - +
- +
@@ -115,8 +115,7 @@ - + Red|Light Green|Light Blue|Light @@ -166,8 +165,7 @@ - + Atomos Bahamut Chocobo @@ -234,8 +232,7 @@ - + English Japanese French @@ -248,16 +245,14 @@ - + None - + 0.8 0.9 1.0 @@ -271,12 +266,23 @@ - + System Default + + + + + + + + + + + + \ No newline at end of file diff --git a/FFXIVAPP.Client/packages.config b/FFXIVAPP.Client/packages.config index f22dada0..c8b2209f 100644 --- a/FFXIVAPP.Client/packages.config +++ b/FFXIVAPP.Client/packages.config @@ -1,9 +1,9 @@  - + - - - - + + + + \ No newline at end of file diff --git a/FFXIVAPP.Updater/FFXIVAPP.Updater.csproj b/FFXIVAPP.Updater/FFXIVAPP.Updater.csproj index 51534194..be25ff34 100644 --- a/FFXIVAPP.Updater/FFXIVAPP.Updater.csproj +++ b/FFXIVAPP.Updater/FFXIVAPP.Updater.csproj @@ -55,20 +55,20 @@ ..\..\ffxivapp-resources\FFXIVAPP.IPluginInterface.dll - + False - ..\packages\DotNetZip.1.9.2\lib\net20\Ionic.Zip.dll + ..\..\ffxivapp-aio\packages\DotNetZip.1.9.3\lib\net20\Ionic.Zip.dll ..\..\ffxivapp-resources\MahApps.Metro.dll False - ..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\ffxivapp-aio\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll - + False - ..\packages\NLog.2.1.0\lib\net45\NLog.dll + ..\..\ffxivapp-aio\packages\NLog.3.1.0.0\lib\net45\NLog.dll diff --git a/FFXIVAPP.Updater/NLog.config b/FFXIVAPP.Updater/NLog.config index d2e19fd2..ede1596b 100644 --- a/FFXIVAPP.Updater/NLog.config +++ b/FFXIVAPP.Updater/NLog.config @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> diff --git a/FFXIVAPP.Updater/NLog.xsd b/FFXIVAPP.Updater/NLog.xsd index 49dd6204..98aba4e2 100644 --- a/FFXIVAPP.Updater/NLog.xsd +++ b/FFXIVAPP.Updater/NLog.xsd @@ -229,18 +229,18 @@ - - + + Name of the target. - + - Indicates whether buffer should grow as needed. + Maximum number of log events that the buffer can keep. @@ -248,9 +248,9 @@ Number of log events to be buffered. - + - Maximum number of log events that the buffer can keep. + Indicates whether buffer should grow as needed. @@ -281,22 +281,22 @@ - + Name of the target. - + - Indicates whether to add <!-- --> comments around all written texts. + Layout used to format log messages. - + - Layout used to format log messages. + Indicates whether to add <!-- --> comments around all written texts. @@ -307,34 +307,34 @@ - - + + Name of the target. - + - Limit on the number of requests in the lazy writer thread request queue. + Number of log events that should be processed in a batch by the lazy writer thread. - + - Time in milliseconds to sleep between batches. + Action to be taken when the lazy writer thread request queue count exceeds the set limit. - + - Number of log events that should be processed in a batch by the lazy writer thread. + Limit on the number of requests in the lazy writer thread request queue. - + - Action to be taken when the lazy writer thread request queue count exceeds the set limit. + Time in milliseconds to sleep between batches. @@ -366,18 +366,18 @@ - - + + Name of the target. - + - Indicates whether to use sliding timeout. + Number of log events to be buffered. @@ -385,9 +385,9 @@ Timeout (in milliseconds) after which the contents of buffer will be flushed if there's no write in the specified period of time. Use -1 to disable timed flushes. - + - Number of log events to be buffered. + Indicates whether to use sliding timeout. @@ -398,37 +398,37 @@ - - - - + + + + - + + + + - - - - + Name of the target. - + - Indicates whether to append newline at the end of log message. + Encoding to be used. - + - Action that should be taken if the message is larger than maxMessageSize. + Instance of that is used to format log messages. @@ -436,24 +436,24 @@ Maximum message size in bytes. - + - Encoding to be used. + Indicates whether to append newline at the end of log message. - + - Instance of that is used to format log messages. + Action that should be taken if the message is larger than maxMessageSize. - + - Network address. + Size of the connection cache (number of connections which are kept alive). - + - Size of the connection cache (number of connections which are kept alive). + Network address. @@ -466,39 +466,39 @@ Maximum queue size. - + - Indicates whether to include dictionary contents. + Indicates whether to include NLog-specific extensions to log4j schema. - + - Indicates whether to include call site (class and method name) in the information sent over the network. + Indicates whether to include source info (file name and line number) in the information sent over the network. - + - AppInfo field. By default it's the friendly name of the current AppDomain. + NDC item separator. - + - Indicates whether to include NLog-specific extensions to log4j schema. + Indicates whether to include call site (class and method name) in the information sent over the network. - + - Indicates whether to include stack contents. + AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. + Indicates whether to include stack contents. - + - Indicates whether to include source info (file name and line number) in the information sent over the network. + Indicates whether to include dictionary contents. @@ -532,12 +532,12 @@ - - + + + - @@ -545,9 +545,9 @@ Name of the target. - + - Footer. + Text to be rendered. @@ -555,9 +555,9 @@ Header. - + - Text to be rendered. + Footer. @@ -661,9 +661,9 @@ - - + + @@ -671,9 +671,9 @@ Name of the target. - + - Footer. + Text to be rendered. @@ -681,9 +681,9 @@ Header. - + - Text to be rendered. + Footer. @@ -699,44 +699,45 @@ - - - - - - - + - - + + + + + + - + + + + Name of the target. - + - Database user name. If the ConnectionString is not provided this value will be used to construct the "User ID=" part of the connection string. + Connection string. When provided, it overrides the values specified in DBHost, DBUserName, DBPassword, DBDatabase. - + - Name of the database provider. + Name of the connection string (as specified in <connectionStrings> configuration section. - + - Indicates whether to use database transactions. Some data providers require this. + Database name. If the ConnectionString is not provided this value will be used to construct the "Database=" part of the connection string. - + - Indicates whether to keep the database connection open between the log events. + Database host name. If the ConnectionString is not provided this value will be used to construct the "Server=" part of the connection string. @@ -744,24 +745,24 @@ Database password. If the ConnectionString is not provided this value will be used to construct the "Password=" part of the connection string. - + - Name of the connection string (as specified in <connectionStrings> configuration section. + Name of the database provider. - + - Connection string. When provided, it overrides the values specified in DBHost, DBUserName, DBPassword, DBDatabase. + Database user name. If the ConnectionString is not provided this value will be used to construct the "User ID=" part of the connection string. - + - Database host name. If the ConnectionString is not provided this value will be used to construct the "Server=" part of the connection string. + Indicates whether to keep the database connection open between the log events. - + - Database name. If the ConnectionString is not provided this value will be used to construct the "Database=" part of the connection string. + Indicates whether to use database transactions. Some data providers require this. @@ -774,6 +775,11 @@ Text of the SQL command to be run on each log level. + + + Type of the SQL command to be run on each log level. + + @@ -852,18 +858,18 @@ - - + + Name of the target. - + - Footer. + Text to be rendered. @@ -871,9 +877,9 @@ Header. - + - Text to be rendered. + Footer. @@ -905,11 +911,11 @@ - - - + + + @@ -921,14 +927,14 @@ Layout used to format log messages. - + - Name of the machine on which Event Log service is running. + Layout that renders event Category. - + - Value to be used as the event Source. + Layout that renders event ID. @@ -936,14 +942,14 @@ Name of the Event Log to write to. This can be System, Application or any user-defined name. - + - Layout that renders event Category. + Name of the machine on which Event Log service is running. - + - Layout that renders event ID. + Value to be used as the event Source. @@ -974,46 +980,47 @@ - - - + + + + + - - - - + + - + - + - - + - - + + + + Name of the target. - + - File encoding. + Text to be rendered. - + - Line ending mode. + Header. @@ -1021,39 +1028,39 @@ Footer. - + - Text to be rendered. + File encoding. - + - Header. + Line ending mode. - + - Indicates whether to automatically archive log files every time the specified time passes. + Way file archives are numbered. - + - Size in bytes above which log files will be automatically archived. + Name of the file to be used for an archive. - + - Name of the file to be used for an archive. + Indicates whether to automatically archive log files every time the specified time passes. - + - Maximum number of archive files that should be kept. + Size in bytes above which log files will be automatically archived. - + - Way file archives are numbered. + Maximum number of archive files that should be kept. @@ -1061,19 +1068,19 @@ Gets ors set a value indicating whether a managed file stream is forced, instead of used the native implementation. - + - File attributes (Windows only). + Indicates whether to replace file contents on each write instead of appending log message at the end. - + - Indicates whether to delete old log file on startup. + Indicates whether to enable log file(s) to be deleted. - + - Indicates whether to enable log file(s) to be deleted. + Indicates whether to delete old log file on startup. @@ -1081,9 +1088,9 @@ Indicates whether to create directories if they don't exist. - + - Indicates whether to replace file contents on each write instead of appending log message at the end. + Value specifying the date format to use when archving files. @@ -1091,9 +1098,9 @@ Name of the file to write to. - + - Maximum number of seconds that files are kept open. If this number is negative the files are not automatically closed after a period of inactivity. + File attributes (Windows only). @@ -1101,24 +1108,29 @@ Log file buffer size in bytes. + + + Delay in milliseconds to wait before attempting to write to the file again. + + Number of times the write is appended on the file before NLog discards the log message. - + - Delay in milliseconds to wait before attempting to write to the file again. + Indicates whether concurrent writes to the log file by multiple processes on the same host. - + - Indicates whether to automatically flush the file buffers after each log message. + Indicates whether to keep log file open instead of opening and closing it on each logging event. - + - Indicates whether concurrent writes to the log file by multiple processes on the same host. + Indicates whether concurrent writes to the log file by multiple processes on different network hosts. @@ -1126,14 +1138,14 @@ Number of files to be kept open. Setting this to a higher value may improve performance in a situation where a single File target is writing to many files (such as splitting by level or by logger). - + - Indicates whether concurrent writes to the log file by multiple processes on different network hosts. + Maximum number of seconds that files are kept open. If this number is negative the files are not automatically closed after a period of inactivity. - + - Indicates whether to keep log file open instead of opening and closing it on each logging event. + Indicates whether to automatically flush the file buffers after each log message. @@ -1148,6 +1160,13 @@ + + + + + + + @@ -1158,12 +1177,6 @@ - - - - - - @@ -1210,9 +1223,9 @@ - - + + @@ -1225,9 +1238,9 @@ Layout used to format log messages. - + - Name of the Form on which the control is located. + Indicates whether log text should be appended to the text of the control instead of overwriting it. @@ -1235,9 +1248,9 @@ Name of control to which NLog will log write log text. - + - Indicates whether log text should be appended to the text of the control instead of overwriting it. + Name of the Form on which the control is located. @@ -1253,32 +1266,32 @@ - - - - + + + + Name of the target. - + - User account password. + Windows domain name to change context to. - + - Indicates whether to revert to the credentials of the process instead of impersonating another user. + Required impersonation level. - + - Username to change context to. + Type of the logon provider. @@ -1286,34 +1299,24 @@ Logon Type. - + - Windows domain name to change context to. + User account password. - + - Required impersonation level. + Indicates whether to revert to the credentials of the process instead of impersonating another user. - + - Type of the logon provider. + Username to change context to. - - - - - - - - - - @@ -1327,36 +1330,41 @@ + + + + + + + + + + - - - + + + Name of the target. - - - Name of the endpoint configuration in WCF configuration file. - - Endpoint address. - + - Indicates whether to use binary message encoding. + Name of the endpoint configuration in WCF configuration file. @@ -1369,6 +1377,11 @@ Indicates whether to include per-event properties in the payload sent to the server. + + + Indicates whether to use binary message encoding. + + @@ -1399,61 +1412,67 @@ - - - + + + + - - + - + - - + + + Name of the target. - + - Indicates whether to send message as HTML instead of plain text. + Text to be rendered. - + - Encoding to be used for sending e-mail. + Header. - + - Indicates whether to add new lines between log entries. + Footer. - + - Text to be rendered. + Indicates whether to send message as HTML instead of plain text. - + - Header. + Encoding to be used for sending e-mail. - + - Footer. + Indicates whether to add new lines between log entries. + + + + + BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). @@ -1466,9 +1485,9 @@ CC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - + - BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). + Mail message body (repeated for each log message send in one mail). @@ -1476,11 +1495,6 @@ Mail subject. - - - Mail message body (repeated for each log message send in one mail). - - Sender's email address (e.g. joe@domain.com). @@ -1496,9 +1510,9 @@ Priority used for sending mails. - + - Indicates whether the default Settings from System.Net.MailSettings should be used. + Indicates the SMTP client timeout. @@ -1506,19 +1520,14 @@ SMTP Server to be used for sending. - - - Username used to connect to SMTP server (used when SmtpAuthentication is set to "basic"). - - - + - Port number that SMTP Server is listening on. + SMTP Authentication mode. - + - SMTP Authentication mode. + Username used to connect to SMTP server (used when SmtpAuthentication is set to "basic"). @@ -1531,9 +1540,19 @@ Indicates whether SSL (secure sockets layer) should be used when communicating with SMTP server. - - - + + + Port number that SMTP Server is listening on. + + + + + Indicates whether the default Settings from System.Net.MailSettings should be used. + + + + + @@ -1592,30 +1611,20 @@ - - - - + + + + Name of the target. - - - Indicates whether to use the XML format when serializing message. This will also disable creating queues. - - - - - Indicates whether to check if a queue exists before writing to it. - - Layout used to format log messages. @@ -1626,14 +1635,14 @@ Encoding to be used when writing text to the queue. - + - Name of the queue to write to. + Indicates whether to use the XML format when serializing message. This will also disable creating queues. - + - Indicates whether to use recoverable messages (with guaranteed delivery). + Indicates whether to check if a queue exists before writing to it. @@ -1646,6 +1655,16 @@ Label to associate with each message. + + + Name of the queue to write to. + + + + + Indicates whether to use recoverable messages (with guaranteed delivery). + + @@ -1654,8 +1673,8 @@ - + @@ -1663,14 +1682,14 @@ Name of the target. - + - Method name. The method must be public and static. + Class name. - + - Class name. + Method name. The method must be public and static. @@ -1681,14 +1700,14 @@ - - - - - + + + + + @@ -1696,14 +1715,14 @@ Name of the target. - + - Indicates whether to append newline at the end of log message. + Layout used to format log messages. - + - Action that should be taken if the message is larger than maxMessageSize. + Encoding to be used. @@ -1711,19 +1730,19 @@ Maximum message size in bytes. - + - Layout used to format log messages. + Indicates whether to append newline at the end of log message. - + - Encoding to be used. + Action that should be taken if the message is larger than maxMessageSize. - + - Indicates whether to keep connection open whenever possible. + Network address. @@ -1731,9 +1750,9 @@ Size of the connection cache (number of connections which are kept alive). - + - Network address. + Indicates whether to keep connection open whenever possible. @@ -1749,37 +1768,37 @@ - - - - + + + + - + + + + - - - - + Name of the target. - + - Indicates whether to append newline at the end of log message. + Encoding to be used. - + - Action that should be taken if the message is larger than maxMessageSize. + Instance of that is used to format log messages. @@ -1787,24 +1806,24 @@ Maximum message size in bytes. - + - Encoding to be used. + Indicates whether to append newline at the end of log message. - + - Instance of that is used to format log messages. + Action that should be taken if the message is larger than maxMessageSize. - + - Network address. + Size of the connection cache (number of connections which are kept alive). - + - Size of the connection cache (number of connections which are kept alive). + Network address. @@ -1817,39 +1836,39 @@ Maximum queue size. - + - Indicates whether to include dictionary contents. + Indicates whether to include NLog-specific extensions to log4j schema. - + - Indicates whether to include call site (class and method name) in the information sent over the network. + Indicates whether to include source info (file name and line number) in the information sent over the network. - + - AppInfo field. By default it's the friendly name of the current AppDomain. + NDC item separator. - + - Indicates whether to include NLog-specific extensions to log4j schema. + Indicates whether to include call site (class and method name) in the information sent over the network. - + - Indicates whether to include stack contents. + AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. + Indicates whether to include stack contents. - + - Indicates whether to include source info (file name and line number) in the information sent over the network. + Indicates whether to include dictionary contents. @@ -1860,22 +1879,22 @@ - + Name of the target. - + - Indicates whether to perform layout calculation. + Layout used to format log messages. - + - Layout used to format log messages. + Indicates whether to perform layout calculation. @@ -1906,46 +1925,46 @@ - - - + + + Name of the target. - + - Name of the performance counter. + Indicates whether performance counter should be automatically created. - + - Performance counter type. + Name of the performance counter category. - + - Performance counter instance name. + Counter help text. - + - Indicates whether performance counter should be automatically created. + Name of the performance counter. - + - Name of the performance counter category. + Performance counter type. - + - Counter help text. + Performance counter instance name. @@ -2059,22 +2078,22 @@ - + Name of the target. - + - Time to wait between retries in milliseconds. + Number of retries that should be attempted on the wrapped target in case of a failure. - + - Number of retries that should be attempted on the wrapped target in case of a failure. + Time to wait between retries in milliseconds. @@ -2086,17 +2105,17 @@ - - - - - - + - - + + + + + + + @@ -2108,44 +2127,44 @@ Layout used to format log messages. - + - Indicates whether the created form will be initially minimized. + Indicates whether scroll bar will be moved automatically to show most recent log entries. - + - Maximum number of lines the rich text box will store (or 0 to disable this feature). + Name of RichTextBox to which Nlog will write. - + - Initial width of the form with rich text box. + Name of the Form on which the control is located. If there is no open form of a specified name than NLog will create a new one. - + - Indicates whether the created window will be a tool window. + Initial height of the form with rich text box. - + - Name of RichTextBox to which Nlog will write. + Maximum number of lines the rich text box will store (or 0 to disable this feature). - + - Indicates whether scroll bar will be moved automatically to show most recent log entries. + Indicates whether the created form will be initially minimized. - + - Initial height of the form with rich text box. + Indicates whether the created window will be a tool window. - + - Name of the Form on which the control is located. If there is no open form of a specified name than NLog will create a new one. + Initial width of the form with rich text box. @@ -2165,6 +2184,34 @@ + + + + + + + + + + Condition that must be met in order to set the specified font color. + + + + + Background color. + + + + + Font color. + + + + + Font style of matched text. + + + @@ -2211,34 +2258,6 @@ - - - - - - - - - - Condition that must be met in order to set the specified font color. - - - - - Background color. - - - - - Font color. - - - - - Font style of matched text. - - - @@ -2293,20 +2312,25 @@ - + + - - + Name of the target. - + - Web service URL. + Encoding. + + + + + Web service method name. @@ -2319,14 +2343,9 @@ Protocol to be used when calling web service. - - - Web service method name. - - - + - Encoding. + Web service URL. @@ -2344,19 +2363,19 @@ - - - - - + + + + + - + - Body layout (can be repeated multiple times). + Footer layout. @@ -2364,46 +2383,39 @@ Header layout. - + - Footer layout. + Body layout (can be repeated multiple times). - + - Quote Character. + Custom column delimiter value (valid when ColumnDelimiter is set to 'Custom'). - + - Quoting mode. + Column delimiter. - + - Indicates whether CVS should include header. + Quote Character. - + - Custom column delimiter value (valid when ColumnDelimiter is set to 'Custom'). + Quoting mode. - + - Column delimiter. + Indicates whether CVS should include header. - - - - - - - @@ -2415,6 +2427,13 @@ + + + + + + + @@ -2435,13 +2454,13 @@ - - + + - + - Body layout (can be repeated multiple times). + Footer layout. @@ -2449,9 +2468,9 @@ Header layout. - + - Footer layout. + Body layout (can be repeated multiple times). @@ -2482,17 +2501,17 @@ - + - + - Condition expression. + Action to be taken when filter matches. - + - Action to be taken when filter matches. + Condition expression. @@ -2511,29 +2530,29 @@ - - + + - + - Layout to be used to filter log messages. + Action to be taken when filter matches. - + - Substring to be matched. + Indicates whether to ignore case when comparing strings. - + - Action to be taken when filter matches. + Layout to be used to filter log messages. - + - Indicates whether to ignore case when comparing strings. + Substring to be matched. @@ -2543,29 +2562,29 @@ - - + + - + - Indicates whether to ignore case when comparing strings. + Action to be taken when filter matches. - + - Layout to be used to filter log messages. + String to compare the layout to. - + - Action to be taken when filter matches. + Indicates whether to ignore case when comparing strings. - + - String to compare the layout to. + Layout to be used to filter log messages. @@ -2575,29 +2594,29 @@ - - + + - + - Layout to be used to filter log messages. + Action to be taken when filter matches. - + - Substring to be matched. + Indicates whether to ignore case when comparing strings. - + - Action to be taken when filter matches. + Layout to be used to filter log messages. - + - Indicates whether to ignore case when comparing strings. + Substring to be matched. @@ -2607,29 +2626,29 @@ - - + + - + - Indicates whether to ignore case when comparing strings. + Action to be taken when filter matches. - + - Layout to be used to filter log messages. + String to compare the layout to. - + - Action to be taken when filter matches. + Indicates whether to ignore case when comparing strings. - + - String to compare the layout to. + Layout to be used to filter log messages. diff --git a/FFXIVAPP.Updater/app.config b/FFXIVAPP.Updater/app.config index 3e4f9f30..a47b4282 100644 --- a/FFXIVAPP.Updater/app.config +++ b/FFXIVAPP.Updater/app.config @@ -1,5 +1,13 @@ - + + + + + + + + + \ No newline at end of file diff --git a/FFXIVAPP.Updater/packages.config b/FFXIVAPP.Updater/packages.config index e8c0f70e..af64c5a0 100644 --- a/FFXIVAPP.Updater/packages.config +++ b/FFXIVAPP.Updater/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/distribution/FFXIVAPP.Client.exe b/distribution/FFXIVAPP.Client.exe index aaf71f77..a7298ee4 100644 Binary files a/distribution/FFXIVAPP.Client.exe and b/distribution/FFXIVAPP.Client.exe differ diff --git a/distribution/FFXIVAPP.Client.exe.config b/distribution/FFXIVAPP.Client.exe.config index 32757adf..798210cf 100644 --- a/distribution/FFXIVAPP.Client.exe.config +++ b/distribution/FFXIVAPP.Client.exe.config @@ -1,10 +1,10 @@ - + - +
- +
@@ -115,8 +115,7 @@ - + Red|Light Green|Light Blue|Light @@ -166,8 +165,7 @@ - + Atomos Bahamut Chocobo @@ -234,8 +232,7 @@ - + English Japanese French @@ -248,16 +245,14 @@ - + None - + 0.8 0.9 1.0 @@ -271,12 +266,23 @@ - + System Default + + + + + + + + + + + + \ No newline at end of file diff --git a/distribution/FFXIVAPP.Client.vshost.exe.config b/distribution/FFXIVAPP.Client.vshost.exe.config index 32757adf..798210cf 100644 --- a/distribution/FFXIVAPP.Client.vshost.exe.config +++ b/distribution/FFXIVAPP.Client.vshost.exe.config @@ -1,10 +1,10 @@ - + - +
- +
@@ -115,8 +115,7 @@ - + Red|Light Green|Light Blue|Light @@ -166,8 +165,7 @@ - + Atomos Bahamut Chocobo @@ -234,8 +232,7 @@ - + English Japanese French @@ -248,16 +245,14 @@ - + None - + 0.8 0.9 1.0 @@ -271,12 +266,23 @@ - + System Default + + + + + + + + + + + + \ No newline at end of file diff --git a/distribution/FFXIVAPP.Common.dll b/distribution/FFXIVAPP.Common.dll index b7690895..11994aec 100644 Binary files a/distribution/FFXIVAPP.Common.dll and b/distribution/FFXIVAPP.Common.dll differ diff --git a/distribution/FFXIVAPP.IPluginInterface.dll b/distribution/FFXIVAPP.IPluginInterface.dll index d2f7f441..4278bcc9 100644 Binary files a/distribution/FFXIVAPP.IPluginInterface.dll and b/distribution/FFXIVAPP.IPluginInterface.dll differ diff --git a/distribution/FFXIVAPP.Localization.dll b/distribution/FFXIVAPP.Localization.dll index 6e911e08..d3b73383 100644 Binary files a/distribution/FFXIVAPP.Localization.dll and b/distribution/FFXIVAPP.Localization.dll differ diff --git a/distribution/FFXIVAPP.Updater.exe b/distribution/FFXIVAPP.Updater.exe index 9f28347b..1b2e8bc8 100644 Binary files a/distribution/FFXIVAPP.Updater.exe and b/distribution/FFXIVAPP.Updater.exe differ diff --git a/distribution/FFXIVAPP.Updater.exe.config b/distribution/FFXIVAPP.Updater.exe.config index 3e4f9f30..a47b4282 100644 --- a/distribution/FFXIVAPP.Updater.exe.config +++ b/distribution/FFXIVAPP.Updater.exe.config @@ -1,5 +1,13 @@ - + + + + + + + + + \ No newline at end of file diff --git a/distribution/FFXIVAPP_3.0.5399.19376.zip b/distribution/FFXIVAPP_3.0.5399.19376.zip deleted file mode 100644 index c0dae46e..00000000 Binary files a/distribution/FFXIVAPP_3.0.5399.19376.zip and /dev/null differ diff --git a/distribution/HtmlAgilityPack.dll b/distribution/HtmlAgilityPack.dll index 07a654d1..0d67049a 100644 Binary files a/distribution/HtmlAgilityPack.dll and b/distribution/HtmlAgilityPack.dll differ diff --git a/distribution/Ionic.Zip.dll b/distribution/Ionic.Zip.dll index c88d1536..c15d937e 100644 Binary files a/distribution/Ionic.Zip.dll and b/distribution/Ionic.Zip.dll differ diff --git a/distribution/Ionic.Zip.dllumsqx0em.zos.PendingOverwrite b/distribution/Ionic.Zip.dllumsqx0em.zos.PendingOverwrite deleted file mode 100644 index c88d1536..00000000 Binary files a/distribution/Ionic.Zip.dllumsqx0em.zos.PendingOverwrite and /dev/null differ diff --git a/distribution/MahApps.Metro.dll b/distribution/MahApps.Metro.dll index 012f4e91..fadb3cc6 100644 Binary files a/distribution/MahApps.Metro.dll and b/distribution/MahApps.Metro.dll differ diff --git a/distribution/NLog.config b/distribution/NLog.config index d2e19fd2..ede1596b 100644 --- a/distribution/NLog.config +++ b/distribution/NLog.config @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> diff --git a/distribution/NLog.dll b/distribution/NLog.dll index 5a2f1452..86e374ad 100644 Binary files a/distribution/NLog.dll and b/distribution/NLog.dll differ diff --git a/distribution/NLog.xml b/distribution/NLog.xml index e6393074..17c3740d 100644 --- a/distribution/NLog.xml +++ b/distribution/NLog.xml @@ -4,265 +4,365 @@ NLog - - - NLog COM Interop logger implementation. - - - - - NLog COM Interop logger interface. - - - - - Writes the diagnostic message at the specified level. - - The log level. - A to be written. - - - - Writes the diagnostic message at the Trace level. - - A to be written. - - - - Writes the diagnostic message at the Debug level. - - A to be written. - - - - Writes the diagnostic message at the Info level. - - A to be written. - - - - Writes the diagnostic message at the Warn level. - - A to be written. - - - - Writes the diagnostic message at the Error level. - - A to be written. - - - - Writes the diagnostic message at the Fatal level. - - A to be written. - - - - Checks if the specified log level is enabled. - - The log level. - A value indicating whether the specified log level is enabled. - - - - Gets a value indicating whether the Trace level is enabled. - - - - - Gets a value indicating whether the Debug level is enabled. - - - - - Gets a value indicating whether the Info level is enabled. - - - - - Gets a value indicating whether the Warn level is enabled. - - - - - Gets a value indicating whether the Error level is enabled. - - - - - Gets a value indicating whether the Fatal level is enabled. - - - - - Gets or sets the logger name. - + + + Indicates that the value of the marked element could be null sometimes, + so the check for null is necessary before its usage + + + [CanBeNull] public object Test() { return null; } + public void UseTest() { + var p = Test(); + var s = p.ToString(); // Warning: Possible 'System.NullReferenceException' + } + + + + + Indicates that the value of the marked element could never be null + + + [NotNull] public object Foo() { + return null; // Warning: Possible 'null' assignment + } + + + + + Indicates that the marked method builds string by format pattern and (optional) arguments. + Parameter, which contains format string, should be given in constructor. The format string + should be in -like form + + + [StringFormatMethod("message")] + public void ShowError(string message, params object[] args) { /* do something */ } + public void Foo() { + ShowError("Failed: {0}"); // Warning: Non-existing argument in format string + } + + + + + Specifies which parameter of an annotated method should be treated as format-string + - - - Writes the diagnostic message at the specified level. - - The log level. - A to be written. + + + Indicates that the function argument should be string literal and match one + of the parameters of the caller function. For example, ReSharper annotates + the parameter of + + + public void Foo(string param) { + if (param == null) + throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol + } + + + + + Indicates that the method is contained in a type that implements + interface + and this method is used to notify that some property value changed + + + The method should be non-static and conform to one of the supported signatures: + + NotifyChanged(string) + NotifyChanged(params string[]) + NotifyChanged{T}(Expression{Func{T}}) + NotifyChanged{T,U}(Expression{Func{T,U}}) + SetProperty{T}(ref T, T, string) + + + + internal class Foo : INotifyPropertyChanged { + public event PropertyChangedEventHandler PropertyChanged; + [NotifyPropertyChangedInvocator] + protected virtual void NotifyChanged(string propertyName) { ... } + + private string _name; + public string Name { + get { return _name; } + set { _name = value; NotifyChanged("LastName"); /* Warning */ } + } + } + + Examples of generated notifications: + + NotifyChanged("Property") + NotifyChanged(() => Property) + NotifyChanged((VM x) => x.Property) + SetProperty(ref myField, value, "Property") + + + + + + Describes dependency between method input and output + + +

Function Definition Table syntax:

+ + FDT ::= FDTRow [;FDTRow]* + FDTRow ::= Input => Output | Output <= Input + Input ::= ParameterName: Value [, Input]* + Output ::= [ParameterName: Value]* {halt|stop|void|nothing|Value} + Value ::= true | false | null | notnull | canbenull + + If method has single input parameter, it's name could be omitted.
+ Using halt (or void/nothing, which is the same) + for method output means that the methos doesn't return normally.
+ canbenull annotation is only applicable for output parameters.
+ You can use multiple [ContractAnnotation] for each FDT row, + or use single attribute with rows separated by semicolon.
+
+ + + [ContractAnnotation("=> halt")] + public void TerminationMethod() + + + [ContractAnnotation("halt <= condition: false")] + public void Assert(bool condition, string text) // regular assertion method + + + [ContractAnnotation("s:null => true")] + public bool IsNullOrEmpty(string s) // string.IsNullOrEmpty() + + + // A method that returns null if the parameter is null, and not null if the parameter is not null + [ContractAnnotation("null => null; notnull => notnull")] + public object Transform(object data) + + + [ContractAnnotation("s:null=>false; =>true,result:notnull; =>false, result:null")] + public bool TryParse(string s, out Person result) + + +
+ + + Indicates that marked element should be localized or not + + + [LocalizationRequiredAttribute(true)] + internal class Foo { + private string str = "my string"; // Warning: Localizable string + } + + + + + Indicates that the value of the marked type (or its derivatives) + cannot be compared using '==' or '!=' operators and Equals() + should be used instead. However, using '==' or '!=' for comparison + with null is always permitted. + + + [CannotApplyEqualityOperator] + class NoEquality { } + class UsesNoEquality { + public void Test() { + var ca1 = new NoEquality(); + var ca2 = new NoEquality(); + if (ca1 != null) { // OK + bool condition = ca1 == ca2; // Warning + } + } + } + + + + + When applied to a target attribute, specifies a requirement for any type marked + with the target attribute to implement or inherit specific type or types. + + + [BaseTypeRequired(typeof(IComponent)] // Specify requirement + internal class ComponentAttribute : Attribute { } + [Component] // ComponentAttribute requires implementing IComponent interface + internal class MyComponent : IComponent { } + - + - Writes the diagnostic message at the Trace level. + Indicates that the marked symbol is used implicitly + (e.g. via reflection, in external library), so this symbol + will not be marked as unused (as well as by other usage inspections) - A to be written. - + - Writes the diagnostic message at the Debug level. + Should be used on attributes and causes ReSharper + to not mark symbols marked with such attributes as unused + (as well as by other usage inspections) - A to be written. - - - Writes the diagnostic message at the Info level. - - A to be written. + + Only entity marked with attribute considered used - - - Writes the diagnostic message at the Warn level. - - A to be written. + + Indicates implicit assignment to a member - + - Writes the diagnostic message at the Error level. + Indicates implicit instantiation of a type with fixed constructor signature. + That means any unused constructor parameters won't be reported as such. - A to be written. - - - Writes the diagnostic message at the Fatal level. - - A to be written. + + Indicates implicit instantiation of a type - + - Checks if the specified log level is enabled. + Specify what is considered used implicitly + when marked with + or - The log level. - - A value indicating whether the specified log level is enabled. - - - - Gets a value indicating whether the Trace level is enabled. - - + + Members of entity marked with attribute are considered used - - - Gets a value indicating whether the Debug level is enabled. - - + + Entity marked with attribute and all its members considered used - + - Gets a value indicating whether the Info level is enabled. + This attribute is intended to mark publicly available API + which should not be removed and so is treated as used - - + - Gets a value indicating whether the Warn level is enabled. + Tells code analysis engine if the parameter is completely handled + when the invoked method is on stack. If the parameter is a delegate, + indicates that delegate is executed while the method is executed. + If the parameter is an enumerable, indicates that it is enumerated + while the method is executed - - + - Gets a value indicating whether the Error level is enabled. + Indicates that a method does not make any observable state changes. + The same as System.Diagnostics.Contracts.PureAttribute - + + [Pure] private int Multiply(int x, int y) { return x * y; } + public void Foo() { + const int a = 2, b = 2; + Multiply(a, b); // Waring: Return value of pure method is not used + } + - + - Gets a value indicating whether the Fatal level is enabled. + Indicates that a parameter is a path to a file or a folder + within a web project. Path can be relative or absolute, + starting from web root (~) - - + - Gets or sets the logger name. + ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter + is an MVC action. If applied to a method, the MVC action name is calculated + implicitly from the context. Use this attribute for custom wrappers similar to + System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String) - - + - NLog COM Interop LogManager implementation. + ASP.NET MVC attribute. Indicates that a parameter is an MVC area. + Use this attribute for custom wrappers similar to + System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String) - + - NLog COM Interop LogManager interface. + ASP.NET MVC attribute. If applied to a parameter, indicates that + the parameter is an MVC controller. If applied to a method, + the MVC controller name is calculated implicitly from the context. + Use this attribute for custom wrappers similar to + System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String, String) - + - Loads NLog configuration from the specified file. + ASP.NET MVC attribute. Indicates that a parameter is an MVC Master. + Use this attribute for custom wrappers similar to + System.Web.Mvc.Controller.View(String, String) - The name of the file to load NLog configuration from. - + - Creates the specified logger object and assigns a LoggerName to it. + ASP.NET MVC attribute. Indicates that a parameter is an MVC model type. + Use this attribute for custom wrappers similar to + System.Web.Mvc.Controller.View(String, Object) - Logger name. - The new logger instance. - + - Gets or sets a value indicating whether internal messages should be written to the console. + ASP.NET MVC attribute. If applied to a parameter, indicates that + the parameter is an MVC partial view. If applied to a method, + the MVC partial view name is calculated implicitly from the context. + Use this attribute for custom wrappers similar to + System.Web.Mvc.Html.RenderPartialExtensions.RenderPartial(HtmlHelper, String) - + - Gets or sets the name of the internal log file. + ASP.NET MVC attribute. Allows disabling all inspections + for MVC views within a class or a method. - + - Gets or sets the name of the internal log level. + ASP.NET MVC attribute. Indicates that a parameter is an MVC display template. + Use this attribute for custom wrappers similar to + System.Web.Mvc.Html.DisplayExtensions.DisplayForModel(HtmlHelper, String) - + - Creates the specified logger object and assigns a LoggerName to it. + ASP.NET MVC attribute. Indicates that a parameter is an MVC editor template. + Use this attribute for custom wrappers similar to + System.Web.Mvc.Html.EditorExtensions.EditorForModel(HtmlHelper, String) - The name of the logger. - The new logger instance. - + - Loads NLog configuration from the specified file. + ASP.NET MVC attribute. Indicates that a parameter is an MVC template. + Use this attribute for custom wrappers similar to + System.ComponentModel.DataAnnotations.UIHintAttribute(System.String) - The name of the file to load NLog configuration from. - + - Gets or sets a value indicating whether to log internal messages to the console. + ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter + is an MVC view. If applied to a method, the MVC view name is calculated implicitly + from the context. Use this attribute for custom wrappers similar to + System.Web.Mvc.Controller.View(Object) - - A value of true if internal messages should be logged to the console; otherwise, false. - - + - Gets or sets the name of the internal log level. + ASP.NET MVC attribute. When applied to a parameter of an attribute, + indicates that this parameter is an MVC action name - + + [ActionName("Foo")] + public ActionResult Login(string returnUrl) { + ViewBag.ReturnUrl = Url.Action("Foo"); // OK + return RedirectToAction("Bar"); // Error: Cannot resolve action + } + - + - Gets or sets the name of the internal log file. + Razor attribute. Indicates that a parameter or a method is a Razor section. + Use this attribute for custom wrappers similar to + System.Web.WebPages.WebPageBase.RenderSection(String) - @@ -4170,6 +4270,51 @@ + + + Helper class for XML + + + + + removes any unusual unicode characters that can't be encoded into XML + + + + + Safe version of WriteAttributeString + + + + + + + + + + Safe version of WriteAttributeString + + + + + + + + Safe version of WriteElementSafeString + + + + + + + + + + Safe version of WriteCData + + + + Designates a property of the class as an ambient property. @@ -4525,6 +4670,12 @@ + + + Gets or sets the default value to be used when the environment variable is not set. + + + Log event context data. @@ -5989,6 +6140,16 @@ The text to be post-processed. Post-processed text. + + + A match evaluator for Regular Expression based replacing + + + + + + + Gets or sets the text to search for. @@ -6010,6 +6171,14 @@ The replacement string. + + + Gets or sets the group name to replace when using regular expressions. + Leave null or empty to replace without using group name. + + The group name. + + Gets or sets a value indicating whether to ignore case. @@ -6024,6 +6193,11 @@ A value of true if whole words should be searched for; otherwise, false. + + + This class was created instead of simply using a lambda expression so that the "ThreadAgnosticAttributeTest" will pass + + Decodes text "encrypted" with ROT-13. @@ -7148,6 +7322,14 @@ A containing format items. Arguments to format. + + + Writes the diagnostic message and exception at the specified level. + + The log level. + A to be written. + An exception to be logged. + Writes the diagnostic message at the specified level using the specified parameter and formatting it with the supplied format provider. @@ -7269,6 +7451,13 @@ A containing format items. Arguments to format. + + + Writes the diagnostic message and exception at the Trace level. + + A to be written. + An exception to be logged. + Writes the diagnostic message at the Trace level using the specified parameter and formatting it with the supplied format provider. @@ -7384,6 +7573,13 @@ A containing format items. Arguments to format. + + + Writes the diagnostic message and exception at the Debug level. + + A to be written. + An exception to be logged. + Writes the diagnostic message at the Debug level using the specified parameter and formatting it with the supplied format provider. @@ -7499,6 +7695,13 @@ A containing format items. Arguments to format. + + + Writes the diagnostic message and exception at the Info level. + + A to be written. + An exception to be logged. + Writes the diagnostic message at the Info level using the specified parameter and formatting it with the supplied format provider. @@ -7614,6 +7817,13 @@ A containing format items. Arguments to format. + + + Writes the diagnostic message and exception at the Warn level. + + A to be written. + An exception to be logged. + Writes the diagnostic message at the Warn level using the specified parameter and formatting it with the supplied format provider. @@ -7729,6 +7939,13 @@ A containing format items. Arguments to format. + + + Writes the diagnostic message and exception at the Error level. + + A to be written. + An exception to be logged. + Writes the diagnostic message at the Error level using the specified parameter and formatting it with the supplied format provider. @@ -7844,6 +8061,13 @@ A containing format items. Arguments to format. + + + Writes the diagnostic message and exception at the Fatal level. + + A to be written. + An exception to be logged. + Writes the diagnostic message at the Fatal level using the specified parameter and formatting it with the supplied format provider. @@ -7907,6 +8131,56 @@ The second argument to format. The third argument to format. + + + Runs action. If the action throws, the exception is logged at Error level. Exception is not propagated outside of this method. + + Action to execute. + + + + Runs the provided function and returns its result. If exception is thrown, it is logged at Error level. + Exception is not propagated outside of this method. Fallback value is returned instead. + + Return type of the provided function. + Function to run. + Result returned by the provided function or fallback value in case of exception. + + + + Runs the provided function and returns its result. If exception is thrown, it is logged at Error level. + Exception is not propagated outside of this method. Fallback value is returned instead. + + Return type of the provided function. + Function to run. + Fallback value to return in case of exception. Defaults to default value of type T. + Result returned by the provided function or fallback value in case of exception. + + + + Runs async action. If the action throws, the exception is logged at Error level. Exception is not propagated outside of this method. + + Async action to execute. + + + + Runs the provided async function and returns its result. If exception is thrown, it is logged at Error level. + Exception is not propagated outside of this method. Fallback value is returned instead. + + Return type of the provided function. + Async function to run. + Result returned by the provided function or fallback value in case of exception. + + + + Runs the provided async function and returns its result. If exception is thrown, it is logged at Error level. + Exception is not propagated outside of this method. Fallback value is returned instead. + + Return type of the provided function. + Async function to run. + Fallback value to return in case of exception. Defaults to default value of type T. + Result returned by the provided function or fallback value in case of exception. + Writes the diagnostic message at the specified level. @@ -10558,6 +10832,18 @@ Type of the event. Translated log level. + + + Process the log event + The log level. + The name of the logger. + The log message. + The log parameters. + The event id. + The event type. + The releated activity id. + + Gets or sets the log factory to use when outputting messages (null - use LogManager). @@ -10573,6 +10859,11 @@ Gets or sets the log which should be always used regardless of source level. + + + Gets or sets a value indicating whether flush calls from trace sources should be ignored. + + Gets a value indicating whether the trace listener is thread safe. @@ -10730,6 +11021,13 @@ Logging events to be written out. + + + Merges (copies) the event context properties from any event info object stored in + parameters of the given event info object. + + The event info object to perform the merge to. + Gets or sets the name of the target. @@ -11717,12 +12015,23 @@ + + + Gets or sets the type of the SQL command to be run on each log level. + + + This specifies how the command text is interpreted, as "Text" (default) or as "StoredProcedure". + When using the value StoredProcedure, the commandText-property would + normally be the name of the stored procedure. TableDirect method is not supported in this context. + + + Gets the collection of parameters. Each parameter contains a mapping between NLog layout and a database named or positional parameter. - + @@ -12260,6 +12569,9 @@ Gets the characters that are appended after each line. + + true if the file has been moved successfully + Logs text to Windows.Forms.Control.Text property control of specified Name. @@ -12594,6 +12906,11 @@ Only happens when is set to true. + + + Gets or sets a value indicating the SMTP client timeout. + + Writes log messages to an ArrayList in memory for programmatic retrieval. diff --git a/distribution/Newtonsoft.Json.dll b/distribution/Newtonsoft.Json.dll index 570e74d7..0f63bef1 100644 Binary files a/distribution/Newtonsoft.Json.dll and b/distribution/Newtonsoft.Json.dll differ diff --git a/distribution/Newtonsoft.Json.xml b/distribution/Newtonsoft.Json.xml index 06eb5c83..d855f39c 100644 --- a/distribution/Newtonsoft.Json.xml +++ b/distribution/Newtonsoft.Json.xml @@ -1887,6 +1887,17 @@ The collection's items converter. + + + The parameter list to use when constructing the JsonConverter described by ItemConverterType. + If null, the default constructor is used. + When non-null, there must be a constructor defined in the JsonConverter that exactly matches the number, + order, and type of these parameters. + + + [JsonContainer(ItemConverterType = typeof(MyContainerConverter), ItemConverterParameters = new object[] { 123, "Four" })] + + Gets or sets a value that indicates whether to preserve object references. @@ -2151,6 +2162,15 @@ The string delimiter character. A JSON string representation of the . + + + Converts the to its JSON string representation. + + The value to convert. + The string delimiter character. + The string escape handling. + A JSON string representation of the . + Converts the to its JSON string representation. @@ -2198,7 +2218,7 @@ The object to serialize. The used to serialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. A JSON string representation of the object. @@ -2209,7 +2229,7 @@ The object to serialize. The used to serialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. The type of the value being serialized. This parameter is used when is Auto to write out the type name if the type of the value does not match. @@ -2226,7 +2246,7 @@ The object to serialize. Indicates how the output is formatted. The used to serialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. A JSON string representation of the object. @@ -2238,7 +2258,7 @@ The object to serialize. Indicates how the output is formatted. The used to serialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. The type of the value being serialized. This parameter is used when is Auto to write out the type name if the type of the value does not match. @@ -2277,7 +2297,7 @@ The object to serialize. Indicates how the output is formatted. The used to serialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. A task that represents the asynchronous serialize operation. The value of the TResult parameter contains a JSON string representation of the object. @@ -2287,7 +2307,7 @@ Deserializes the JSON to a .NET object. The JSON to deserialize. - The deserialized object from the Json string. + The deserialized object from the JSON string. @@ -2296,7 +2316,7 @@ The JSON to deserialize. The used to deserialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. The deserialized object from the JSON string. @@ -2306,7 +2326,7 @@ The JSON to deserialize. The of object being deserialized. - The deserialized object from the Json string. + The deserialized object from the JSON string. @@ -2314,7 +2334,7 @@ The type of the object to deserialize to. The JSON to deserialize. - The deserialized object from the Json string. + The deserialized object from the JSON string. @@ -2342,7 +2362,7 @@ The anonymous type object. The used to deserialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. The deserialized anonymous type from the JSON string. @@ -2363,7 +2383,7 @@ The object to deserialize. The used to deserialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. The deserialized object from the JSON string. @@ -2384,7 +2404,7 @@ The type of the object to deserialize to. The used to deserialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. The deserialized object from the JSON string. @@ -2408,7 +2428,7 @@ The JSON to deserialize. The used to deserialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. A task that represents the asynchronous deserialize operation. The value of the TResult parameter contains the deserialized object from the JSON string. @@ -2433,7 +2453,7 @@ The type of the object to deserialize to. The used to deserialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. A task that represents the asynchronous deserialize operation. The value of the TResult parameter contains the deserialized object from the JSON string. @@ -2454,7 +2474,7 @@ The target object to populate values onto. The used to deserialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. @@ -2465,7 +2485,7 @@ The target object to populate values onto. The used to deserialize the object. - If this is null, default serialization settings will be is used. + If this is null, default serialization settings will be used. A task that represents the asynchronous populate operation. @@ -2595,12 +2615,25 @@ Type of the converter. + + + Initializes a new instance of the class. + + Type of the converter. + Parameter list to use when constructing the JsonConverter. Can be null. + Gets the type of the converter. The type of the converter. + + + The parameter list to use when constructing the JsonConverter described by ConverterType. + If null, the default constructor is used. + + Represents a collection of . @@ -2746,6 +2779,17 @@ The collection's items converter. + + + The parameter list to use when constructing the JsonConverter described by ItemConverterType. + If null, the default constructor is used. + When non-null, there must be a constructor defined in the JsonConverter that exactly matches the number, + order, and type of these parameters. + + + [JsonProperty(ItemConverterType = typeof(MyContainerConverter), ItemConverterParameters = new object[] { 123, "Four" })] + + Gets or sets the null value handling used when serializing this property. @@ -4986,6 +5030,19 @@ Removes the child nodes from this token. + + + Merge the specified content into this . + + The content to be merged. + + + + Merge the specified content into this using . + + The content to be merged. + The used to merge the content. + Occurs when the list changes or an item in the list changes. @@ -5311,6 +5368,15 @@ An object that can be used to iterate through the collection. + + + Determines whether the specified is equal to this instance. + + The to compare with this instance. + + true if the specified is equal to this instance; otherwise, false. + + Determines whether the specified is equal to this instance. @@ -5410,11 +5476,11 @@ - Creates a from an object. + Creates a from an object. - The object that will be used to create . + The object that will be used to create . The that will be used to read the object. - A with the values of the specified object + A with the values of the specified object @@ -5636,6 +5702,17 @@ + + + Specifies the settings used when merging JSON. + + + + + Gets or sets the method used when merging JSON arrays. + + The method used when merging JSON arrays. + Represents a JSON property. @@ -5902,6 +5979,18 @@ The value. A string with the given value. + + + Creates a null value. + + A null value. + + + + Creates a null value. + + A null value. + Writes this token to a . @@ -6431,6 +6520,23 @@ The token being writen. + + + Specifies how JSON arrays are merged together. + + + + Concatenate arrays. + + + Union arrays, skipping items that already exist. + + + Replace all array items. + + + Merge array items together, matched by index. + Specifies the member serialization options for the . @@ -6470,6 +6576,11 @@ Read metadata properties located anywhere in a JSON object. Note that this setting will impact performance. + + + Do not try to read metadata properties. + + Specifies missing member handling options for the . @@ -7149,9 +7260,9 @@ If set to true the will use a cached shared with other resolvers of the same type. - Sharing the cache will significantly performance because expensive reflection will only happen once but could cause unexpected - behavior if different instances of the resolver are suppose to produce different results. When set to false it is highly - recommended to reuse instances with the . + Sharing the cache will significantly improve performance with multiple resolver instances because expensive reflection will only + happen once. This setting can cause unexpected behavior if different instances of the resolver are suppose to produce different + results. When set to false it is highly recommended to reuse instances with the . @@ -7880,6 +7991,11 @@ Gets the constructor parameters required for any non-default constructor + + + Gets a collection of instances that define the parameters used with . + + Gets or sets the override constructor used to create the object. @@ -7894,6 +8010,13 @@ The parametrized constructor. + + + Gets or sets the function used to create the object. When set this function will override . + This function is called with a collection of arguments which are defined by the collection. + + The function used to create the object. + Gets or sets the extension data setter. @@ -8145,6 +8268,21 @@ The underlying type for the contract. + + + Lookup and create an instance of the JsonConverter type described by the argument. + + The JsonConverter type to create. + Optional arguments to pass to an initializing constructor of the JsonConverter. + If null, the default constructor is used. + + + + Create a factory function that can be used to create instances of a JsonConverter described by the + argument type. The returned function can then be used to either invoke the converter's default ctor, or any + parameterized constructors by way of an object array. + + Represents a trace writer that writes to memory. When the trace message limit is