Skip to content

Commit 9fe161c

Browse files
vladimir-litvinchikvladimir-litvinchik
committed
Updated GroupDocs.Total to 24.8
1 parent fc815f7 commit 9fe161c

File tree

10 files changed

+75
-50
lines changed

10 files changed

+75
-50
lines changed

‎Demos/MVC/src/GroupDocs.Total.MVC.csproj

+30-6
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,23 @@
4949
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5050
<HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
5151
</Reference>
52-
<Reference Include="GroupDocs.Total, Version=24.5.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
53-
<HintPath>..\packages\GroupDocs.Total.NETFramework.24.5.0\lib\net461\GroupDocs.Total.dll</HintPath>
54-
<Private>True</Private>
52+
<Reference Include="GroupDocs.Total, Version=24.8.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
53+
<HintPath>..\packages\GroupDocs.Total.NETFramework.24.8.0\lib\net462\GroupDocs.Total.dll</HintPath>
5554
</Reference>
5655
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
5756
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
5857
</Reference>
5958
<Reference Include="Microsoft.CSharp">
6059
<Private>True</Private>
6160
</Reference>
61+
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
62+
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
63+
</Reference>
6264
<Reference Include="Moq, Version=4.10.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
6365
<HintPath>..\packages\Moq.4.10.1\lib\net45\Moq.dll</HintPath>
6466
</Reference>
6567
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
68+
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
6769
</Reference>
6870
<Reference Include="System">
6971
<Private>True</Private>
@@ -82,9 +84,17 @@
8284
<Private>True</Private>
8385
</Reference>
8486
<Reference Include="System.Data.DataSetExtensions" />
87+
<Reference Include="System.Data.OracleClient" />
88+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
89+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
90+
</Reference>
91+
<Reference Include="System.DirectoryServices" />
8592
<Reference Include="System.Drawing">
8693
<Private>True</Private>
8794
</Reference>
95+
<Reference Include="System.Drawing.Common, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
96+
<HintPath>..\packages\System.Drawing.Common.6.0.0\lib\net461\System.Drawing.Common.dll</HintPath>
97+
</Reference>
8898
<Reference Include="System.IO.Compression">
8999
<Private>True</Private>
90100
</Reference>
@@ -94,6 +104,7 @@
94104
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
95105
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
96106
</Reference>
107+
<Reference Include="System.Net" />
97108
<Reference Include="System.Net.Http.Formatting, Version=5.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98109
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.5\lib\net45\System.Net.Http.Formatting.dll</HintPath>
99110
</Reference>
@@ -110,8 +121,19 @@
110121
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
111122
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
112123
</Reference>
113-
<Reference Include="System.Text.Encoding.CodePages, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
114-
<HintPath>..\packages\System.Text.Encoding.CodePages.7.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
124+
<Reference Include="System.Security" />
125+
<Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
126+
<HintPath>..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
127+
</Reference>
128+
<Reference Include="System.Security.Permissions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
129+
<HintPath>..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll</HintPath>
130+
</Reference>
131+
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
132+
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
133+
</Reference>
134+
<Reference Include="System.ServiceProcess" />
135+
<Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
136+
<HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
115137
</Reference>
116138
<Reference Include="System.Text.Encodings.Web, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
117139
<HintPath>..\packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
@@ -122,6 +144,7 @@
122144
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
123145
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
124146
</Reference>
147+
<Reference Include="System.Transactions" />
125148
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
126149
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
127150
</Reference>
@@ -210,6 +233,7 @@
210233
<Private>True</Private>
211234
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
212235
</Reference>
236+
<Reference Include="WindowsBase" />
213237
<Reference Include="YamlDotNet, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
214238
<HintPath>..\packages\YamlDotNet.5.2.1\lib\net45\YamlDotNet.dll</HintPath>
215239
</Reference>

