From 235f00bf5f06c020bf45eb50a06757a7dd8df07d Mon Sep 17 00:00:00 2001 From: RFTD Date: Sun, 9 Oct 2016 22:42:25 -0400 Subject: [PATCH] Release 1.0.1.3 --- Nuget/ACBr.Net.Sat.nuspec | 6 ++--- .../ACBr.Net.Sat.Demo.csproj | 4 ++-- src/ACBr.Net.Sat.Demo/packages.config | 5 ++-- src/ACBr.Net.Sat/ACBr.Net.Sat.csproj | 4 ++-- src/ACBr.Net.Sat/CFeDetCollection.cs | 19 +++++++++------ src/ACBr.Net.Sat/CFeDetProd.cs | 6 ++--- src/ACBr.Net.Sat/CFeInfAdic.cs | 6 ++--- src/ACBr.Net.Sat/CFePgto.cs | 24 +++++++++---------- src/ACBr.Net.Sat/InfCFe.cs | 5 +++- src/ACBr.Net.Sat/packages.config | 4 ++-- 10 files changed, 45 insertions(+), 38 deletions(-) diff --git a/Nuget/ACBr.Net.Sat.nuspec b/Nuget/ACBr.Net.Sat.nuspec index 807eafa..20b6701 100644 --- a/Nuget/ACBr.Net.Sat.nuspec +++ b/Nuget/ACBr.Net.Sat.nuspec @@ -2,7 +2,7 @@ ACBr.Net.Sat - 1.0.1.3-rc1 + 1.0.1.3 ACBr.Net.Sat Grupo ACBr.Net Grupo ACBr.Net @@ -14,8 +14,8 @@ pt-BR ACBr ACBr.Net Automação Comercial - - + + diff --git a/src/ACBr.Net.Sat.Demo/ACBr.Net.Sat.Demo.csproj b/src/ACBr.Net.Sat.Demo/ACBr.Net.Sat.Demo.csproj index bfef40d..894a274 100644 --- a/src/ACBr.Net.Sat.Demo/ACBr.Net.Sat.Demo.csproj +++ b/src/ACBr.Net.Sat.Demo/ACBr.Net.Sat.Demo.csproj @@ -36,11 +36,11 @@ - ..\packages\ACBr.Net.Core.1.0.1.3-rc1\lib\net40\ACBr.Net.Core.dll + ..\packages\ACBr.Net.Core.1.0.1.3\lib\net40\ACBr.Net.Core.dll True - ..\packages\ACBr.Net.DFe.Core.1.0.1.5-rc1\lib\net40\ACBr.Net.DFe.Core.dll + ..\packages\ACBr.Net.DFe.Core.1.0.1.5\lib\net40\ACBr.Net.DFe.Core.dll True diff --git a/src/ACBr.Net.Sat.Demo/packages.config b/src/ACBr.Net.Sat.Demo/packages.config index d4fe001..788c6e2 100644 --- a/src/ACBr.Net.Sat.Demo/packages.config +++ b/src/ACBr.Net.Sat.Demo/packages.config @@ -1,8 +1,7 @@  - - - + + \ No newline at end of file diff --git a/src/ACBr.Net.Sat/ACBr.Net.Sat.csproj b/src/ACBr.Net.Sat/ACBr.Net.Sat.csproj index 7349871..0e0b020 100644 --- a/src/ACBr.Net.Sat/ACBr.Net.Sat.csproj +++ b/src/ACBr.Net.Sat/ACBr.Net.Sat.csproj @@ -51,11 +51,11 @@ - ..\packages\ACBr.Net.Core.1.0.1.3-rc1\lib\net40\ACBr.Net.Core.dll + ..\packages\ACBr.Net.Core.1.0.1.3\lib\net40\ACBr.Net.Core.dll True - ..\packages\ACBr.Net.DFe.Core.1.0.1.5-rc1\lib\net40\ACBr.Net.DFe.Core.dll + ..\packages\ACBr.Net.DFe.Core.1.0.1.5\lib\net40\ACBr.Net.DFe.Core.dll True diff --git a/src/ACBr.Net.Sat/CFeDetCollection.cs b/src/ACBr.Net.Sat/CFeDetCollection.cs index ab48314..4fe0e1a 100644 --- a/src/ACBr.Net.Sat/CFeDetCollection.cs +++ b/src/ACBr.Net.Sat/CFeDetCollection.cs @@ -41,7 +41,7 @@ namespace ACBr.Net.Sat /// /// ACBr.Net.DFe.Core.Collection.DFeCollection{ACBr.Net.Sat.CFeDet} /// - public sealed class CFeDetCollection : DFeCollection, IEnumerable + public sealed class CFeDetCollection : DFeCollection { #region Fields @@ -91,7 +91,7 @@ internal CFe Parent set { parent = value; - foreach (var cFeDet in List) + foreach (var cFeDet in this) cFeDet.Parent = value; } } @@ -107,20 +107,25 @@ internal CFe Parent public override CFeDet AddNew() { var ret = new CFeDet(Parent); - List.Add(ret); + base.Add(ret); return ret; } - /// - /// Adds the range. - /// - /// The item. public override void Add(CFeDet item) { item.Parent = Parent; base.Add(item); } + public override void AddRange(IEnumerable itens) + { + foreach (var item in itens) + { + item.Parent = Parent; + base.Add(item); + } + } + #endregion Methods } } \ No newline at end of file diff --git a/src/ACBr.Net.Sat/CFeDetProd.cs b/src/ACBr.Net.Sat/CFeDetProd.cs index ee3d584..fb3920d 100644 --- a/src/ACBr.Net.Sat/CFeDetProd.cs +++ b/src/ACBr.Net.Sat/CFeDetProd.cs @@ -30,9 +30,9 @@ // *********************************************************************** using ACBr.Net.DFe.Core.Attributes; +using ACBr.Net.DFe.Core.Collection; using ACBr.Net.DFe.Core.Serializer; using PropertyChanged; -using System.Collections.Generic; using System.Globalization; namespace ACBr.Net.Sat @@ -56,7 +56,7 @@ public sealed class CFeDetProd /// public CFeDetProd() { - ObsFiscoDet = new List(); + ObsFiscoDet = new DFeCollection(); EhCombustivel = false; } @@ -213,7 +213,7 @@ public bool EhCombustivel /// /// The obs fisco det. [DFeElement("obsFiscoDet", Id = "I18", Min = 0, Max = 500, Ocorrencias = 0)] - public List ObsFiscoDet { get; set; } + public DFeCollection ObsFiscoDet { get; set; } #endregion Propriedades diff --git a/src/ACBr.Net.Sat/CFeInfAdic.cs b/src/ACBr.Net.Sat/CFeInfAdic.cs index 23222b4..20bb5c7 100644 --- a/src/ACBr.Net.Sat/CFeInfAdic.cs +++ b/src/ACBr.Net.Sat/CFeInfAdic.cs @@ -30,9 +30,9 @@ // *********************************************************************** using ACBr.Net.DFe.Core.Attributes; +using ACBr.Net.DFe.Core.Collection; using ACBr.Net.DFe.Core.Serializer; using PropertyChanged; -using System.Collections.Generic; using System.ComponentModel; namespace ACBr.Net.Sat @@ -50,7 +50,7 @@ public sealed class CFeInfAdic /// public CFeInfAdic() { - ObsFisco = new List(); + ObsFisco = new DFeCollection(); } #endregion Constructors @@ -70,7 +70,7 @@ public CFeInfAdic() /// The obs fisco. [Browsable(true)] [DFeElement("obsFisco", Id = "Z03", Min = 0, Max = 10, Ocorrencias = 0)] - public List ObsFisco { get; set; } + public DFeCollection ObsFisco { get; set; } #endregion Propriedades } diff --git a/src/ACBr.Net.Sat/CFePgto.cs b/src/ACBr.Net.Sat/CFePgto.cs index c730e34..b2fc592 100644 --- a/src/ACBr.Net.Sat/CFePgto.cs +++ b/src/ACBr.Net.Sat/CFePgto.cs @@ -10,20 +10,20 @@ // The MIT License (MIT) // Copyright (c) 2016 Grupo ACBr.Net // -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the // Software is furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be +// The above copyright notice and this permission notice shall be // included in all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. // // diff --git a/src/ACBr.Net.Sat/InfCFe.cs b/src/ACBr.Net.Sat/InfCFe.cs index a2d0d36..adfce59 100644 --- a/src/ACBr.Net.Sat/InfCFe.cs +++ b/src/ACBr.Net.Sat/InfCFe.cs @@ -163,7 +163,10 @@ public CFeDetCollection Det set { det = value; - det.Parent = parent; + if (det.Parent != parent) + { + det.Parent = parent; + } } } diff --git a/src/ACBr.Net.Sat/packages.config b/src/ACBr.Net.Sat/packages.config index aa3a212..d66a53c 100644 --- a/src/ACBr.Net.Sat/packages.config +++ b/src/ACBr.Net.Sat/packages.config @@ -1,7 +1,7 @@  - - + +