Skip to content
This repository has been archived by the owner on Sep 15, 2021. It is now read-only.

Commit

Permalink
Release 1.0.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
RFTD authored and RFTD committed Oct 10, 2016
1 parent 395df71 commit 235f00b
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 38 deletions.
6 changes: 3 additions & 3 deletions Nuget/ACBr.Net.Sat.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>ACBr.Net.Sat</id>
<version>1.0.1.3-rc1</version>
<version>1.0.1.3</version>
<title>ACBr.Net.Sat</title>
<authors>Grupo ACBr.Net</authors>
<owners>Grupo ACBr.Net</owners>
Expand All @@ -14,8 +14,8 @@
<language>pt-BR</language>
<tags>ACBr ACBr.Net Automação Comercial</tags>
<dependencies>
<dependency id="ACBr.Net.Core" version="1.0.1.3-rc1" />
<dependency id="ACBr.Net.DFe.Core" version="1.0.1.5-rc1" />
<dependency id="ACBr.Net.Core" version="1.0.1.3" />
<dependency id="ACBr.Net.DFe.Core" version="1.0.1.5" />
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions src/ACBr.Net.Sat.Demo/ACBr.Net.Sat.Demo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ACBr.Net.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d3bb9130f8b775a6, processorArchitecture=MSIL">
<HintPath>..\packages\ACBr.Net.Core.1.0.1.3-rc1\lib\net40\ACBr.Net.Core.dll</HintPath>
<HintPath>..\packages\ACBr.Net.Core.1.0.1.3\lib\net40\ACBr.Net.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ACBr.Net.DFe.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d3bb9130f8b775a6, processorArchitecture=MSIL">
<HintPath>..\packages\ACBr.Net.DFe.Core.1.0.1.5-rc1\lib\net40\ACBr.Net.DFe.Core.dll</HintPath>
<HintPath>..\packages\ACBr.Net.DFe.Core.1.0.1.5\lib\net40\ACBr.Net.DFe.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
Expand Down
5 changes: 2 additions & 3 deletions src/ACBr.Net.Sat.Demo/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ACBr.Net.Core" version="1.0.1.3-rc1" targetFramework="net40" />
<package id="ACBr.Net.DFe.Core" version="1.0.1.5-rc1" targetFramework="net40" />
<package id="ACBr.Net.Sat" version="1.0.1.0" targetFramework="net40" />
<package id="ACBr.Net.Core" version="1.0.1.3" targetFramework="net40" />
<package id="ACBr.Net.DFe.Core" version="1.0.1.5" targetFramework="net40" />
<package id="NLog" version="4.3.9" targetFramework="net40" />
<package id="NLog.Windows.Forms" version="4.2.3" targetFramework="net40" />
</packages>
4 changes: 2 additions & 2 deletions src/ACBr.Net.Sat/ACBr.Net.Sat.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ACBr.Net.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d3bb9130f8b775a6, processorArchitecture=MSIL">
<HintPath>..\packages\ACBr.Net.Core.1.0.1.3-rc1\lib\net40\ACBr.Net.Core.dll</HintPath>
<HintPath>..\packages\ACBr.Net.Core.1.0.1.3\lib\net40\ACBr.Net.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ACBr.Net.DFe.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d3bb9130f8b775a6, processorArchitecture=MSIL">
<HintPath>..\packages\ACBr.Net.DFe.Core.1.0.1.5-rc1\lib\net40\ACBr.Net.DFe.Core.dll</HintPath>
<HintPath>..\packages\ACBr.Net.DFe.Core.1.0.1.5\lib\net40\ACBr.Net.DFe.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ExtraConstraints, Version=1.10.9.0, Culture=neutral, PublicKeyToken=8b9afd7f380a7d64, processorArchitecture=MSIL">
Expand Down
19 changes: 12 additions & 7 deletions src/ACBr.Net.Sat/CFeDetCollection.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace ACBr.Net.Sat
/// <seealso>
/// <cref>ACBr.Net.DFe.Core.Collection.DFeCollection{ACBr.Net.Sat.CFeDet}</cref>
/// </seealso>
public sealed class CFeDetCollection : DFeCollection<CFeDet>, IEnumerable<CFeDet>
public sealed class CFeDetCollection : DFeCollection<CFeDet>
{
#region Fields

Expand Down Expand Up @@ -91,7 +91,7 @@ internal CFe Parent
set
{
parent = value;
foreach (var cFeDet in List)
foreach (var cFeDet in this)
cFeDet.Parent = value;
}
}
Expand All @@ -107,20 +107,25 @@ internal CFe Parent
public override CFeDet AddNew()
{
var ret = new CFeDet(Parent);
List.Add(ret);
base.Add(ret);
return ret;
}