‎Demos/MVC/src/Products/Signature/Controllers/SignatureApiController.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,8 @@ public HttpResponseMessage LoadDocumentDescription(SignaturePostedDataEntity pos
206206
static MemoryStream RenderPageToMemoryStream(GroupDocs.Signature.Signature signature, int pageNumberToRender)
207207
{
208208
_pagePreviewStream = null;
209-
GroupDocs.Signature.Options.PreviewOptions previewOptions = new GroupDocs.Signature.Options.PreviewOptions(CreatePageStream, ReleasePageStream)
209+
GroupDocs.Signature.Options.PreviewOptions previewOptions =
210+
new GroupDocs.Signature.Options.PreviewOptions(CreatePageStream, ReleasePageStream)
210211
{
211212
PreviewFormat = PreviewOptions.PreviewFormats.PNG,
212213
PageNumbers = new[] { pageNumberToRender }
@@ -216,18 +217,17 @@ static MemoryStream RenderPageToMemoryStream(GroupDocs.Signature.Signature signa
216217
return _pagePreviewStream;
217218
}
218219

219-
private static Stream CreatePageStream(int pageNumber)
220+
private static Stream CreatePageStream(PreviewPageData pageData)
220221
{
221222
_pagePreviewStream = new MemoryStream();
222223
return _pagePreviewStream;
223224
}
224225

225-
private static void ReleasePageStream(int pageNumber, Stream pageStream)
226+
private static void ReleasePageStream(PreviewPageData pageData, Stream pageStream)
226227
{
227228
pageStream.Dispose();
228229
}
229230

230-
231231
/// <summary>
232232
/// Load document page
233233
/// </summary>

‎Demos/MVC/src/Products/Signature/Signer/BarCodeSigner.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public override SignOptions SignSlides()
7474

7575
private static void SetOptions(BarcodeSignOptions signOptions)
7676
{
77-
signOptions.EncodeType = BarcodeTypes.Code39Standard;
77+
signOptions.EncodeType = BarcodeTypes.Code39;
7878
signOptions.HorizontalAlignment = SignatureData.getHorizontalAlignment();
7979
signOptions.VerticalAlignment = SignatureData.getVerticalAlignment();
8080
signOptions.Width = Convert.ToInt32(SignatureData.ImageWidth);

‎Demos/MVC/src/Web.config

+4
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@
130130
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
131131
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
132132
</dependentAssembly>
133+
<dependentAssembly>
134+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
135+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
136+
</dependentAssembly>
133137
</assemblyBinding>
134138
</runtime>
135139
</configuration>

‎Demos/MVC/src/packages.config

+9-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
44
<package id="Castle.Core" version="4.3.1" targetFramework="net45" />
5-
<package id="GroupDocs.Total.NETFramework" version="24.5.0" targetFramework="net48" />
5+
<package id="GroupDocs.Total.NETFramework" version="24.8.0" targetFramework="net48" />
66
<package id="Microsoft.AspNet.Cors" version="5.2.7" targetFramework="net45" />
77
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
88
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
@@ -15,21 +15,27 @@
1515
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" />
1616
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
1717
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net48" />
18+
<package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net48" />
1819
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1920
<package id="Moq" version="4.10.1" targetFramework="net45" />
2021
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net45" developmentDependency="true" />
21-
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
22+
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
2223
<package id="Node-Kit" version="11.1.0.1" targetFramework="net45" />
2324
<package id="Respond" version="1.2.0" targetFramework="net45" />
2425
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
2526
<package id="System.Collections.Immutable" version="7.0.0" targetFramework="net48" />
27+
<package id="System.Diagnostics.DiagnosticSource" version="7.0.0" targetFramework="net48" />
28+
<package id="System.Drawing.Common" version="6.0.0" targetFramework="net48" />
2629
<package id="System.IO.Compression" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
2730
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
2831
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
2932
<package id="System.Reflection.Metadata" version="7.0.0" targetFramework="net48" />
3033
<package id="System.Reflection.MetadataLoadContext" version="7.0.0" targetFramework="net48" />
3134
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
32-
<package id="System.Text.Encoding.CodePages" version="7.0.0" targetFramework="net48" />
35+
<package id="System.Security.AccessControl" version="6.0.0" targetFramework="net48" />
36+
<package id="System.Security.Permissions" version="8.0.0" targetFramework="net48" />
37+
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
38+
<package id="System.Text.Encoding.CodePages" version="8.0.0" targetFramework="net48" />
3339
<package id="System.Text.Encodings.Web" version="6.0.0" targetFramework="net48" />
3440
<package id="System.Text.Json" version="6.0.0" targetFramework="net48" />
3541
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />

‎Demos/WebForms/src/GroupDocs.Total.WebForms.csproj

+7-6
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<WarningLevel>4</WarningLevel>
4848
</PropertyGroup>
4949
<ItemGroup>
50-
<Reference Include="GroupDocs.Total, Version=24.5.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
51-
<HintPath>..\packages\GroupDocs.Total.24.5.0\lib\netstandard2.0\GroupDocs.Total.dll</HintPath>
50+
<Reference Include="GroupDocs.Total, Version=24.8.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
51+
<HintPath>..\packages\GroupDocs.Total.NETFramework.24.8.0\lib\net462\GroupDocs.Total.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
5454
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -92,6 +92,7 @@
9292
<Reference Include="System.Diagnostics.PerformanceCounter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
9393
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.4.5.0\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
9494
</Reference>
95+
<Reference Include="System.DirectoryServices" />
9596
<Reference Include="System.Drawing.Common, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
9697
<HintPath>..\packages\System.Drawing.Common.6.0.0\lib\net461\System.Drawing.Common.dll</HintPath>
9798
</Reference>
@@ -146,15 +147,15 @@
146147
<Reference Include="System.Security.Cryptography.Pkcs, Version=7.0.0.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
147148
<HintPath>..\packages\System.Security.Cryptography.Pkcs.7.0.3\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
148149
</Reference>
149-
<Reference Include="System.Security.Permissions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
150-
<HintPath>..\packages\System.Security.Permissions.6.0.0\lib\net461\System.Security.Permissions.dll</HintPath>
150+
<Reference Include="System.Security.Permissions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
151+
<HintPath>..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll</HintPath>
151152
</Reference>
152153
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
153154
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
154155
</Reference>
155156
<Reference Include="System.ServiceProcess" />
156-
<Reference Include="System.Text.Encoding.CodePages, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
157-
<HintPath>..\packages\System.Text.Encoding.CodePages.7.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
157+
<Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
158+
<HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
158159
</Reference>
159160
<Reference Include="System.Text.Encodings.Web, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
160161
<HintPath>..\packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>

‎Demos/WebForms/src/Products/Signature/Controllers/SignatureApiController.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,9 @@ public HttpResponseMessage LoadDocumentDescription(SignaturePostedDataEntity pos
206206
static MemoryStream RenderPageToMemoryStream(GroupDocs.Signature.Signature signature, int pageNumberToRender)
207207
{
208208
_pagePreviewStream = null;
209-
GroupDocs.Signature.Options.PreviewOptions previewOptions = new GroupDocs.Signature.Options.PreviewOptions(CreatePageStream, ReleasePageStream)
209+
GroupDocs.Signature.Options.PreviewOptions previewOptions =
210+
211+
new GroupDocs.Signature.Options.PreviewOptions(CreatePageStream, ReleasePageStream)
210212
{
211213
PreviewFormat = PreviewOptions.PreviewFormats.PNG,
212214
PageNumbers = new[] { pageNumberToRender }
@@ -216,18 +218,17 @@ static MemoryStream RenderPageToMemoryStream(GroupDocs.Signature.Signature signa
216218
return _pagePreviewStream;
217219
}
218220

219-
private static Stream CreatePageStream(int pageNumber)
221+
private static Stream CreatePageStream(PreviewPageData pageData)
220222
{
221223
_pagePreviewStream = new MemoryStream();
222224
return _pagePreviewStream;
223225
}
224226

225-
private static void ReleasePageStream(int pageNumber, Stream pageStream)
227+
private static void ReleasePageStream(PreviewPageData pageData, Stream pageStream)
226228
{
227229
pageStream.Dispose();
228230
}
229231

230-
231232
/// <summary>
232233
/// Load document page
233234
/// </summary>

‎Demos/WebForms/src/Products/Signature/Signer/BarCodeSigner.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public override SignOptions SignSlides()
7474

7575
private static void SetOptions(BarcodeSignOptions signOptions)
7676
{
77-
signOptions.EncodeType = BarcodeTypes.Code39Standard;
77+
signOptions.EncodeType = BarcodeTypes.Code39;
7878
signOptions.HorizontalAlignment = SignatureData.getHorizontalAlignment();
7979
signOptions.VerticalAlignment = SignatureData.getVerticalAlignment();
8080
signOptions.Width = Convert.ToInt32(SignatureData.ImageWidth);

0 commit comments

Comments
 (0)