diff --git a/Demos/ASP.NET Core CrossPlatform/src/Dockerfile b/Demos/ASP.NET Core CrossPlatform/src/Dockerfile index b9623a83b..946b06820 100644 --- a/Demos/ASP.NET Core CrossPlatform/src/Dockerfile +++ b/Demos/ASP.NET Core CrossPlatform/src/Dockerfile @@ -1,26 +1,18 @@ -#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. +# See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +# This stage is used when running from VS in fast mode (Default for Debug configuration) +FROM mcr.microsoft.com/dotnet/aspnet:6.0-bookworm-slim AS base WORKDIR /app EXPOSE 80 EXPOSE 443 -# 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 +# This stage is used to build the service project +FROM mcr.microsoft.com/dotnet/sdk:6.0-bookworm-slim AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["GroupDocs.Viewer.AspNetCore.CrossPlatform.csproj", "."] @@ -29,10 +21,12 @@ COPY . . WORKDIR "/src/." RUN dotnet build "./GroupDocs.Viewer.AspNetCore.CrossPlatform.csproj" -c $BUILD_CONFIGURATION -o /app/build +# This stage is used to publish the service project to be copied to the final stage FROM build AS publish ARG BUILD_CONFIGURATION=Release RUN dotnet publish "./GroupDocs.Viewer.AspNetCore.CrossPlatform.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false +# This stage is used in production or when running from VS in regular mode (Default when not using the Debug configuration) FROM base AS final WORKDIR /app COPY --from=publish /app/publish . diff --git a/Demos/ASP.NET Core CrossPlatform/src/GroupDocs.Viewer.AspNetCore.CrossPlatform.csproj b/Demos/ASP.NET Core CrossPlatform/src/GroupDocs.Viewer.AspNetCore.CrossPlatform.csproj index 7e7ef6aa0..5a50bb83e 100644 --- a/Demos/ASP.NET Core CrossPlatform/src/GroupDocs.Viewer.AspNetCore.CrossPlatform.csproj +++ b/Demos/ASP.NET Core CrossPlatform/src/GroupDocs.Viewer.AspNetCore.CrossPlatform.csproj @@ -10,13 +10,13 @@ - + - + - + diff --git a/Demos/ASP.NET Core CrossPlatform/src/Program.cs b/Demos/ASP.NET Core CrossPlatform/src/Program.cs index 492ac2270..e6ab037bf 100644 --- a/Demos/ASP.NET Core CrossPlatform/src/Program.cs +++ b/Demos/ASP.NET Core CrossPlatform/src/Program.cs @@ -1,4 +1,4 @@ -var builder = WebApplication.CreateBuilder(args); +WebApplicationBuilder builder = WebApplication.CreateBuilder(args); builder.Services .AddGroupDocsViewerUI(); @@ -14,7 +14,7 @@ .AddLocalStorage("./Storage/Files") .AddLocalCache("./Storage/Cache"); -var app = builder.Build(); +WebApplication app = builder.Build(); app .UseRouting() @@ -35,4 +35,4 @@ }); }); -app.Run(); \ No newline at end of file +await app.RunAsync(); \ No newline at end of file diff --git a/Demos/ASP.NET Core/src/GroupDocs.Viewer.AspNetCore.csproj b/Demos/ASP.NET Core/src/GroupDocs.Viewer.AspNetCore.csproj index 3efa5d629..9aaa29581 100644 --- a/Demos/ASP.NET Core/src/GroupDocs.Viewer.AspNetCore.csproj +++ b/Demos/ASP.NET Core/src/GroupDocs.Viewer.AspNetCore.csproj @@ -7,12 +7,12 @@ - + - + - + diff --git a/Demos/ASP.NET MVC/src/GroupDocs.Viewer.AspNetMvc.csproj b/Demos/ASP.NET MVC/src/GroupDocs.Viewer.AspNetMvc.csproj index 6c2479abc..b488eb4f0 100644 --- a/Demos/ASP.NET MVC/src/GroupDocs.Viewer.AspNetMvc.csproj +++ b/Demos/ASP.NET MVC/src/GroupDocs.Viewer.AspNetMvc.csproj @@ -51,8 +51,8 @@ packages\AsyncKeyedLock.6.2.1\lib\netstandard2.0\AsyncKeyedLock.dll - - packages\GroupDocs.Viewer.24.9.0\lib\net462\GroupDocs.Viewer.dll + + packages\GroupDocs.Viewer.24.10.0\lib\net462\GroupDocs.Viewer.dll packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll @@ -88,8 +88,8 @@ 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.Text.Json.6.0.10\lib\net461\System.Text.Json.dll packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -289,7 +289,6 @@ 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}. - @@ -299,5 +298,4 @@ - \ No newline at end of file diff --git a/Demos/ASP.NET MVC/src/packages.config b/Demos/ASP.NET MVC/src/packages.config index 560d524fc..6612fa67e 100644 --- a/Demos/ASP.NET MVC/src/packages.config +++ b/Demos/ASP.NET MVC/src/packages.config @@ -1,7 +1,7 @@  - + @@ -21,7 +21,7 @@ - + diff --git a/Demos/ASP.NET Web Forms/src/GroupDocs.Viewer.AspNetWebForms.csproj b/Demos/ASP.NET Web Forms/src/GroupDocs.Viewer.AspNetWebForms.csproj index 5789114d5..cb61f7e40 100644 --- a/Demos/ASP.NET Web Forms/src/GroupDocs.Viewer.AspNetWebForms.csproj +++ b/Demos/ASP.NET Web Forms/src/GroupDocs.Viewer.AspNetWebForms.csproj @@ -50,8 +50,8 @@ packages\AsyncKeyedLock.6.2.1\lib\netstandard2.0\AsyncKeyedLock.dll - - packages\GroupDocs.Viewer.24.9.0\lib\net462\GroupDocs.Viewer.dll + + packages\GroupDocs.Viewer.24.10.0\lib\net462\GroupDocs.Viewer.dll packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll @@ -83,8 +83,8 @@ 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.Text.Json.6.0.10\lib\net461\System.Text.Json.dll packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -281,7 +281,5 @@ 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/Demos/ASP.NET Web Forms/src/Storage/Files/document.7z b/Demos/ASP.NET Web Forms/src/Storage/Files/document.7z new file mode 100644 index 000000000..1c0bd469b Binary files /dev/null and b/Demos/ASP.NET Web Forms/src/Storage/Files/document.7z differ diff --git a/Demos/ASP.NET Web Forms/src/packages.config b/Demos/ASP.NET Web Forms/src/packages.config index fdeba48e2..7f9719aaf 100644 --- a/Demos/ASP.NET Web Forms/src/packages.config +++ b/Demos/ASP.NET Web Forms/src/packages.config @@ -1,7 +1,7 @@  - + @@ -17,7 +17,7 @@ - + diff --git a/Demos/WPF/src/GroupDocs.Viewer.WPF.csproj b/Demos/WPF/src/GroupDocs.Viewer.WPF.csproj index fab45d663..c855ff14d 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/GroupDocs.Viewer.WinForms.csproj b/Demos/Windows Forms/src/GroupDocs.Viewer.WinForms.csproj index 2be0b2c6a..2a293eac2 100644 --- a/Demos/Windows Forms/src/GroupDocs.Viewer.WinForms.csproj +++ b/Demos/Windows Forms/src/GroupDocs.Viewer.WinForms.csproj @@ -36,8 +36,8 @@ 4 - - packages\GroupDocs.Viewer.24.9.0\lib\net462\GroupDocs.Viewer.dll + + packages\GroupDocs.Viewer.24.10.0\lib\net462\GroupDocs.Viewer.dll packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll @@ -69,8 +69,8 @@ packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll True - - packages\System.Text.Json.6.0.0\lib\net461\System.Text.Json.dll + + packages\System.Text.Json.6.0.10\lib\net461\System.Text.Json.dll packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -137,11 +137,4 @@ - - - - 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/Demos/Windows Forms/src/packages.config b/Demos/Windows Forms/src/packages.config index 0aa4b9159..82dd567e0 100644 --- a/Demos/Windows Forms/src/packages.config +++ b/Demos/Windows Forms/src/packages.config @@ -1,6 +1,6 @@  - + @@ -8,7 +8,7 @@ - + \ No newline at end of file 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 8106fed55..8cb62d492 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.24.9.0\lib\net462\GroupDocs.Viewer.dll + + ..\packages\GroupDocs.Viewer.24.10.0\lib\net462\GroupDocs.Viewer.dll ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\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 f12b25719..66279dcf0 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.CrossPlatform/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform.csproj b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform.csproj index fa48e7eb4..2bc0b2d7c 100644 --- 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 @@ -9,8 +9,9 @@ - + + diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/RunExamples.cs b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/RunExamples.cs index 6423b6a09..c700b0833 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/RunExamples.cs +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6.CrossPlatform/RunExamples.cs @@ -22,7 +22,7 @@ namespace GroupDocs.Viewer.Examples.CSharp { - internal class Program + internal static class Program { public static void Main(string[] args) { 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 082c69473..eb48864e7 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 @@ - + diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6/RunExamples.cs b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6/RunExamples.cs index ad605a7b0..fa227a9f5 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp.NET6/RunExamples.cs +++ b/Examples/GroupDocs.Viewer.Examples.CSharp.NET6/RunExamples.cs @@ -23,7 +23,7 @@ namespace GroupDocs.Viewer.Examples.CSharp { - internal class Program + internal static class Program { public static void Main(string[] args) { diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/RenderingOptionsByDocumentType/RenderingArchiveFiles/GetViewInfoForArchiveFile.cs b/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/RenderingOptionsByDocumentType/RenderingArchiveFiles/GetViewInfoForArchiveFile.cs index 07cf04c4a..6fbb46f29 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/RenderingOptionsByDocumentType/RenderingArchiveFiles/GetViewInfoForArchiveFile.cs +++ b/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/RenderingOptionsByDocumentType/RenderingArchiveFiles/GetViewInfoForArchiveFile.cs @@ -1,6 +1,6 @@ -using System; -using GroupDocs.Viewer.Options; +using GroupDocs.Viewer.Options; using GroupDocs.Viewer.Results; +using System; namespace GroupDocs.Viewer.Examples.CSharp.AdvancedUsage.Rendering.RenderingOptionsByDocumentType.RenderingArchiveFiles { @@ -13,7 +13,7 @@ public static void Run() { using (Viewer viewer = new Viewer(TestFiles.SAMPLE_ZIP_WITH_FOLDERS)) { - ViewInfo info = viewer.GetViewInfo(ViewInfoOptions.ForHtmlView()); + ViewInfo info = viewer.GetViewInfo(ViewInfoOptions.ForJpgView()); Console.WriteLine("File type: " + info.FileType); Console.WriteLine("Pages count: " + info.Pages.Count); @@ -30,7 +30,7 @@ public static void Run() private static void ReadFolders(Viewer viewer, string folder) { - ViewInfoOptions options = ViewInfoOptions.ForHtmlView(); + ViewInfoOptions options = ViewInfoOptions.ForJpgView(); options.ArchiveOptions.Folder = folder; ArchiveViewInfo viewInfo = viewer.GetViewInfo(options) as ArchiveViewInfo; @@ -38,8 +38,6 @@ private static void ReadFolders(Viewer viewer, string folder) foreach (string subFolder in viewInfo.Folders) { Console.WriteLine($" - {subFolder}"); - - ReadFolders(viewer, subFolder); } } } diff --git a/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/RenderingOptionsByDocumentType/RenderingArchiveFiles/RenderingRar.cs b/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/RenderingOptionsByDocumentType/RenderingArchiveFiles/RenderingRar.cs index dc3850891..2b1ad902a 100644 --- a/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/RenderingOptionsByDocumentType/RenderingArchiveFiles/RenderingRar.cs +++ b/Examples/GroupDocs.Viewer.Examples.CSharp/AdvancedUsage/Rendering/RenderingOptionsByDocumentType/RenderingArchiveFiles/RenderingRar.cs @@ -111,8 +111,6 @@ private static void ReadFolders(Viewer viewer, string folder) foreach (string subFolder in viewInfo.Folders) { Console.WriteLine($" - {subFolder}"); - - ReadFolders(viewer, subFolder); } } }