Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/build_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,5 @@ jobs:
uses: actions/setup-dotnet@v3
with:
global-json-file: global.json
- name: Setup node
uses: actions/setup-node@v2
- name: Build project
run: dotnet build ./GroupDocs.Viewer.UI.sln
34 changes: 17 additions & 17 deletions build/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,37 @@
</PropertyGroup>

<PropertyGroup Label="Package Versions">
<GroupDocsViewer>25.4.0</GroupDocsViewer>
<GroupDocsViewer>25.8.0</GroupDocsViewer>

<MicrosoftExtensionsHttp>8.0.1</MicrosoftExtensionsHttp>
<MicrosoftExtensionsDependencyInjectionAbstractions>8.0.2</MicrosoftExtensionsDependencyInjectionAbstractions>
<MicrosoftExtensionsConfiguration>8.0.0</MicrosoftExtensionsConfiguration>
<MicrosoftExtensionsConfigurationAbstractions>8.0.0</MicrosoftExtensionsConfigurationAbstractions>
<MicrosoftExtensionsConfigurationBinder>8.0.2</MicrosoftExtensionsConfigurationBinder>
<MicrosoftExtensionsCachingMemory>8.0.1</MicrosoftExtensionsCachingMemory>
<SystemFormatsAsn1>8.0.1</SystemFormatsAsn1>
<SystemFormatsAsn1>8.0.2</SystemFormatsAsn1>

<SystemTextJson>8.0.5</SystemTextJson>
<SystemTextJson>8.0.6</SystemTextJson>

<AzureBlobs>12.24.0</AzureBlobs>
<AwsSdkS3>4.0.0.1</AwsSdkS3>
<AzureBlobs>12.25.0</AzureBlobs>
<AwsSdkS3>4.0.7.2</AwsSdkS3>

<MicrosoftSourceLinkGithub>8.0.0</MicrosoftSourceLinkGithub>
</PropertyGroup>

<PropertyGroup Label="GroupDocs.Viewer UI Package Versions">
<GroupDocsViewerUI>8.0.7</GroupDocsViewerUI>
<GroupDocsViewerUIApi>8.0.7</GroupDocsViewerUIApi>
<GroupDocsViewerUIApiLocalCache>8.0.7</GroupDocsViewerUIApiLocalCache>
<GroupDocsViewerUIApiInMemoryCache>8.0.7</GroupDocsViewerUIApiInMemoryCache>
<GroupDocsViewerUIApiLocalStorage>8.0.7</GroupDocsViewerUIApiLocalStorage>
<GroupDocsViewerUIApiCloudStorage>8.0.7</GroupDocsViewerUIApiCloudStorage>
<GroupDocsViewerUIApiAzureStorage>8.0.7</GroupDocsViewerUIApiAzureStorage>
<GroupDocsViewerUIApiAwsS3Storage>8.0.7</GroupDocsViewerUIApiAwsS3Storage>
<GroupDocsViewerUICore>8.0.7</GroupDocsViewerUICore>
<GroupDocsViewerUISelfHostApi>8.0.7</GroupDocsViewerUISelfHostApi>
<GroupDocsViewerUISelfHostApiCrossPlatform>8.0.7</GroupDocsViewerUISelfHostApiCrossPlatform>
<GroupDocsViewerUICloudApi>8.0.7</GroupDocsViewerUICloudApi>
<GroupDocsViewerUI>8.1.1</GroupDocsViewerUI>
<GroupDocsViewerUIApi>8.1.1</GroupDocsViewerUIApi>
<GroupDocsViewerUIApiLocalCache>8.1.1</GroupDocsViewerUIApiLocalCache>
<GroupDocsViewerUIApiInMemoryCache>8.1.1</GroupDocsViewerUIApiInMemoryCache>
<GroupDocsViewerUIApiLocalStorage>8.1.1</GroupDocsViewerUIApiLocalStorage>
<GroupDocsViewerUIApiCloudStorage>8.1.1</GroupDocsViewerUIApiCloudStorage>
<GroupDocsViewerUIApiAzureStorage>8.1.1</GroupDocsViewerUIApiAzureStorage>
<GroupDocsViewerUIApiAwsS3Storage>8.1.1</GroupDocsViewerUIApiAwsS3Storage>
<GroupDocsViewerUICore>8.1.1</GroupDocsViewerUICore>
<GroupDocsViewerUISelfHostApi>8.1.1</GroupDocsViewerUISelfHostApi>
<GroupDocsViewerUISelfHostApiCrossPlatform>8.1.1</GroupDocsViewerUISelfHostApiCrossPlatform>
<GroupDocsViewerUICloudApi>8.1.1</GroupDocsViewerUICloudApi>
</PropertyGroup>

