diff --git a/.gitignore b/.gitignore index 51d62c56..893d768c 100644 --- a/.gitignore +++ b/.gitignore @@ -229,3 +229,4 @@ deploy_key Cache/ Output/ Aspose/ +/Examples/NuGet.Config diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/App.config b/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/App.config index 2e64b1c2..20068a19 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/App.config +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/App.config @@ -5,45 +5,45 @@ - - - - - - + + - - + + - - + + - + + + + + - - + + - - + + - - + + - - + + 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 bc5dde33..ef734c0d 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.25.12.0\lib\net462\GroupDocs.Viewer.dll + + ..\packages\GroupDocs.Viewer.Net462.26.8.0\lib\net462\GroupDocs.Viewer.dll ..\packages\MessagePack.3.1.3\lib\net472\MessagePack.dll @@ -87,18 +87,22 @@ ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Security.Cryptography.Pkcs.8.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll + ..\packages\System.Text.Encoding.CodePages.9.0.5\lib\net462\System.Text.Encoding.CodePages.dll ..\packages\System.Text.Encodings.Web.9.0.5\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.9.0.5\lib\net462\System.Text.Json.dll - ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + @@ -117,6 +121,8 @@ + + \ No newline at end of file diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/RunExamples.cs b/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/RunExamples.cs index e5d60c14..9bfb0f13 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/RunExamples.cs +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/RunExamples.cs @@ -112,7 +112,9 @@ static void Main() RenderWithCustomFonts.Run(); RenderingTxt.Run(); SetImageSizeLimits.Run(); - + // This example throws an exception in Debug mode. + // Use Release mode to debug with exceptions suppressed. + // CancelRenderWithCancellationToken.Run(); #endregion #region Rendering options by document type diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/packages.config b/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/packages.config index ede58243..861a004f 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/packages.config +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.Framework/packages.config @@ -1,6 +1,7 @@  - + + @@ -12,9 +13,10 @@ + - + \ No newline at end of file diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/Dockerfile b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/Dockerfile deleted file mode 100644 index 2fa93e9e..00000000 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# Navigate to 'Examples' folder -# Build container image with `docker build -f "GroupDocs.Viewer.Examples.CSharp.NET6\Dockerfile" -t groupdocs-viewer:examples .` -# Run container `docker run -it --rm -v ${pwd}/Output:/app/Output groupdocs-viewer:examples` -# Or run 'Docker' profile in Visual Studio - -FROM mcr.microsoft.com/dotnet/runtime:6.0 AS base -WORKDIR /app - -# begin install libgdiplus -RUN apt update; apt install apt-transport-https dirmngr gnupg ca-certificates -y -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -RUN "deb https://download.mono-project.com/repo/debian stable-buster main" | tee /etc/apt/sources.list.d/mono-official-stable.list -RUN apt update; apt install -y --allow-unauthenticated \ - libc6-dev \ - libgdiplus \ - libx11-dev -# end install libgdiplus - -# begin ttf-mscorefonts-installer -RUN sed -i'.bak' 's/$/ contrib/' /etc/apt/sources.list -RUN apt update; apt install -y ttf-mscorefonts-installer fontconfig -# end ttf-mscorefonts-installer - -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build -WORKDIR /src -COPY ["GroupDocs.Viewer.Examples.CSharp.NET6/GroupDocs.Viewer.Examples.CSharp.NET6.csproj", "GroupDocs.Viewer.Examples.CSharp.NET6/"] -RUN dotnet restore "GroupDocs.Viewer.Examples.CSharp.NET6/GroupDocs.Viewer.Examples.CSharp.NET6.csproj" -COPY . . -WORKDIR "/src/GroupDocs.Viewer.Examples.CSharp.NET6" -RUN dotnet build "GroupDocs.Viewer.Examples.CSharp.NET6.csproj" -c Release -o /app/build - -FROM build AS publish -RUN dotnet publish "GroupDocs.Viewer.Examples.CSharp.NET6.csproj" -c Release -o /app/publish - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "GroupDocs.Viewer.Examples.CSharp.NET6.dll"] \ No newline at end of file diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform.csproj b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform.csproj deleted file mode 100644 index f9aa2f17..00000000 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - Exe - net6.0 - enable - enable - CROSS_PLATFORM - - - - - - - - - - - - \ No newline at end of file diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/Properties/launchSettings.json b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/Properties/launchSettings.json deleted file mode 100644 index 1dadea0a..00000000 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/Properties/launchSettings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "profiles": { - "GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform": { - "commandName": "Project" - }, - "Container (Dockerfile)": { - "commandName": "Docker" - } - } -} \ No newline at end of file diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/README.md b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/README.md new file mode 100644 index 00000000..cb064e8f --- /dev/null +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/README.md @@ -0,0 +1,3 @@ +Starting in August 2026, use GroupDocs.Viewer for .NET instead of GroupDocs.Viewer.CrossPlatform. + +GroupDocs.Viewer for .NET 6.0 is functionally identical to GroupDocs.Viewer.CrossPlatform. diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.Windows/GroupDocs.Viewer.Examples.CSharp.NET6.Windows.csproj b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.Windows/GroupDocs.Viewer.Examples.CSharp.NET6.Windows.csproj new file mode 100644 index 00000000..15639c57 --- /dev/null +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.Windows/GroupDocs.Viewer.Examples.CSharp.NET6.Windows.csproj @@ -0,0 +1,19 @@ + + + + Exe + net6.0-windows + enable + enable + + + + + + + + + + + + diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.Windows/Properties/launchSettings.json b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.Windows/Properties/launchSettings.json new file mode 100644 index 00000000..797bc513 --- /dev/null +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.Windows/Properties/launchSettings.json @@ -0,0 +1,7 @@ +{ + "profiles": { + "GroupDocs.Viewer.Examples.CSharp.NET6": { + "commandName": "Project" + } + } +} \ No newline at end of file diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/RunExamples.cs b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.Windows/RunExamples.cs similarity index 94% rename from Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/RunExamples.cs rename to Examples/GroupDocs.Viewer.Examples.CSharp.NET6.Windows/RunExamples.cs index 48901a8b..f7f3261e 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/RunExamples.cs +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.Windows/RunExamples.cs @@ -6,6 +6,7 @@ using GroupDocs.Viewer.Examples.CSharp.AdvancedUsage.Rendering.RenderingOptionsByDocumentType.RenderingCadDrawings; using GroupDocs.Viewer.Examples.CSharp.AdvancedUsage.Rendering.RenderingOptionsByDocumentType.RenderingEMailMessages; using GroupDocs.Viewer.Examples.CSharp.AdvancedUsage.Rendering.RenderingOptionsByDocumentType.RenderingImageFiles; +using GroupDocs.Viewer.Examples.CSharp.AdvancedUsage.Rendering.RenderingOptionsByDocumentType.RenderingMsProjectDocuments; using GroupDocs.Viewer.Examples.CSharp.AdvancedUsage.Rendering.RenderingOptionsByDocumentType.RenderingOutlookDataFiles; using GroupDocs.Viewer.Examples.CSharp.AdvancedUsage.Rendering.RenderingOptionsByDocumentType.RenderingPdfDocuments; using GroupDocs.Viewer.Examples.CSharp.AdvancedUsage.Rendering.RenderingOptionsByDocumentType.RenderingSpreadsheets; @@ -76,7 +77,7 @@ public static void Main(string[] args) RenderingEmzAndEmf.Run(); RenderingCdr.Run(); RenderingCmx.Run(); - //RenderingAi.Run(); + RenderingAi.Run(); RenderingTga.Run(); RenderingApng.Run(); @@ -110,7 +111,9 @@ public static void Main(string[] args) RenderWithCustomFonts.Run(); RenderingTxt.Run(); SetImageSizeLimits.Run(); - CancelRenderWithCancellationToken.Run(); + // This example throws an exception in Debug mode. + // Use Release mode to debug with exceptions suppressed. + // CancelRenderWithCancellationToken.Run(); #endregion @@ -163,10 +166,10 @@ public static void Main(string[] args) #endregion #region Rendering MS Project Documents - // Commented due to missing functionality in the GroupDocs.Viewer.CrossPlatform. - // AdjustTimeUnit.Run(); - // GetViewInfoForProjectDocument.Run(); - // RenderProjectTimeInterval.Run(); + + AdjustTimeUnit.Run(); + GetViewInfoForProjectDocument.Run(); + RenderProjectTimeInterval.Run(); #endregion 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 ac95773c..f2d0d9c1 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,11 +8,10 @@ - + - diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6/RunExamples.cs b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6/RunExamples.cs index cf9c8114..190beecb 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6/RunExamples.cs +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6/RunExamples.cs @@ -77,7 +77,6 @@ public static void Main(string[] args) RenderingEmzAndEmf.Run(); RenderingCdr.Run(); RenderingCmx.Run(); - RenderingAi.Run(); RenderingTga.Run(); RenderingApng.Run(); @@ -111,7 +110,9 @@ public static void Main(string[] args) RenderWithCustomFonts.Run(); RenderingTxt.Run(); SetImageSizeLimits.Run(); - CancelRenderWithCancellationToken.Run(); + // This example throws an exception in Debug mode. + // Use Release mode to debug with exceptions suppressed. + // CancelRenderWithCancellationToken.Run(); #endregion diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.sln b/Examples/GroupDocs.Viewer.Examples.CSharp.sln index e25018d8..dcb89481 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.sln +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.sln @@ -7,10 +7,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GroupDocs.Viewer.Examples.C EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "GroupDocs.Viewer.Examples.CSharp", "GroupDocs.Viewer.Examples.CSharp\GroupDocs.Viewer.Examples.CSharp.shproj", "{52FCB48E-82A0-4201-ACA1-E9B6047E2047}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform", "GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform\GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform.csproj", "{D56C02E6-CE2F-469A-9166-4D1BD626999E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GroupDocs.Viewer.Examples.CSharp.NET6", "GroupDocs.Viewer.Examples.CSharp.NET6\GroupDocs.Viewer.Examples.CSharp.NET6.csproj", "{05D02F42-2B6D-4445-901B-730B644D0506}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GroupDocs.Viewer.Examples.CSharp.NET6.Windows", "GroupDocs.Viewer.Examples.CSharp.NET6.Windows\GroupDocs.Viewer.Examples.CSharp.NET6.Windows.csproj", "{83AD6213-3A11-1EC4-E560-306993DFCA38}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,14 +21,14 @@ Global {FE0B7FB6-3D10-4952-9178-EC52E591B3D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {FE0B7FB6-3D10-4952-9178-EC52E591B3D2}.Release|Any CPU.ActiveCfg = Release|Any CPU {FE0B7FB6-3D10-4952-9178-EC52E591B3D2}.Release|Any CPU.Build.0 = Release|Any CPU - {D56C02E6-CE2F-469A-9166-4D1BD626999E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D56C02E6-CE2F-469A-9166-4D1BD626999E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D56C02E6-CE2F-469A-9166-4D1BD626999E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D56C02E6-CE2F-469A-9166-4D1BD626999E}.Release|Any CPU.Build.0 = Release|Any CPU {05D02F42-2B6D-4445-901B-730B644D0506}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {05D02F42-2B6D-4445-901B-730B644D0506}.Debug|Any CPU.Build.0 = Debug|Any CPU {05D02F42-2B6D-4445-901B-730B644D0506}.Release|Any CPU.ActiveCfg = Release|Any CPU {05D02F42-2B6D-4445-901B-730B644D0506}.Release|Any CPU.Build.0 = Release|Any CPU + {83AD6213-3A11-1EC4-E560-306993DFCA38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83AD6213-3A11-1EC4-E560-306993DFCA38}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83AD6213-3A11-1EC4-E560-306993DFCA38}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83AD6213-3A11-1EC4-E560-306993DFCA38}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -39,7 +39,7 @@ Global GlobalSection(SharedMSBuildProjectFiles) = preSolution GroupDocs.Viewer.Examples.CSharp\GroupDocs.Viewer.Examples.CSharp.projitems*{05d02f42-2b6d-4445-901b-730b644d0506}*SharedItemsImports = 5 GroupDocs.Viewer.Examples.CSharp\GroupDocs.Viewer.Examples.CSharp.projitems*{52fcb48e-82a0-4201-aca1-e9b6047e2047}*SharedItemsImports = 13 - GroupDocs.Viewer.Examples.CSharp\GroupDocs.Viewer.Examples.CSharp.projitems*{d56c02e6-ce2f-469a-9166-4d1bd626999e}*SharedItemsImports = 5 + GroupDocs.Viewer.Examples.CSharp\GroupDocs.Viewer.Examples.CSharp.projitems*{83ad6213-3a11-1ec4-e560-306993dfca38}*SharedItemsImports = 5 GroupDocs.Viewer.Examples.CSharp\GroupDocs.Viewer.Examples.CSharp.projitems*{fe0b7fb6-3d10-4952-9178-ec52e591b3d2}*SharedItemsImports = 4 EndGlobalSection EndGlobal diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/CommonRenderingOptions/CancelRenderWithCancellationToken.cs b/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/CommonRenderingOptions/CancelRenderWithCancellationToken.cs index fa795157..544f8ccf 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/CommonRenderingOptions/CancelRenderWithCancellationToken.cs +++ b/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/CommonRenderingOptions/CancelRenderWithCancellationToken.cs @@ -1,9 +1,8 @@ -#if NETCOREAPP -using System; +using System; using System.IO; -using GroupDocs.Viewer.Options; using System.Threading.Tasks; using System.Threading; +using GroupDocs.Viewer.Options; namespace GroupDocs.Viewer.Examples.CSharp.AdvancedUsage.Rendering.CommonRenderingOptions { @@ -31,10 +30,17 @@ public static void Run() } }, cancellationToken); + // Cancel task after 10 ms. cancellationTokenSource.CancelAfter(10); + // Also you can call Cancel method at any time + //cancellationTokenSource.Cancel(); + + // Wait for the task to cancel. + Thread.Sleep(2000); + + Console.WriteLine($"\nSource document rendered successfully.\nCheck output in {outputDirectory}."); } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/RenderingOptionsByDocumentType/RenderingImageFiles/RenderingAi.cs b/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/RenderingOptionsByDocumentType/RenderingImageFiles/RenderingAi.cs index 7532e788..1fdbe792 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/RenderingOptionsByDocumentType/RenderingImageFiles/RenderingAi.cs +++ b/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/RenderingOptionsByDocumentType/RenderingImageFiles/RenderingAi.cs @@ -6,6 +6,7 @@ namespace GroupDocs.Viewer.Examples.CSharp.AdvancedUsage.Rendering.RenderingOpti { /// /// This example demonstrates how to render Ai document into HTML, JPG, PNG, PDF. + /// AI/PSD not supported in GroupDocs.Viewer.Net60; use .NET 4.6.2 or NET 6.0 Windows /// public class RenderingAi {