[+] Removido a dependencia com o ACBrIntegrador, pois já possivel se …

…comunicar de forma direta com o MFe. [*] Atualizado as dependencias.
ACBrNet · Aug 13, 2020 · 3f1c21f · 3f1c21f
1 parent 081f706
commit 3f1c21f
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 358 deletions.
diff --git a/src/ACBr.Net.Sat.Demo/ACBr.Net.Sat.Demo.csproj b/src/ACBr.Net.Sat.Demo/ACBr.Net.Sat.Demo.csproj
@@ -107,13 +107,13 @@
       <Version>1.2.4.1</Version>
     </PackageReference>
     <PackageReference Include="ACBr.Net.DFe.Core">
-      <Version>1.2.7.1</Version>
+      <Version>1.2.8</Version>
     </PackageReference>
     <PackageReference Include="ACBr.Net.Integrador">
       <Version>1.2.0.6</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>4.6.8</Version>
+      <Version>4.7.3</Version>
     </PackageReference>
     <PackageReference Include="NLog.Windows.Forms">
       <Version>4.3.0</Version>

diff --git a/src/ACBr.Net.Sat.sln b/src/ACBr.Net.Sat.sln
@@ -8,9 +8,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ACBr.Net.Sat.Demo", "ACBr.Net.Sat.Demo\ACBr.Net.Sat.Demo.csproj", "{D0D31D3B-C7D4-45F3-B09F-618FF56A48B8}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		ACBr.Net.Sat.Shared\ACBr.Net.Sat.Shared.projitems*{ee443d74-27e7-4236-851e-5e31a8ab8e63}*SharedItemsImports = 4
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU

diff --git a/src/ACBr.Net.Sat/ACBr.Net.Sat.csproj b/src/ACBr.Net.Sat/ACBr.Net.Sat.csproj
@@ -13,15 +13,18 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageIconUrl>https://avatars2.githubusercontent.com/u/7342977?v=3&amp;amp;s=200</PackageIconUrl>
     <RepositoryUrl>https://github.com/ACBrNet/ACBr.Net.Sat</RepositoryUrl>
-    <RepositoryType>Github</RepositoryType>
+    <RepositoryType>git</RepositoryType>
     <PackageTags>ACBr ACBr.Net SAT CF-e-SAT Automação Comercial</PackageTags>
     <Description>Biblioteca para utilização do SAT/MFe</Description>
     <NeutralLanguage>pt-BR</NeutralLanguage>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <AssemblyVersion>1.2.7.1</AssemblyVersion>
-    <FileVersion>1.2.7.1</FileVersion>
-    <Version>1.2.7.1</Version>
-    <DelaySign>false</DelaySign>
+    <AssemblyVersion>1.2.8.0</AssemblyVersion>
+    <FileVersion>1.2.8.0</FileVersion>
+    <Version>1.2.8.0</Version>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
@@ -54,16 +57,19 @@
 
   <ItemGroup>
     <PackageReference Include="ACBr.Net.Core" Version="1.2.4.1" />
-    <PackageReference Include="ACBr.Net.DFe.Core" Version="1.2.7.1" />
-    <PackageReference Include="ACBr.Net.Integrador" Version="1.2.0.6" />
+    <PackageReference Include="ACBr.Net.DFe.Core" Version="1.2.8" />
     <PackageReference Include="ExtraConstraints.Fody" Version="1.14.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Fody" Version="6.1.1">
+    <PackageReference Include="Fody" Version="6.2.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="PropertyChanged.Fody" Version="3.2.6">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="PropertyChanged.Fody" Version="3.2.8">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/src/ACBr.Net.Sat/ACBrSat.cs b/src/ACBr.Net.Sat/ACBrSat.cs
@@ -41,7 +41,6 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using ACBr.Net.Integrador;
 
 namespace ACBr.Net.Sat
 {
@@ -67,7 +66,6 @@ public sealed class ACBrSat : ACBrComponent, IACBrLog
         private string codigoAtivacao;
         private ExtratoSat extrato;
         private bool aguardandoResposta;
-        private ACBrIntegrador integradorFiscal;
 
         #endregion Fields
 
@@ -169,28 +167,6 @@ public Encoding Encoding
             }
         }
 
-        /// <summary>
-        /// Componente para comunicação com o Integrador Fiscal do Ceará.
-        /// </summary>
-        /// <value>O Integrador.</value>
-        [DefaultValue(null)]
-        [Category("Componentes ACBr.Net")]
-        [TypeConverter(typeof(ReferenceConverter))]
-        public ACBrIntegrador IntegradorFiscal
-        {
-            get => integradorFiscal;
-            set
-            {
-                if (integradorFiscal != null)
-                    integradorFiscal.OnGetNumeroSessao -= IntegradorFiscalOnOnGetNumeroSessao;
-
-                integradorFiscal = value;
-
-                if (integradorFiscal != null)
-                    integradorFiscal.OnGetNumeroSessao += IntegradorFiscalOnOnGetNumeroSessao;
-            }
-        }
-
         /// <summary>
         /// Define/retorna a classe responsável por imprimir o Extrato do Sat.
         /// </summary>
@@ -318,8 +294,6 @@ public string PathDll
         /// <exception cref="NotImplementedException"></exception>
         public void Ativar()
         {
-            Guard.Against<ArgumentNullException>(Modelo == ModeloSat.MFeIntegrador && IntegradorFiscal == null, "Integrador fiscal não disponivel.");
-
             satLibrary = SatManager.GetLibrary(Modelo, Configuracoes, PathDll, Encoding);
             Ativo = true;
         }
@@ -900,11 +874,6 @@ private void GerarNumeroSessao()
             Sessao = e.Sessao;
         }
 
-        private void IntegradorFiscalOnOnGetNumeroSessao(object sender, Integrador.Events.NumeroSessaoEventArgs e)
-        {
-            e.Sessao = Sessao;
-        }
-
         #endregion Private
 
         #region Override

diff --git a/src/ACBr.Net.Sat/ModeloSat.cs b/src/ACBr.Net.Sat/ModeloSat.cs
@@ -29,8 +29,6 @@
 // <summary></summary>
 // ***********************************************************************
 
-using System;
-
 namespace ACBr.Net.Sat
 {
     /// <summary>
@@ -40,9 +38,6 @@ public enum ModeloSat
     {
         Cdecl,
 
-        StdCall,
-
-        [Obsolete("Será removido pois agora é possivel se comunicar com o MFe usando a dll apenas")]
-        MFeIntegrador
+        StdCall
     }
 }