Skip to content

Commit 26347b4

Browse files
author
vderyushev
committed
Merge branch 'ReleasePreparation'
# Conflicts: # Examples/ApiExamples/ApiExamples.Xamarin/Runner.iOS/Runner.iOS.csproj # Examples/ApiExamples/ApiExamples/ApiExamples.csproj # Examples/DocsExamples/Docker/Docker.csproj # Examples/DocsExamples/DocsExamples/DocsExamples.csproj # Examples/DocsExamples/DocumentExplorer/DocumentExplorer.csproj
2 parents 66e1ecf + ba8ab23 commit 26347b4

8 files changed

Lines changed: 85 additions & 84 deletions

File tree

Examples/ApiExamples/ApiExamples.Xamarin/Runner.iOS/Runner.iOS.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@
114114
</ItemGroup>
115115
<ItemGroup>
116116
<PackageReference Include="Aspose.Words">
117-
<Version>22.10.0</Version>
117+
<Version>22.11.0</Version>
118118
</PackageReference>
119119
<PackageReference Include="Aspose.Words.Shaping.HarfBuzz">
120-
<Version>22.10.0</Version>
120+
<Version>22.11.0</Version>
121121
</PackageReference>
122122
<PackageReference Include="NETStandard.Library">
123123
<Version>2.0.3</Version>

Examples/ApiExamples/ApiExamples/ApiExamples.csproj

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,17 +155,17 @@
155155
</ItemGroup>
156156

157157
<ItemGroup>
158-
<PackageReference Include="Aspose.BarCode" Version="22.9.0" />
159-
<PackageReference Include="Aspose.PDF" Version="22.9.0" />
160-
<PackageReference Include="Aspose.Words" Version="22.10.0" />
161-
<PackageReference Include="Aspose.Words.Shaping.HarfBuzz" Version="22.10.0" />
162-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
158+
<PackageReference Include="Aspose.BarCode" Version="22.10.0" />
159+
<PackageReference Include="Aspose.PDF" Version="22.10.0" />
160+
<PackageReference Include="Aspose.Words" Version="22.11.0" />
161+
<PackageReference Include="Aspose.Words.Shaping.HarfBuzz" Version="22.11.0" />
162+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
163163
<PackageReference Include="NUnit" Version="3.13.3" />
164-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
164+
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0">
165165
<PrivateAssets>all</PrivateAssets>
166166
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
167167
</PackageReference>
168-
<PackageReference Include="System.Data.OleDb" Version="6.0.0" />
168+
<PackageReference Include="System.Data.OleDb" Version="7.0.0" />
169169
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
170170
</ItemGroup>
171171

@@ -175,6 +175,7 @@
175175
</Reference>
176176
<Reference Include="System.IO.Compression" Condition="'$(TargetFramework)' == 'net462'" />
177177
<Reference Include="System.IO.Compression" />
178+
<Reference Include="System.Net.Http" />
178179
<Reference Include="System.Runtime.InteropServices.RuntimeInformation">
179180
<HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.1.0\ref\netcoreapp2.1\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
180181
</Reference>

Examples/ApiExamples/ApiExamples/ExDocumentBase.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,14 @@ public void BackgroundShape()
173173

174174
Assert.IsTrue(doc.BackgroundShape.HasImage);
175175

176+
Aspose.Words.Saving.PdfSaveOptions saveOptions = new Aspose.Words.Saving.PdfSaveOptions
177+
{
178+
CacheBackgroundGraphics = false
179+
};
180+
176181
// Microsoft Word does not support shapes with images as backgrounds,
177182
// but we can still see these backgrounds in other save formats such as .pdf.
178-
doc.Save(ArtifactsDir + "DocumentBase.BackgroundShape.Image.pdf");
183+
doc.Save(ArtifactsDir + "DocumentBase.BackgroundShape.Image.pdf", saveOptions);
179184
//ExEnd
180185

181186
doc = new Document(ArtifactsDir + "DocumentBase.BackgroundShape.FlatColor.docx");

Examples/ApiExamples/ApiExamples/ExDocumentBuilder.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
using Aspose.Words.Notes;
2727
using Aspose.Words.Saving;
2828
using List = NUnit.Framework.List;
29+
using System.Net.Http;
2930

3031
#if NET5_0_OR_GREATER || __MOBILE__
3132
using SkiaSharp;
@@ -2919,7 +2920,7 @@ public void InsertOleObjects()
29192920
// This time, it will have an image downloaded from the web for an icon.
29202921
using (Stream powerpointStream = File.Open(MyDir + "Presentation.pptx", FileMode.Open))
29212922
{
2922-
using (WebClient webClient = new WebClient())
2923+
using (HttpClient httpClient = new HttpClient())
29232924
{
29242925
byte[] imgBytes = File.ReadAllBytes(ImageDir + "Logo.jpg");
29252926

0 commit comments

Comments
 (0)