Skip to content

Commit

Permalink
Merge branch 'ReleasePreparation' into update_tests_for_porting
Browse files Browse the repository at this point in the history
  • Loading branch information
KotovDE authored Aug 27, 2024
2 parents df1fad6 + b97fb52 commit a580670
Show file tree
Hide file tree
Showing 9 changed files with 373 additions and 323 deletions.
6 changes: 3 additions & 3 deletions Examples/ApiExamples/ApiExamples/ApiExamples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspose.BarCode" Version="24.6.0" />
<PackageReference Include="Aspose.Page" Version="24.6.1" />
<PackageReference Include="Aspose.PDF" Version="24.6.0" />
<PackageReference Include="Aspose.BarCode" Version="24.7.0" />
<PackageReference Include="Aspose.Page" Version="24.7.0" />
<PackageReference Include="Aspose.PDF" Version="24.7.0" />
<PackageReference Include="Aspose.Words" Version="24.8.0" />
<PackageReference Include="Aspose.Words.Shaping.HarfBuzz" Version="24.8.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
Expand Down
8 changes: 5 additions & 3 deletions Examples/ApiExamples/ApiExamples/ExXpsSaveOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,11 @@ public void XpsDigitalSignature()
Document doc = new Document(MyDir + "Document.docx");

CertificateHolder certificateHolder = CertificateHolder.Create(MyDir + "morzal.pfx", "aw");
DigitalSignatureDetails digitalSignatureDetails = new DigitalSignatureDetails(
certificateHolder,
new SignOptions() { Comments = "Some comments", SignTime = DateTime.Now });
SignOptions options = new SignOptions();
options.SignTime = DateTime.Now;
options.Comments = "Some comments";

DigitalSignatureDetails digitalSignatureDetails = new DigitalSignatureDetails(certificateHolder, options);

XpsSaveOptions saveOptions = new XpsSaveOptions();
saveOptions.DigitalSignatureDetails = digitalSignatureDetails;
Expand Down
14 changes: 7 additions & 7 deletions Examples/ApiExamples/Runner.MAUI/Runner.MAUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,20 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspose.Page" Version="24.3.3" />
<PackageReference Include="Aspose.PDF" Version="24.3.0" />
<PackageReference Include="Aspose.Words" Version="24.4.0" />
<PackageReference Include="Aspose.Words.Shaping.HarfBuzz" Version="24.4.0" />
<PackageReference Include="Aspose.Page" Version="24.7.0" />
<PackageReference Include="Aspose.PDF" Version="24.7.0" />
<PackageReference Include="Aspose.Words" Version="24.8.0" />
<PackageReference Include="Aspose.Words.Shaping.HarfBuzz" Version="24.8.0" />
<PackageReference Include="Shiny.Xunit.Runners.Maui" Version="1.0.0" />
<PackageReference Include="SkiaSharp" Version="2.88.7" />
<PackageReference Include="SkiaSharp" Version="2.88.8" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.Maui.Controls" Version="8.0.14" />
<PackageReference Update="Microsoft.Maui.Controls" Version="8.0.80" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.14" />
<PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.80" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Examples/DocsExamples/Docker/Docker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspose.Words" Version="24.4.0" />
<PackageReference Include="Aspose.Words" Version="24.8.0" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions Examples/DocsExamples/DocsExamples/DocsExamples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspose.BarCode" Version="24.3.0" />
<PackageReference Include="Aspose.Email" Version="24.3.0" />
<PackageReference Include="Aspose.Words" Version="24.5.0" />
<PackageReference Include="Aspose.Words.Shaping.HarfBuzz" Version="24.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Aspose.BarCode" Version="24.7.0" />
<PackageReference Include="Aspose.Email" Version="24.7.0" />
<PackageReference Include="Aspose.Words" Version="24.8.0" />
<PackageReference Include="Aspose.Words.Shaping.HarfBuzz" Version="24.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="System.Data.OleDb" Version="8.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ public void UseIfElseMustache()
//ExStart:UseIfElseMustache
//GistId:544788f602e697802e313a641cedb9b8
Document doc = new Document(MyDir + "Mail merge destinations - Mustache syntax.docx");
doc.Sections.Clear();
doc.Save(ArtifactsDir + "output.docx");

doc.MailMerge.UseNonMergeFields = true;
doc.MailMerge.Execute(new[] { "GENDER" }, new object[] { "MALE" });
Expand Down
Loading

0 comments on commit a580670

Please sign in to comment.