Skip to content

Commit 3ad4ee1

Browse files
Valmir-CunhaValmir-Cunha
authored
Merge pull request #1641 from andreptcosta/master
Suporte ao netstandard 2.0 nos pacotes Zeus.Net.NFe.Danfe.PdfClown e Zeus.Net.NFe.Danfe.QuestPdf
2 parents 4980da0 + 451f473 commit 3ad4ee1

7 files changed

Lines changed: 40 additions & 34 deletions

File tree

‎NFe.Danfe.PdfClown/NFe.Danfe.PdfClown.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>latest</LangVersion>

‎NFe.Danfe.QuestPdf/ImpressaoEventoNfe/EventoNfeDocument.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using System.Text;
2-
using System.Text.RegularExpressions;
3-
using BarcodeStandard;
1+
using BarcodeStandard;
42
using DFe.Utils;
53
using NFe.Classes;
64
using NFe.Classes.Servicos.Consulta;
75
using QuestPDF.Fluent;
86
using QuestPDF.Helpers;
97
using QuestPDF.Infrastructure;
8+
using System.Text;
9+
using System.Text.RegularExpressions;
1010

1111
namespace NFe.Danfe.QuestPdf.ImpressaoEventoNfe;
1212

@@ -651,4 +651,6 @@ private void CarregarXmlCce(string xmlCce)
651651
"Ei! Verifique se seu xml da Carta Correção não está correto, pois identificamos uma falha ao tentar carregar ele.");
652652
}
653653
}
654+
655+
DocumentSettings IDocument.GetSettings() => DocumentSettings.Default;
654656
}

‎NFe.Danfe.QuestPdf/ImpressaoNfce/DanfeNfceDocument.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System.Text;
2-
using DFe.Classes.Flags;
1+
using DFe.Classes.Flags;
32
using DFe.Utils;
43
using NFe.Classes;
54
using NFe.Classes.Informacoes.Destinatario;
@@ -11,6 +10,7 @@
1110
using QuestPDF.Infrastructure;
1211
using SkiaSharp;
1312
using SkiaSharp.QrCode.Image;
13+
using System.Text;
1414

1515
namespace NFe.Danfe.QuestPdf.ImpressaoNfce;
1616

@@ -50,6 +50,7 @@ public void TamanhoImpressao(TamanhoImpressao tamanhoImpressao)
5050
}
5151

5252
public DocumentMetadata GetMetadata() => DocumentMetadata.Default;
53+
DocumentSettings IDocument.GetSettings() => DocumentSettings.Default;
5354

5455
public void Compose(IDocumentContainer container)
5556
{

‎NFe.Danfe.QuestPdf/Models/PeriodoModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
public class PeriodoModel
44
{
5-
public DateOnly DataInicial { get; set; }
6-
public DateOnly DataFinal { get; set; }
5+
public DateTime DataInicial { get; set; }
6+
public DateTime DataFinal { get; set; }
77
}

‎NFe.Danfe.QuestPdf/NFe.Danfe.QuestPdf.csproj‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<PackageId>Zeus.Net.NFe.Danfe.QuestPdf</PackageId>
8-
<Title>Zeus.Net.NFe.Danfe.QuestPdf</Title>
9-
<Authors>ZeusAutomacao</Authors>
10-
<Company>Zeus Automacao</Company>
11-
<Description>Biblioteca para geração de DANFE em PDF usando QuestPDF.</Description>
12-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
<LangVersion>latest</LangVersion>
8+
<PackageId>Zeus.Net.NFe.Danfe.QuestPdf</PackageId>
9+
<Title>Zeus.Net.NFe.Danfe.QuestPdf</Title>
10+
<Authors>ZeusAutomacao</Authors>
11+
<Company>Zeus Automacao</Company>
12+
<Description>Biblioteca para geração de DANFE em PDF usando QuestPDF.</Description>
13+
</PropertyGroup>
1314

14-
<ItemGroup>
15-
<None Remove="Fontes\Arial.ttf" />
16-
</ItemGroup>
15+
<ItemGroup>
16+
<None Remove="Fontes\Arial.ttf" />
17+
</ItemGroup>
1718

18-
<ItemGroup>
19-
<EmbeddedResource Include="Fontes\Arial.ttf">
20-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
21-
</EmbeddedResource>
22-
</ItemGroup>
19+
<ItemGroup>
20+
<EmbeddedResource Include="Fontes\Arial.ttf">
21+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
22+
</EmbeddedResource>
23+
</ItemGroup>
2324

24-
<ItemGroup>
25-
<PackageReference Include="BarcodeLib" Version="3.1.4" />
26-
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.2" />
27-
<PackageReference Include="QuestPDF" Version="2024.7.3" />
28-
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
29-
<PackageReference Include="SkiaSharp.QrCode" Version="0.7.0" />
30-
<PackageReference Include="Zeus.Net.NFe.NFCe" Version="2025.3.28.1516" />
31-
</ItemGroup>
25+
<ItemGroup>
26+
<PackageReference Include="BarcodeLib" Version="3.1.4" />
27+
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.2" />
28+
<PackageReference Include="QuestPDF" Version="2024.7.3" />
29+
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
30+
<PackageReference Include="SkiaSharp.QrCode" Version="0.7.0" />
31+
<PackageReference Include="Zeus.Net.NFe.NFCe" Version="2025.3.28.1516" />
32+
</ItemGroup>
3233

3334
</Project>

‎NFe.Danfe.QuestPdf/ParaContadores/RelatorioFiscalEmissoesNfceDocument.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public RelatorioFiscalEmissoesNfceDocument(RelatorioFiscalEmissoesNfceModel mode
1616
}
1717

1818
public DocumentMetadata GetMetadata() => DocumentMetadata.Default;
19+
DocumentSettings IDocument.GetSettings() => DocumentSettings.Default;
1920

2021
public void Compose(IDocumentContainer container)
2122
{

‎NFe.Danfe.QuestPdf/ParaContadores/RelatorioFiscalEmissoesNfeDocument.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public RelatorioFiscalEmissoesNfeDocument(RelatorioFiscalEmissoesNfeModel model)
1616
}
1717

1818
public DocumentMetadata GetMetadata() => DocumentMetadata.Default;
19+
DocumentSettings IDocument.GetSettings() => DocumentSettings.Default;
1920

2021
public void Compose(IDocumentContainer container)
2122
{

0 commit comments

Comments
 (0)