Merge pull request #1 from thiagosoeiro/master

- fix duplicate assembly no net standard (https://bartwullems.blogspo…
Tagliatti · Jul 16, 2018 · a0db858 · a0db858
2 parents 5c6a271 + fb788e4
commit a0db858
Show file tree

Hide file tree

Showing 5 changed files with 831 additions and 848 deletions.
diff --git a/BoletoNetCore.Testes/Utils.cs b/BoletoNetCore.Testes/Utils.cs
@@ -205,7 +205,7 @@ internal static void TestarHomologacao(IBanco banco, TipoArquivo tipoArquivo, st
                             html.Append(boletoParaImpressao.MontaHtml());
                             html.Append("</div>");
                         }
-                        var pdf = new HtmlToPdfConverter().GeneratePdf(html.ToString());
+                        var pdf = new HtmlToPdfConverter().GeneratePdf(html.ToString()); //Licença comercial necessária para versão NET Core
                         using (var fs = new FileStream(nomeArquivoPDF, FileMode.Create))
                             fs.Write(pdf, 0, pdf.Length);
                         if (!File.Exists(nomeArquivoPDF))

diff --git a/BoletoNetCore/BoletoImpressao/BoletoBancario.cs b/BoletoNetCore/BoletoImpressao/BoletoBancario.cs
@@ -623,16 +623,23 @@ public string MontaHtml(string fileName, string logoCedente)
             var fnBarra = fileName + @"BoletoNetBarra.gif";
             if (!File.Exists(fnBarra))
             {
-                var imgConverter = new ImageConverter();
-                var imgBuffer = (byte[])imgConverter.ConvertTo(Html.barra, typeof(byte[]));
-                var ms = new MemoryStream(imgBuffer);
-
-                using (Stream stream = File.Create(fnBarra))
+                var streamBarra = Assembly.GetExecutingAssembly().GetManifestResourceStream("BoletoNetCore.Imagens.barra.gif");
+                using (Stream file = File.Create(fnBarra))
                 {
-                    CopiarStream(ms, stream);
-                    ms.Flush();
-                    ms.Dispose();
+                    CopiarStream(streamBarra, file);
                 }
+                /*Trecho de código abaixo não funciona em .NET Core devido a incompatibilidades de conversão/serialização.
+                 Vide: https://github.com/dotnet/coreclr/blob/0fbd855e38bc3ec269479b5f6bf561dcfd67cbb6/src/System.Private.CoreLib/src/System/Resources/ResourceReader.cs             
+                */
+                //var imgConverter = new ImageConverter();
+                //var imgBuffer = (byte[])imgConverter.ConvertTo(Html.barra, typeof(byte[]));
+                //var ms = new MemoryStream(imgBuffer);
+                //using (Stream stream = File.Create(fnBarra))
+                //{
+                //    CopiarStream(ms, stream);
+                //    ms.Flush();
+                //    ms.Dispose();
+                //}
             }
 
             var fnCodigoBarras = Path.GetTempFileName();

diff --git a/BoletoNetCore/BoletoNetCore.csproj b/BoletoNetCore/BoletoNetCore.csproj
@@ -11,4 +11,20 @@
     <PackageReference Include="CoreCompat.System.Drawing.v2" Version="5.2.0-preview1-r131" />
     <PackageReference Include="NReco.PdfGenerator.LT" Version="1.1.15" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Html.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Html.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Html.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Html.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>