<PropertyGroup Label="NuGet Common Settings">
Expand Down
4 changes: 2 additions & 2 deletions samples/GroupDocs.Viewer.UI.Sample.CrossPlatform/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This stage is used when running from VS in fast mode (Default for Debug configuration)
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443
EXPOSE 8080
EXPOSE 8081

# Install dependencies for Windows Fonts package
RUN apt update && apt install -y --no-install-recommends \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

//Trial limitations https://docs.groupdocs.com/viewer/net/evaluation-limitations-and-licensing-of-groupdocs-viewer/
//Temporary license can be requested at https://purchase.groupdocs.com/temporary-license
//config.SetLicensePath("c:\\licenses\\GroupDocs.Viewer.lic"); // or set environment variable 'GROUPDOCS_LIC_PATH'
//config.SetLicensePath("GroupDocs.Viewer.lic"); // or set environment variable 'GROUPDOCS_LIC_PATH'
})
.AddLocalStorage("./Files");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{
Config apiConfig = new Config();
apiConfig.SetViewerType(VIEWER_TYPE);
//apiConfig.SetLicensePath("c://Licenses//GroupDocs.Viewer.lic");
//apiConfig.SetLicensePath("GroupDocs.Viewer.lic");

IFileStorage fileStorage = new LocalFileStorage(STORAGE_PATH);
IApiUrlBuilder urlBuilder = new StaticUrlBuilder(API_ENDPOINT);
Expand Down Expand Up @@ -86,7 +86,7 @@
);
break;
case ViewerType.HtmlWithExternalResources:
viewer = new HtmlWithExternalResourcesViewer(

Check warning on line 89 in samples/GroupDocs.Viewer.UI.Sample.StaticContentMode.Generator/Program.cs

View workflow job for this annotation

GitHub Actions / build

Unreachable code detected

Check warning on line 89 in samples/GroupDocs.Viewer.UI.Sample.StaticContentMode.Generator/Program.cs

View workflow job for this annotation

GitHub Actions / build

Unreachable code detected
configOptions,
asyncLock,
licenseManager,
Expand All @@ -98,7 +98,7 @@
);
break;
case ViewerType.Jpg:
viewer = new JpgViewer(

Check warning on line 101 in samples/GroupDocs.Viewer.UI.Sample.StaticContentMode.Generator/Program.cs

View workflow job for this annotation

GitHub Actions / build

Unreachable code detected

Check warning on line 101 in samples/GroupDocs.Viewer.UI.Sample.StaticContentMode.Generator/Program.cs

View workflow job for this annotation

GitHub Actions / build

Unreachable code detected
configOptions,
asyncLock,
licenseManager,
Expand All @@ -109,7 +109,7 @@
);
break;
case ViewerType.Png:
viewer = new PngViewer(

Check warning on line 112 in samples/GroupDocs.Viewer.UI.Sample.StaticContentMode.Generator/Program.cs

View workflow job for this annotation

GitHub Actions / build

Unreachable code detected

Check warning on line 112 in samples/GroupDocs.Viewer.UI.Sample.StaticContentMode.Generator/Program.cs

View workflow job for this annotation

GitHub Actions / build

Unreachable code detected
configOptions,
asyncLock,
licenseManager,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/GroupDocs.Viewer.UI.Sample.ViewAsPng/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

//Trial limitations https://docs.groupdocs.com/viewer/net/evaluation-limitations-and-licensing-of-groupdocs-viewer/
//Temporary license can be requested at https://purchase.groupdocs.com/temporary-license
//config.SetLicensePath("c:\\licenses\\GroupDocs.Viewer.lic"); // or set environment variable 'GROUPDOCS_LIC_PATH'
//config.SetLicensePath("GroupDocs.Viewer.lic"); // or set environment variable 'GROUPDOCS_LIC_PATH'
})
.AddLocalStorage("./Files")
.AddLocalCache("./Cache");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/GroupDocs.Viewer.UI.Sample/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

