From 176ed66c8e2913d481d475df45f2c5a685e58825 Mon Sep 17 00:00:00 2001 From: Dmitry Tyurin Date: Thu, 28 Dec 2023 19:31:26 +0200 Subject: [PATCH 1/2] Updated GroupDocs.Viewer references up to 23.12 version --- .../src/GroupDocs.Viewer.AspNetCore.csproj | 2 +- .../src/GroupDocs.Viewer.AspNetMvc.csproj | 4 +- Demos/ASP.NET MVC/src/Web.config | 27 +++--------- Demos/ASP.NET MVC/src/packages.config | 2 +- Demos/ASP.NET Web Forms/src/Web.config | 27 +++--------- Demos/ASP.NET Web Forms/src/packages.config | 2 +- Demos/WPF/src/GroupDocs.Viewer.WPF.csproj | 2 +- Demos/Windows Forms/src/App.config | 27 +++--------- .../src/GroupDocs.Viewer.WinForms.csproj | 2 +- Demos/Windows Forms/src/packages.config | 2 +- ...oupDocs.Viewer.Examples.CSharp.Core.csproj | 2 +- .../App.config | 42 +++---------------- ...cs.Viewer.Examples.CSharp.Framework.csproj | 4 +- .../packages.config | 2 +- ...oupDocs.Viewer.Examples.CSharp.NET6.csproj | 2 +- 15 files changed, 37 insertions(+), 112 deletions(-) diff --git a/Demos/ASP.NET Core/src/GroupDocs.Viewer.AspNetCore.csproj b/Demos/ASP.NET Core/src/GroupDocs.Viewer.AspNetCore.csproj index f7e1976b..2a830c45 100644 --- a/Demos/ASP.NET Core/src/GroupDocs.Viewer.AspNetCore.csproj +++ b/Demos/ASP.NET Core/src/GroupDocs.Viewer.AspNetCore.csproj @@ -10,7 +10,7 @@ - + diff --git a/Demos/ASP.NET MVC/src/GroupDocs.Viewer.AspNetMvc.csproj b/Demos/ASP.NET MVC/src/GroupDocs.Viewer.AspNetMvc.csproj index a7fe5be4..b40cbc33 100644 --- a/Demos/ASP.NET MVC/src/GroupDocs.Viewer.AspNetMvc.csproj +++ b/Demos/ASP.NET MVC/src/GroupDocs.Viewer.AspNetMvc.csproj @@ -49,8 +49,8 @@ packages\AsyncKeyedLock.6.2.1\lib\netstandard2.0\AsyncKeyedLock.dll - - packages\GroupDocs.Viewer.23.11.0\lib\net462\GroupDocs.Viewer.dll + + packages\GroupDocs.Viewer.23.12.0\lib\net462\GroupDocs.Viewer.dll packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll diff --git a/Demos/ASP.NET MVC/src/Web.config b/Demos/ASP.NET MVC/src/Web.config index 114e2233..5f059ce8 100644 --- a/Demos/ASP.NET MVC/src/Web.config +++ b/Demos/ASP.NET MVC/src/Web.config @@ -58,17 +58,7 @@ - - - - - - - - - - - + @@ -78,7 +68,7 @@ - + @@ -93,7 +83,7 @@ - + @@ -103,7 +93,7 @@ - + @@ -113,17 +103,12 @@ - + - - - - - - + diff --git a/Demos/ASP.NET MVC/src/packages.config b/Demos/ASP.NET MVC/src/packages.config index 17d893a6..e1761cf1 100644 --- a/Demos/ASP.NET MVC/src/packages.config +++ b/Demos/ASP.NET MVC/src/packages.config @@ -1,7 +1,7 @@  - + diff --git a/Demos/ASP.NET Web Forms/src/Web.config b/Demos/ASP.NET Web Forms/src/Web.config index cc354ae5..04b50dc5 100644 --- a/Demos/ASP.NET Web Forms/src/Web.config +++ b/Demos/ASP.NET Web Forms/src/Web.config @@ -47,21 +47,6 @@ - - - - - - - - - - - - - - - @@ -69,7 +54,7 @@ - + @@ -84,7 +69,7 @@ - + @@ -94,7 +79,7 @@ - + @@ -104,17 +89,17 @@ - + - + - + diff --git a/Demos/ASP.NET Web Forms/src/packages.config b/Demos/ASP.NET Web Forms/src/packages.config index 0bdaa452..838f7527 100644 --- a/Demos/ASP.NET Web Forms/src/packages.config +++ b/Demos/ASP.NET Web Forms/src/packages.config @@ -1,7 +1,7 @@  - + diff --git a/Demos/WPF/src/GroupDocs.Viewer.WPF.csproj b/Demos/WPF/src/GroupDocs.Viewer.WPF.csproj index 0be77047..f6dec416 100644 --- a/Demos/WPF/src/GroupDocs.Viewer.WPF.csproj +++ b/Demos/WPF/src/GroupDocs.Viewer.WPF.csproj @@ -41,7 +41,7 @@ - + \ No newline at end of file diff --git a/Demos/Windows Forms/src/App.config b/Demos/Windows Forms/src/App.config index 85553a39..5d9276fc 100644 --- a/Demos/Windows Forms/src/App.config +++ b/Demos/Windows Forms/src/App.config @@ -5,21 +5,6 @@ - - - - - - - - - - - - - - - @@ -27,7 +12,7 @@ - + @@ -42,7 +27,7 @@ - + @@ -52,7 +37,7 @@ - + @@ -62,17 +47,17 @@ - + - + - + diff --git a/Demos/Windows Forms/src/GroupDocs.Viewer.WinForms.csproj b/Demos/Windows Forms/src/GroupDocs.Viewer.WinForms.csproj index 00126948..36fe830b 100644 --- a/Demos/Windows Forms/src/GroupDocs.Viewer.WinForms.csproj +++ b/Demos/Windows Forms/src/GroupDocs.Viewer.WinForms.csproj @@ -35,7 +35,7 @@ - packages\GroupDocs.Viewer.23.11.0\lib\net462\GroupDocs.Viewer.dll + packages\GroupDocs.Viewer.23.12.0\lib\net462\GroupDocs.Viewer.dll diff --git a/Demos/Windows Forms/src/packages.config b/Demos/Windows Forms/src/packages.config index 63b8c608..2fadad9a 100644 --- a/Demos/Windows Forms/src/packages.config +++ b/Demos/Windows Forms/src/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.Core/GroupDocs.Viewer.Examples.CSharp.Core.csproj b/Examples/GroupDocs.Viewer.Examples.CSharp.Core/GroupDocs.Viewer.Examples.CSharp.Core.csproj index b4adb15c..b4704102 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.Core/GroupDocs.Viewer.Examples.CSharp.Core.csproj +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.Core/GroupDocs.Viewer.Examples.CSharp.Core.csproj @@ -9,7 +9,7 @@ - + diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/App.config b/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/App.config index c600a9fb..38ff2ec3 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/App.config +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/App.config @@ -33,36 +33,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -70,7 +40,7 @@ - + @@ -85,7 +55,7 @@ - + @@ -95,7 +65,7 @@ - + @@ -105,17 +75,17 @@ - + - + - + diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/GroupDocs.Viewer.Examples.CSharp.Framework.csproj b/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/GroupDocs.Viewer.Examples.CSharp.Framework.csproj index d92aa6b7..eaab2882 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/GroupDocs.Viewer.Examples.CSharp.Framework.csproj +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/GroupDocs.Viewer.Examples.CSharp.Framework.csproj @@ -49,8 +49,8 @@ 4 - - ..\packages\GroupDocs.Viewer.23.11.0\lib\net462\GroupDocs.Viewer.dll + + ..\packages\GroupDocs.Viewer.23.12.0\lib\net462\GroupDocs.Viewer.dll ..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/packages.config b/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/packages.config index cf96e31a..84a295bc 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/packages.config +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/packages.config @@ -1,6 +1,6 @@  - + diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6/GroupDocs.Viewer.Examples.CSharp.NET6.csproj b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6/GroupDocs.Viewer.Examples.CSharp.NET6.csproj index 89e41116..6460e8bb 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6/GroupDocs.Viewer.Examples.CSharp.NET6.csproj +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6/GroupDocs.Viewer.Examples.CSharp.NET6.csproj @@ -8,7 +8,7 @@ - + From dc977251ad598bd6d6bb3392d1bf20c25f9d1d50 Mon Sep 17 00:00:00 2001 From: Dmitry Tyurin Date: Fri, 29 Dec 2023 13:26:59 +0200 Subject: [PATCH 2/2] Removed obsolete options, fixed package versions --- .../src/GroupDocs.Viewer.AspNetCore.csproj | 2 +- .../Extensions/ViewOptionsExtensions.cs | 1 - .../src/GroupDocs.Viewer.WinForms.csproj | 40 ++++++++++++++++++- .../AdjustQualityOfJpgImages.cs | 1 - 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/Demos/ASP.NET Core/src/GroupDocs.Viewer.AspNetCore.csproj b/Demos/ASP.NET Core/src/GroupDocs.Viewer.AspNetCore.csproj index 2a830c45..8e935683 100644 --- a/Demos/ASP.NET Core/src/GroupDocs.Viewer.AspNetCore.csproj +++ b/Demos/ASP.NET Core/src/GroupDocs.Viewer.AspNetCore.csproj @@ -7,7 +7,7 @@ - + diff --git a/Demos/ASP.NET MVC/src/Core/Viewers/Extensions/ViewOptionsExtensions.cs b/Demos/ASP.NET MVC/src/Core/Viewers/Extensions/ViewOptionsExtensions.cs index 3a450ae7..85ac6cfd 100644 --- a/Demos/ASP.NET MVC/src/Core/Viewers/Extensions/ViewOptionsExtensions.cs +++ b/Demos/ASP.NET MVC/src/Core/Viewers/Extensions/ViewOptionsExtensions.cs @@ -61,7 +61,6 @@ private static void CopyHtmlViewOptions(this HtmlViewOptions dst, HtmlViewOption private static void CopyPdfViewOptions(this PdfViewOptions dst, PdfViewOptions src) { - dst.JpgQuality = src.JpgQuality; dst.Security = src.Security; dst.ImageMaxWidth = src.ImageMaxWidth; dst.ImageMaxHeight = src.ImageMaxHeight; diff --git a/Demos/Windows Forms/src/GroupDocs.Viewer.WinForms.csproj b/Demos/Windows Forms/src/GroupDocs.Viewer.WinForms.csproj index 36fe830b..3969be73 100644 --- a/Demos/Windows Forms/src/GroupDocs.Viewer.WinForms.csproj +++ b/Demos/Windows Forms/src/GroupDocs.Viewer.WinForms.csproj @@ -34,11 +34,42 @@ 4 - + packages\GroupDocs.Viewer.23.12.0\lib\net462\GroupDocs.Viewer.dll + + packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + + packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll + + + packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll + + + packages\System.Text.Json.6.0.0\lib\net461\System.Text.Json.dll + + + packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + @@ -103,4 +134,11 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp/BasicUsage/RenderDocumentToPdf/AdjustQualityOfJpgImages.cs b/Examples/GroupDocs.Viewer.Examples.CSharp/BasicUsage/RenderDocumentToPdf/AdjustQualityOfJpgImages.cs index 1dcde3c5..15c1ad01 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp/BasicUsage/RenderDocumentToPdf/AdjustQualityOfJpgImages.cs +++ b/Examples/GroupDocs.Viewer.Examples.CSharp/BasicUsage/RenderDocumentToPdf/AdjustQualityOfJpgImages.cs @@ -17,7 +17,6 @@ public static void Run() using (Viewer viewer = new Viewer(TestFiles.JPG_IMAGE_PPTX)) { PdfViewOptions options = new PdfViewOptions(filePath); - options.JpgQuality = 10; viewer.View(options); }