Skip to content

Commit b52cb5c

Browse files
vladimir-litvinchikvladimir-litvinchik
authored
Merge branch 8.1.1 into main (#73)
* Turn off hot reload since as cache in the same folder * Include README into package * Update client app to the latest version * Update package versions and dependencies * Remove node setup workflow step
1 parent bb44c34 commit b52cb5c

File tree

53 files changed

+7226
-7598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+7226
-7598
lines changed

‎.github/workflows/build_packages.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,5 @@ jobs:
1515
uses: actions/setup-dotnet@v3
1616
with:
1717
global-json-file: global.json
18-
- name: Setup node
19-
uses: actions/setup-node@v2
2018
- name: Build project
2119
run: dotnet build ./GroupDocs.Viewer.UI.sln

‎build/dependencies.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,37 @@
1616
</PropertyGroup>
1717

1818
<PropertyGroup Label="Package Versions">
19-
<GroupDocsViewer>25.4.0</GroupDocsViewer>
19+
<GroupDocsViewer>25.8.0</GroupDocsViewer>
2020

2121
<MicrosoftExtensionsHttp>8.0.1</MicrosoftExtensionsHttp>
2222
<MicrosoftExtensionsDependencyInjectionAbstractions>8.0.2</MicrosoftExtensionsDependencyInjectionAbstractions>
2323
<MicrosoftExtensionsConfiguration>8.0.0</MicrosoftExtensionsConfiguration>
2424
<MicrosoftExtensionsConfigurationAbstractions>8.0.0</MicrosoftExtensionsConfigurationAbstractions>
2525
<MicrosoftExtensionsConfigurationBinder>8.0.2</MicrosoftExtensionsConfigurationBinder>
2626
<MicrosoftExtensionsCachingMemory>8.0.1</MicrosoftExtensionsCachingMemory>
27-
<SystemFormatsAsn1>8.0.1</SystemFormatsAsn1>
27+
<SystemFormatsAsn1>8.0.2</SystemFormatsAsn1>
2828

29-
<SystemTextJson>8.0.5</SystemTextJson>
29+
<SystemTextJson>8.0.6</SystemTextJson>
3030

31-
<AzureBlobs>12.24.0</AzureBlobs>
32-
<AwsSdkS3>4.0.0.1</AwsSdkS3>
31+
<AzureBlobs>12.25.0</AzureBlobs>
32+
<AwsSdkS3>4.0.7.2</AwsSdkS3>
3333

3434
<MicrosoftSourceLinkGithub>8.0.0</MicrosoftSourceLinkGithub>
3535
</PropertyGroup>
3636

3737
<PropertyGroup Label="GroupDocs.Viewer UI Package Versions">
38-
<GroupDocsViewerUI>8.0.7</GroupDocsViewerUI>
39-
<GroupDocsViewerUIApi>8.0.7</GroupDocsViewerUIApi>
40-
<GroupDocsViewerUIApiLocalCache>8.0.7</GroupDocsViewerUIApiLocalCache>
41-
<GroupDocsViewerUIApiInMemoryCache>8.0.7</GroupDocsViewerUIApiInMemoryCache>
42-
<GroupDocsViewerUIApiLocalStorage>8.0.7</GroupDocsViewerUIApiLocalStorage>
43-
<GroupDocsViewerUIApiCloudStorage>8.0.7</GroupDocsViewerUIApiCloudStorage>
44-
<GroupDocsViewerUIApiAzureStorage>8.0.7</GroupDocsViewerUIApiAzureStorage>
45-
<GroupDocsViewerUIApiAwsS3Storage>8.0.7</GroupDocsViewerUIApiAwsS3Storage>
46-
<GroupDocsViewerUICore>8.0.7</GroupDocsViewerUICore>
47-
<GroupDocsViewerUISelfHostApi>8.0.7</GroupDocsViewerUISelfHostApi>
48-
<GroupDocsViewerUISelfHostApiCrossPlatform>8.0.7</GroupDocsViewerUISelfHostApiCrossPlatform>
49-
<GroupDocsViewerUICloudApi>8.0.7</GroupDocsViewerUICloudApi>
38+
<GroupDocsViewerUI>8.1.1</GroupDocsViewerUI>
39+
<GroupDocsViewerUIApi>8.1.1</GroupDocsViewerUIApi>
40+
<GroupDocsViewerUIApiLocalCache>8.1.1</GroupDocsViewerUIApiLocalCache>
41+
<GroupDocsViewerUIApiInMemoryCache>8.1.1</GroupDocsViewerUIApiInMemoryCache>
42+
<GroupDocsViewerUIApiLocalStorage>8.1.1</GroupDocsViewerUIApiLocalStorage>
43+
<GroupDocsViewerUIApiCloudStorage>8.1.1</GroupDocsViewerUIApiCloudStorage>
44+
<GroupDocsViewerUIApiAzureStorage>8.1.1</GroupDocsViewerUIApiAzureStorage>
45+
<GroupDocsViewerUIApiAwsS3Storage>8.1.1</GroupDocsViewerUIApiAwsS3Storage>
46+
<GroupDocsViewerUICore>8.1.1</GroupDocsViewerUICore>
47+
<GroupDocsViewerUISelfHostApi>8.1.1</GroupDocsViewerUISelfHostApi>
48+
<GroupDocsViewerUISelfHostApiCrossPlatform>8.1.1</GroupDocsViewerUISelfHostApiCrossPlatform>
49+
<GroupDocsViewerUICloudApi>8.1.1</GroupDocsViewerUICloudApi>
5050
</PropertyGroup>
5151

5252
<PropertyGroup Label="NuGet Common Settings">

‎samples/GroupDocs.Viewer.UI.Sample.CrossPlatform/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This stage is used when running from VS in fast mode (Default for Debug configuration)
22
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
33
WORKDIR /app
4-
EXPOSE 80
5-
EXPOSE 443
4+
EXPOSE 8080
5+
EXPOSE 8081
66

77
# Install dependencies for Windows Fonts package
88
RUN apt update && apt install -y --no-install-recommends \

‎samples/GroupDocs.Viewer.UI.Sample.CrossPlatform/GroupDocs.Viewer.UI.Sample.CrossPlatform.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
21+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎samples/GroupDocs.Viewer.UI.Sample.CustomCacheProvider/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

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

‎samples/GroupDocs.Viewer.UI.Sample.StaticContentMode.Generator/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static async Task Main(string[] args)
2929
{
3030
Config apiConfig = new Config();
3131
apiConfig.SetViewerType(VIEWER_TYPE);
32-
//apiConfig.SetLicensePath("c://Licenses//GroupDocs.Viewer.lic");
32+
//apiConfig.SetLicensePath("GroupDocs.Viewer.lic");
3333

3434
IFileStorage fileStorage = new LocalFileStorage(STORAGE_PATH);
3535
IApiUrlBuilder urlBuilder = new StaticUrlBuilder(API_ENDPOINT);

‎samples/GroupDocs.Viewer.UI.Sample.ViewAsPng/GroupDocs.Viewer.UI.Sample.ViewAsPng.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
21+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎samples/GroupDocs.Viewer.UI.Sample.ViewAsPng/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

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

‎samples/GroupDocs.Viewer.UI.Sample/GroupDocs.Viewer.UI.Sample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
21+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎samples/GroupDocs.Viewer.UI.Sample/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

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

0 commit comments

Comments
 (0)