//Trial limitations https://docs.groupdocs.com/viewer/net/evaluation-limitations-and-licensing-of-groupdocs-viewer/
//Temporary license can be requested at https://purchase.groupdocs.com/temporary-license
//config.SetLicensePath("c:\\licenses\\GroupDocs.Viewer.lic"); // or set environment variable 'GROUPDOCS_LIC_PATH'
//config.SetLicensePath("GroupDocs.Viewer.lic"); // or set environment variable 'GROUPDOCS_LIC_PATH'
})
.AddLocalStorage("./Files")
.AddLocalCache("./Cache");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"hotReloadEnabled": false,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"hotReloadEnabled": false
}
},
"GroupDocs.Viewer.UI.Sample": {
"commandName": "Project",
"launchBrowser": true,
"hotReloadEnabled": false,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"hotReloadEnabled": false,
"applicationUrl": "https://localhost:5001;http://localhost:5000"
},
"Container (Dockerfile)": {
"commandName": "Docker",
"launchBrowser": true,
"hotReloadEnabled": false,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
"environmentVariables": {
"ASPNETCORE_URLS": "https://+:443;http://+:80"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

//Trial limitations https://docs.groupdocs.com/viewer/net/evaluation-limitations-and-licensing-of-groupdocs-viewer/
//Temporary license can be requested at https://purchase.groupdocs.com/temporary-license
//config.SetLicensePath("c://Licenses//GroupDocs.Viewer.lic"); // or set environment variable 'GROUPDOCS_LIC_PATH'
//config.SetLicensePath("GroupDocs.Viewer.lic"); // or set environment variable 'GROUPDOCS_LIC_PATH'
})
.AddLocalStorage("./Files")
.AddLocalCache("./Cache");
Expand Down
7 changes: 5 additions & 2 deletions src/GroupDocs.Viewer.UI.API/GroupDocs.Viewer.UI.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@

<PackageId>GroupDocs.Viewer.UI.Api</PackageId>
<Version>$(GroupDocsViewerUIApi)</Version>
<Description>GroupDocs.Viewer.UI.Api containing base API features required by GroupDocs.Viewer.UI see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Viewer;UI;API;ASP.NET Core;</PackageTags>

<Description>GroupDocs.Viewer.UI.Api containing base API features required by GroupDocs.Viewer.UI see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Viewer;UI;API;ASP.NET Core;</PackageTags>
<PackageIcon>images\icon.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="images\icon.png" />
<None Include="README.md" pack="true" PackagePath="." />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

<PackageId>GroupDocs.Viewer.UI.Api.AwsS3.Storage</PackageId>
<Version>$(GroupDocsViewerUIApiAwsS3Storage)</Version>
<Description>GroupDocs.Viewer.UI.Api.AwsS3.Storage containing Amazon S3 file-storage implementation that can be used with GroupDocs.Viewer.UI.Api see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>

<Description>GroupDocs.Viewer.UI.Api.AwsS3.Storage containing Amazon S3 file-storage implementation that can be used with GroupDocs.Viewer.UI.Api see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Viewer;UI;API;Aws;Amazon;S3;File;Storage;ASP.NET Core;</PackageTags>
<PackageIcon>images\icon.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

<PackageId>GroupDocs.Viewer.UI.Api.AzureBlob.Storage</PackageId>
<Version>$(GroupDocsViewerUIApiAzureStorage)</Version>
<Description>GroupDocs.Viewer.UI.Api.AzureBlob.Storage containing Microsoft Azure file-storage implementation that can be used with GroupDocs.Viewer.UI.Api see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>

<Description>GroupDocs.Viewer.UI.Api.AzureBlob.Storage containing Microsoft Azure file-storage implementation that can be used with GroupDocs.Viewer.UI.Api see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Viewer;UI;API;Azure;Azure;File;Storage;ASP.NET Core;</PackageTags>
<PackageIcon>images\icon.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

<PackageId>GroupDocs.Viewer.UI.Api.Cloud.Storage</PackageId>
<Version>$(GroupDocsViewerUIApiCloudStorage)</Version>