/// <summary>
/// Adds the range.
/// </summary>
/// <param name="item">The item.</param>
public override void Add(CFeDet item)
{
item.Parent = Parent;
base.Add(item);
}

public override void AddRange(IEnumerable<CFeDet> itens)
{
foreach (var item in itens)
{
item.Parent = Parent;
base.Add(item);
}
}

#endregion Methods
}
}
6 changes: 3 additions & 3 deletions src/ACBr.Net.Sat/CFeDetProd.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -56,7 +56,7 @@ public sealed class CFeDetProd
/// </summary>
public CFeDetProd()
{
ObsFiscoDet = new List<ProdObsFisco>();
ObsFiscoDet = new DFeCollection<ProdObsFisco>();
EhCombustivel = false;
}

Expand Down Expand Up @@ -213,7 +213,7 @@ public bool EhCombustivel
/// </summary>
/// <value>The obs fisco det.</value>
[DFeElement("obsFiscoDet", Id = "I18", Min = 0, Max = 500, Ocorrencias = 0)]
public List<ProdObsFisco> ObsFiscoDet { get; set; }
public DFeCollection<ProdObsFisco> ObsFiscoDet { get; set; }

#endregion Propriedades

Expand Down
6 changes: 3 additions & 3 deletions src/ACBr.Net.Sat/CFeInfAdic.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -50,7 +50,7 @@ public sealed class CFeInfAdic
/// </summary>
public CFeInfAdic()
{
ObsFisco = new List<CFeObsFisco>();
ObsFisco = new DFeCollection<CFeObsFisco>();
}

#endregion Constructors
Expand All @@ -70,7 +70,7 @@ public CFeInfAdic()
/// <value>The obs fisco.</value>
[Browsable(true)]
[DFeElement("obsFisco", Id = "Z03", Min = 0, Max = 10, Ocorrencias = 0)]
public List<CFeObsFisco> ObsFisco { get; set; }
public DFeCollection<CFeObsFisco> ObsFisco { get; set; }

#endregion Propriedades
}
Expand Down
24 changes: 12 additions & 12 deletions src/ACBr.Net.Sat/CFePgto.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
// </copyright>
// <summary></summary>
Expand Down
5 changes: 4 additions & 1 deletion src/ACBr.Net.Sat/InfCFe.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ public CFeDetCollection Det
set
{
det = value;
det.Parent = parent;
if (det.Parent != parent)
{
det.Parent = parent;
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/ACBr.Net.Sat/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ACBr.Net.Core" version="1.0.1.3-rc1" targetFramework="net40" />
<package id="ACBr.Net.DFe.Core" version="1.0.1.5-rc1" targetFramework="net40" />
<package id="ACBr.Net.Core" version="1.0.1.3" targetFramework="net40" />
<package id="ACBr.Net.DFe.Core" version="1.0.1.5" targetFramework="net40" />
<package id="ExtraConstraints.Fody" version="1.10.9" targetFramework="net40" developmentDependency="true" />
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
<package id="Obsolete.Fody" version="4.1.0" targetFramework="net40" developmentDependency="true" />
Expand Down

0 comments on commit 235f00b

Please sign in to comment.