<Description>GroupDocs.Viewer.UI.Api.Cloud.Storage containing cloud file-storage implementation that can be used with GroupDocs.Viewer.UI.Api see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Viewer;UI;API;Cloud;File;Storage;ASP.NET Core;</PackageTags>
<PackageIcon>images\icon.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

<PackageId>GroupDocs.Viewer.UI.Api.InMemory.Cache</PackageId>
<Version>$(GroupDocsViewerUIApiInMemoryCache)</Version>
<Description>GroupDocs.Viewer.UI.Api.InMemory.Cache containing in-memory file-cache implementation that can be used with GroupDocs.Viewer.UI.Api see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>

<Description>GroupDocs.Viewer.UI.Api.InMemory.Cache containing in-memory file-cache implementation that can be used with GroupDocs.Viewer.UI.Api see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Viewer;UI;API;In-Memory;File;Cache;ASP.NET Core;</PackageTags>
<PackageIcon>images\icon.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

<PackageId>GroupDocs.Viewer.UI.Api.Local.Cache</PackageId>
<Version>$(GroupDocsViewerUIApiLocalCache)</Version>

<Description>GroupDocs.Viewer.UI.Api.Local.Cache containing local file-cache implementation that can be used with GroupDocs.Viewer.UI.Api see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Viewer;UI;API;Local;File;Cache;ASP.NET Core;</PackageTags>
<PackageIcon>images\icon.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

<PackageId>GroupDocs.Viewer.UI.Api.Local.Storage</PackageId>
<Version>$(GroupDocsViewerUIApiLocalStorage)</Version>
<Description>GroupDocs.Viewer.UI.Api.Local.Storage containing local file-storage implementation that can be used with GroupDocs.Viewer.UI.Api see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>

<Description>GroupDocs.Viewer.UI.Api.Local.Storage containing local file-storage implementation that can be used with GroupDocs.Viewer.UI.Api see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Viewer;UI;API;Local;File;Storage;ASP.NET Core;</PackageTags>
<PackageIcon>images\icon.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

<PackageId>GroupDocs.Viewer.UI.Cloud.Api</PackageId>
<Version>$(GroupDocsViewerUICloudApi)</Version>

<Description>GroupDocs.Viewer.UI.Cloud.Api containing API implementation that is based on GroupDocs.Viewer for .NET see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Viewer;UI;SelftHost;API;ASP.NET Core;</PackageTags>
<PackageIcon>images\icon.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/GroupDocs.Viewer.UI.Core/GroupDocs.Viewer.UI.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

<PackageId>GroupDocs.Viewer.UI.Core</PackageId>
<Version>$(GroupDocsViewerUICore)</Version>

<Description>GroupDocs.Viewer.UI.Core containing interfaces, extensions, builders and model definitions see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Viewer;UI;Core;ASP.NET Core;</PackageTags>
<PackageIcon>images\icon.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
<PropertyGroup>
<TargetFrameworks>$(NetVersions)</TargetFrameworks>

<DefineConstants>CROSS_PLATFORM</DefineConstants>

<PackageId>GroupDocs.Viewer.UI.SelfHost.Api.CrossPlatform</PackageId>
<Version>$(GroupDocsViewerUISelfHostApiCrossPlatform)</Version>
<Description>GroupDocs.Viewer.UI.SelfHost.Api.CrossPlatform containing API implementation that is based on GroupDocs.Viewer for .NET cross-platform version see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>

<Description>GroupDocs.Viewer.UI.SelfHost.Api.CrossPlatform containing API implementation that is based on GroupDocs.Viewer for .NET cross-platform version see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Viewer;UI;SelftHost;API;ASP.NET Core;CrossPlatform;</PackageTags>
<PackageIcon>images\icon.png</PackageIcon>
<DefineConstants>CROSS_PLATFORM</DefineConstants>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

<PackageId>GroupDocs.Viewer.UI.SelfHost.Api</PackageId>
<Version>$(GroupDocsViewerUISelfHostApi)</Version>
<Description>GroupDocs.Viewer.UI.SelfHost.Api containing API implementation that is based on GroupDocs.Viewer for .NET see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>

<Description>GroupDocs.Viewer.UI.SelfHost.Api containing API implementation that is based on GroupDocs.Viewer for .NET see https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Viewer;UI;SelftHost;API;ASP.NET Core;</PackageTags>
<PackageIcon>images\icon.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading
Loading